X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fidcache.c;h=9065cc8988519e7ac5bb62471dc088a03dd81b25;hb=620ece7758e453efebf7f52a1ab9fc1c49a5020c;hp=0706f007f57b33f3582eb842bc22ea3ba7cfa63e;hpb=2ff952c883d6112a614b854409efbcac9c717b6f;p=gnulib.git
diff --git a/lib/idcache.c b/lib/idcache.c
index 0706f007f..9065cc898 100644
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,12 +1,12 @@
/* idcache.c -- map user and group IDs, cached for speed
- Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1985, 1988-1990, 1997-1998, 2003, 2005-2007, 2009-2011 Free
+ Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,15 +14,14 @@
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
+#include "idcache.h"
#include
#include
#include
-#include
#include
#include
@@ -45,11 +44,24 @@ struct userid
char name[FLEXIBLE_ARRAY_MEMBER];
};
+/* FIXME: provide a function to free any malloc'd storage and reset lists,
+ so that an application can use code like this just before exiting:
+ #ifdef lint
+ idcache_clear ();
+ #endif
+*/
+
static struct userid *user_alist;
/* Each entry on list is a user name for which the first lookup failed. */
static struct userid *nouser_alist;
+/* Use the same struct as for userids. */
+static struct userid *group_alist;
+
+/* Each entry on list is a group name for which the first lookup failed. */
+static struct userid *nogroup_alist;
+
/* Translate UID to a login name, with cache, or NULL if unresolved. */
char *
@@ -61,10 +73,10 @@ getuser (uid_t uid)
for (tail = user_alist; tail; tail = tail->next)
{
if (tail->id.u == uid)
- {
- match = tail;
- break;
- }
+ {
+ match = tail;
+ break;
+ }
}
if (match == NULL)
@@ -111,7 +123,7 @@ getuidbyname (const char *user)
if (!pwent && strspn (user, digits) < strlen (user))
{
setenv ("USER", user, 1);
- pwent = getpwnam (user); /* now it will succeed */
+ pwent = getpwnam (user); /* now it will succeed */
}
#endif
@@ -132,12 +144,6 @@ getuidbyname (const char *user)
return NULL;
}
-/* Use the same struct as for userids. */
-static struct userid *group_alist;
-
-/* Each entry on list is a group name for which the first lookup failed. */
-static struct userid *nogroup_alist;
-
/* Translate GID to a group name, with cache, or NULL if unresolved. */
char *
@@ -149,10 +155,10 @@ getgroup (gid_t gid)
for (tail = group_alist; tail; tail = tail->next)
{
if (tail->id.g == gid)
- {
- match = tail;
- break;
- }
+ {
+ match = tail;
+ break;
+ }
}
if (match == NULL)
@@ -199,7 +205,7 @@ getgidbyname (const char *group)
if (!grent && strspn (group, digits) < strlen (group))
{
setenv ("GROUP", group, 1);
- grent = getgrnam (group); /* now it will succeed */
+ grent = getgrnam (group); /* now it will succeed */
}
#endif