X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fidcache.c;h=7a827e3b004aab7200178b012563e5c3c5483049;hb=b994e6a21b2eb77c87724f26f773923ab61c487d;hp=a327067daf1adbfb8ead34d1af87a308da687273;hpb=0933dc6deb55554eeb9dbe540294c2019619541b;p=gnulib.git

diff --git a/lib/idcache.c b/lib/idcache.c
index a327067da..7a827e3b0 100644
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,5 +1,6 @@
 /* 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 +25,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>
@@ -44,6 +45,10 @@ struct group *getgrnam ();
 char *xmalloc ();
 char *xstrdup ();
 
+#ifdef __DJGPP__
+static char digits[] = "0123456789";
+#endif
+
 struct userid
 {
   union
@@ -57,18 +62,13 @@ struct userid
 
 static struct userid *user_alist;
 
-#ifdef NOT_USED
 /* 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;
@@ -80,7 +80,7 @@ getuser (uid)
   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 used is first.  */
   tail->next = user_alist;
@@ -88,16 +88,13 @@ getuser (uid)
   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;
@@ -113,6 +110,15 @@ 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->name = xstrdup (user);
@@ -131,18 +137,14 @@ getuidbyname (user)
   return 0;
 }
 
-#endif /* NOT_USED */
-
 /* Use the same struct as for userids.  */
 static struct userid *group_alist;
 static struct userid *nogroup_alist;
 
-/* Translate GID to a group name or a stringified number,
-   with cache.  */
+/* 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;
@@ -154,7 +156,7 @@ getgroup (gid)
   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;
@@ -162,16 +164,13 @@ 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;
@@ -187,6 +186,15 @@ 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->name = xstrdup (group);
@@ -204,5 +212,3 @@ getgidbyname (group)
   nogroup_alist = tail;
   return 0;
 }
-
-#endif /* NOT_USED */