X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=bf51778d74e05d5cf75dc06a36c8682814340ac0;hb=a19e601b42a86b59b4af13aa9f960397f5306c38;hp=d08ed07165e7e929b5e1a2b894b041de0641911d;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git

diff --git a/lib/userspec.c b/lib/userspec.c
index d08ed0716..bf51778d7 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -1,5 +1,5 @@
 /* userspec.c -- Parse a user and group string.
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1997 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
@@ -16,9 +16,9 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #ifdef __GNUC__
@@ -28,7 +28,7 @@
 #  include <alloca.h>
 # else
 #  ifdef _AIX
- #pragma alloca
+ #  pragma alloca
 #  else
 char *alloca ();
 #  endif
@@ -40,7 +40,7 @@ char *alloca ();
 #include <pwd.h>
 #include <grp.h>
 
-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 # include <string.h>
 #else
 # include <strings.h>
@@ -49,11 +49,11 @@ char *alloca ();
 # endif
 #endif
 
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
 # include <stdlib.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
@@ -153,6 +153,15 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg)
   if (u == NULL && g == NULL)
     return "can not omit both user and group";
 
+#ifdef __DJGPP__
+  /* Pretend that we are the user U whose group is G.  This makes
+     pwd and grp functions ``know'' about the UID and GID of these.  */
+  if (u && !is_number (u))
+    setenv ("USER", u, 1);
+  if (g && !is_number (g))
+    setenv ("GROUP", g, 1);
+#endif
+
   if (u != NULL)
     {
       pwd = getpwnam (u);
@@ -247,7 +256,7 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg)
 
 #ifdef TEST
 
-#define NULL_CHECK(s) ((s) == NULL ? "(null)" : (s))
+# define NULL_CHECK(s) ((s) == NULL ? "(null)" : (s))
 
 int
 main (int argc, char **argv)