X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fidcache.c;h=2e46c1b047307af032e9654855c7fa13fbedb743;hb=04597d099c32b9b380b6c82eed97fb88ef467d2e;hp=0cfd9034854a0b092dbdcda4ab1e0e63e0b574bd;hpb=be57b451c48f89b7fba6ab075a52b04d101ba7db;p=gnulib.git diff --git a/lib/idcache.c b/lib/idcache.c index 0cfd90348..2e46c1b04 100644 --- a/lib/idcache.c +++ b/lib/idcache.c @@ -1,5 +1,7 @@ /* idcache.c -- map user and group IDs, cached for speed - Copyright (C) 1985, 1988, 1989, 1990, 1997 Free Software Foundation, Inc. + + Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,37 +15,26 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include +#include #include #include #include -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -# include -#else -# include -#endif +#include -#if HAVE_UNISTD_H -# include -#endif +#include "xalloc.h" -#ifndef _POSIX_VERSION -struct passwd *getpwuid (); -struct passwd *getpwnam (); -struct group *getgrgid (); -struct group *getgrnam (); +#ifdef __DJGPP__ +static char digits[] = "0123456789"; #endif -char *xmalloc (); -char *xstrdup (); - struct userid { union @@ -55,23 +46,15 @@ struct userid struct userid *next; }; -/* The members of this list have already been looked up. - If a name is NULL, the corresponding id is not in the password file. */ static struct userid *user_alist; -#ifdef NOT_USED -/* The members of this list are names not in the local passwd file; - their names are always not NULL, and their ids are irrelevant. */ +/* The members of this list have names not in the local passwd file. */ static struct userid *nouser_alist; -#endif /* NOT_USED */ -/* Translate UID to a login name, with cache. - If UID cannot be resolved, return NULL. - Cache lookup failures, too. */ +/* Translate UID to a login name, with cache, or NULL if unresolved. */ char * -getuser (uid) - uid_t uid; +getuser (uid_t uid) { register struct userid *tail; struct passwd *pwent; @@ -81,33 +64,30 @@ getuser (uid) return tail->name; pwent = getpwuid (uid); - tail = (struct userid *) xmalloc (sizeof (struct userid)); + tail = xmalloc (sizeof *tail); tail->id.u = uid; - tail->name = (pwent ? xstrdup (pwent->pw_name) : NULL); + tail->name = pwent ? xstrdup (pwent->pw_name) : NULL; - /* Add to the head of the list, so most recently added is first. */ + /* Add to the head of the list, so most recently used is first. */ tail->next = user_alist; user_alist = tail; return tail->name; } -#ifdef NOT_USED - /* Translate USER to a UID, with cache. Return NULL if there is no such user. (We also cache which user names have no passwd entry, so we don't keep looking them up.) */ uid_t * -getuidbyname (user) - const char *user; +getuidbyname (const char *user) { register struct userid *tail; struct passwd *pwent; for (tail = user_alist; tail; tail = tail->next) /* Avoid a function call for the most common case. */ - if (tail->name && *tail->name == *user && !strcmp (tail->name, user)) + if (*tail->name == *user && !strcmp (tail->name, user)) return &tail->id.u; for (tail = nouser_alist; tail; tail = tail->next) @@ -116,11 +96,20 @@ getuidbyname (user) return 0; pwent = getpwnam (user); +#ifdef __DJGPP__ + /* We need to pretend to be the user USER, to make + pwd functions know about an arbitrary user name. */ + if (!pwent && strspn (user, digits) < strlen (user)) + { + setenv ("USER", user, 1); + pwent = getpwnam (user); /* now it will succeed */ + } +#endif - tail = (struct userid *) xmalloc (sizeof (struct userid)); + tail = xmalloc (sizeof *tail); tail->name = xstrdup (user); - /* Add to the head of the list, so most recently added is first. */ + /* Add to the head of the list, so most recently used is first. */ if (pwent) { tail->id.u = pwent->pw_uid; @@ -134,20 +123,14 @@ getuidbyname (user) return 0; } -#endif /* NOT_USED */ - /* Use the same struct as for userids. */ static struct userid *group_alist; -#ifdef NOT_USED static struct userid *nogroup_alist; -#endif -/* Translate GID to a group name, with cache. - Return NULL if the group has no name. */ +/* Translate GID to a group name, with cache, or NULL if unresolved. */ char * -getgroup (gid) - gid_t gid; +getgroup (gid_t gid) { register struct userid *tail; struct group *grent; @@ -157,9 +140,9 @@ getgroup (gid) return tail->name; grent = getgrgid (gid); - tail = (struct userid *) xmalloc (sizeof (struct userid)); + tail = xmalloc (sizeof *tail); tail->id.g = gid; - tail->name = (grent ? xstrdup (grent->gr_name) : NULL); + tail->name = grent ? xstrdup (grent->gr_name) : NULL; /* Add to the head of the list, so most recently used is first. */ tail->next = group_alist; @@ -167,23 +150,20 @@ getgroup (gid) return tail->name; } -#ifdef NOT_USED - /* Translate GROUP to a GID, with cache. Return NULL if there is no such group. (We also cache which group names have no group entry, so we don't keep looking them up.) */ gid_t * -getgidbyname (group) - const char *group; +getgidbyname (const char *group) { register struct userid *tail; struct group *grent; for (tail = group_alist; tail; tail = tail->next) /* Avoid a function call for the most common case. */ - if (tail->name && *tail->name == *group && !strcmp (tail->name, group)) + if (*tail->name == *group && !strcmp (tail->name, group)) return &tail->id.g; for (tail = nogroup_alist; tail; tail = tail->next) @@ -192,8 +172,17 @@ getgidbyname (group) return 0; grent = getgrnam (group); +#ifdef __DJGPP__ + /* We need to pretend to belong to group GROUP, to make + grp functions know about any arbitrary group name. */ + if (!grent && strspn (group, digits) < strlen (group)) + { + setenv ("GROUP", group, 1); + grent = getgrnam (group); /* now it will succeed */ + } +#endif - tail = (struct userid *) xmalloc (sizeof (struct userid)); + tail = xmalloc (sizeof *tail); tail->name = xstrdup (group); /* Add to the head of the list, so most recently used is first. */ @@ -209,5 +198,3 @@ getgidbyname (group) nogroup_alist = tail; return 0; } - -#endif /* NOT_USED */