X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=cb1f8a73fda6556bb8518802c4a51cfde0a81704;hb=b994e6a21b2eb77c87724f26f773923ab61c487d;hp=6de8b824d055cb783a1cde4457a8506ccc1ce96a;hpb=5a84bc4587b2b38448098dd7f69843a83ecd24dc;p=gnulib.git diff --git a/lib/userspec.c b/lib/userspec.c index 6de8b824d..cb1f8a73f 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-1992, 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 @@ -12,20 +12,27 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Written by David MacKenzie . */ - -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ -#include -#else -#include "config.h" + +#if HAVE_CONFIG_H +# include #endif + +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + # pragma alloca +# else +char *alloca (); +# endif +# endif #endif #include @@ -33,21 +40,21 @@ #include #include -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -#include -#ifndef index -#define index strchr -#endif +#if HAVE_STRING_H +# include #else -#include +# include +# ifndef strchr +# define strchr index +# endif #endif -#ifdef STDC_HEADERS -#include +#if STDC_HEADERS +# include #endif -#ifdef HAVE_UNISTD_H -#include +#if HAVE_UNISTD_H +# include #endif #ifndef _POSIX_VERSION @@ -56,21 +63,37 @@ struct group *getgrnam (); struct group *getgrgid (); #endif -#ifdef _POSIX_SOURCE -#define endpwent() -#define endgrent() +#ifndef HAVE_ENDGRENT +# define endgrent() ((void) 0) +#endif + +#ifndef HAVE_ENDPWENT +# define endpwent() ((void) 0) #endif +/* Perform the equivalent of the statement `dest = strdup (src);', + but obtaining storage via alloca instead of from the heap. */ + +#define V_STRDUP(dest, src) \ + do \ + { \ + int _len = strlen ((src)); \ + (dest) = (char *) alloca (_len + 1); \ + strcpy (dest, src); \ + } \ + while (0) + #define isdigit(c) ((c) >= '0' && (c) <= '9') +#ifndef strdup char *strdup (); +#endif /* Return nonzero if STR represents an unsigned decimal integer, otherwise return 0. */ static int -isnumber (str) - const char *str; +is_number (const char *str) { for (; *str; str++) if (!isdigit (*str)) @@ -91,31 +114,27 @@ isnumber (str) Return NULL if successful, a static error message string if not. */ const char * -parse_user_spec (spec_arg, uid, gid, username, groupname) - const char *spec_arg; - uid_t *uid; - gid_t *gid; - char **username, **groupname; +parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, + char **username_arg, char **groupname_arg) { static const char *tired = "virtual memory exhausted"; const char *error_msg; char *spec; /* A copy we can write on. */ - int spec_len; struct passwd *pwd; struct group *grp; char *g, *u, *separator; + char *groupname; error_msg = NULL; - *username = *groupname = NULL; + *username_arg = *groupname_arg = NULL; + groupname = NULL; - spec_len = strlen (spec_arg); - spec = (char *) alloca (strlen (spec_arg) + 1); - strcpy (spec, spec_arg); + V_STRDUP (spec, spec_arg); /* Find the separator if there is one. */ - separator = index (spec, ':'); + separator = strchr (spec, ':'); if (separator == NULL) - separator = index (spec, '.'); + separator = strchr (spec, '.'); /* Replace separator with a NUL. */ if (separator != NULL) @@ -132,13 +151,22 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) 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); if (pwd == NULL) { - if (!isnumber (u)) + if (!is_number (u)) error_msg = "invalid user"; else { @@ -166,25 +194,16 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) zero byte. */ char uint_buf[21]; sprintf (uint_buf, "%u", (unsigned) (pwd->pw_gid)); - *groupname = strdup (uint_buf); + V_STRDUP (groupname, uint_buf); } else { - *groupname = strdup (grp->gr_name); + V_STRDUP (groupname, grp->gr_name); } - if (*groupname == NULL) - error_msg = tired; endgrent (); } } endpwent (); - - if (error_msg == NULL) - { - *username = strdup (u); - if (*username == NULL) - error_msg = tired; - } } if (g != NULL && error_msg == NULL) @@ -193,7 +212,7 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) grp = getgrnam (g); if (grp == NULL) { - if (!isnumber (g)) + if (!is_number (g)) error_msg = "invalid group"; else *gid = atoi (g); @@ -203,33 +222,39 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) endgrent (); /* Save a file descriptor. */ if (error_msg == NULL) - { - *groupname = strdup (g); - if (*groupname == NULL) - error_msg = tired; - } + V_STRDUP (groupname, g); } - if (error_msg) + if (error_msg == NULL) { - if (*groupname != NULL) + if (u != NULL) { - free (*groupname); - *groupname = NULL; + *username_arg = strdup (u); + if (*username_arg == NULL) + error_msg = tired; } - if (*username != NULL) + + if (groupname != NULL && error_msg == NULL) { - free (*username); - *username = NULL; + *groupname_arg = strdup (groupname); + if (*groupname_arg == NULL) + { + if (*username_arg != NULL) + { + free (*username_arg); + *username_arg = NULL; + } + error_msg = tired; + } } } return error_msg; } -#ifdef TESTING +#ifdef TEST -#define NULL_CHECK(s) ((s) == NULL ? "(null)" : (s)) +# define NULL_CHECK(s) ((s) == NULL ? "(null)" : (s)) int main (int argc, char **argv)