Mercurial > hg > octave-lojdl > gnulib-hg
changeset 1253:78e577d11fb9
update from libit
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Tue, 24 Feb 1998 23:18:23 +0000 |
parents | c005b7ff8483 |
children | 5d685d6546de |
files | lib/idcache.c |
diffstat | 1 files changed, 15 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/idcache.c +++ b/lib/idcache.c @@ -1,5 +1,5 @@ /* 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 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 @@ -24,7 +24,7 @@ #include <pwd.h> #include <grp.h> -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) +#if STDC_HEADERS || HAVE_STRING_H # include <string.h> #else # include <strings.h> @@ -55,23 +55,15 @@ 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; @@ -83,31 +75,28 @@ pwent = getpwuid (uid); tail = (struct userid *) xmalloc (sizeof (struct userid)); 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) @@ -120,7 +109,7 @@ tail = (struct userid *) xmalloc (sizeof (struct userid)); 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 @@ 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; @@ -159,7 +142,7 @@ grent = getgrgid (gid); tail = (struct userid *) xmalloc (sizeof (struct userid)); 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 @@ 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) @@ -209,5 +189,3 @@ nogroup_alist = tail; return 0; } - -#endif /* NOT_USED */