X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=f00308d45e543a060db0035471a8a8e26f564e8e;hb=a46cc0f8b755cec78b27aa4fb8224d5f479582be;hp=34b1d32119fdbd784948beb9678ea0da769de1f0;hpb=693dd1dadb37f14794dd179d340dca63da29be93;p=gnulib.git diff --git a/lib/userspec.c b/lib/userspec.c index 34b1d3211..f00308d45 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, 2000 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,24 +40,30 @@ #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 -#else -char *malloc (); +#if STDC_HEADERS +# include +#endif + +#if HAVE_UNISTD_H +# include #endif -#ifdef HAVE_UNISTD_H -#include +#if ENABLE_NLS +# include +# define _(Text) gettext (Text) +#else +# define _(Text) Text #endif +#define N_(Text) Text #ifndef _POSIX_VERSION struct passwd *getpwnam (); @@ -58,24 +71,48 @@ struct group *getgrnam (); struct group *getgrgid (); #endif -#ifdef _POSIX_SOURCE -#define endpwent() -#define endgrent() +#ifndef HAVE_ENDGRENT +# define endgrent() ((void) 0) #endif -#define isdigit(c) ((c) >= '0' && (c) <= '9') +#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) + +/* ISDIGIT differs from isdigit, as follows: + - Its arg may be any int or unsigned int; it need not be an unsigned char. + - It's guaranteed to evaluate its argument exactly once. + - It's typically faster. + Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that + only '0' through '9' are digits. Prefer ISDIGIT to isdigit unless + it's important to use the locale's definition of `digit' even when the + host does not conform to Posix. */ +#define ISDIGIT(c) ((unsigned) (c) - '0' <= 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)) + if (!ISDIGIT (*str)) return 0; return 1; } @@ -83,8 +120,12 @@ isnumber (str) /* Extract from NAME, which has the form "[user][:.][group]", a USERNAME, UID U, GROUPNAME, and GID G. Either user or group, or both, must be present. - If the group is omitted but the ":" or "." separator is given, + If the group is omitted but the ":" separator is given, use the given user's login group. + If SPEC_ARG contains a `:', then use that as the separator, ignoring + any `.'s. If there is no `:', but there is a `.', then first look + up SPEC_ARG as a login name. If that look-up fails, then try again + interpreting the `.' as a separator. USERNAME and GROUPNAME will be in newly malloc'd memory. Either one might be NULL instead, indicating that it was not @@ -93,31 +134,50 @@ 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"; + static const char *E_no_memory = N_("virtual memory exhausted"); + static const char *E_invalid_user = N_("invalid user"); + static const char *E_invalid_group = N_("invalid group"); + static const char *E_bad_spec = + N_("cannot get the login group of a numeric UID"); + static const char *E_cannot_omit_both = + N_("cannot omit both user and group"); + 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; + int maybe_retry = 0; + char *dot = NULL; 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, ':'); + /* Find the POSIX `:' separator if there is one. */ + separator = strchr (spec, ':'); + + /* If there is no colon, then see if there's a `.'. */ if (separator == NULL) - separator = index (spec, '.'); + { + dot = strchr (spec, '.'); + /* If there's no colon but there is a `.', then first look up the + whole spec, in case it's an OWNER name that includes a dot. + If that fails, then we'll try again, but interpreting the `.' + as a separator. */ + /* FIXME: accepting `.' as the separator is contrary to POSIX. + someday we should drop support for this. */ + if (dot) + maybe_retry = 1; + } + + retry: /* Replace separator with a NUL. */ if (separator != NULL) @@ -132,7 +192,16 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) : separator + 1); if (u == NULL && g == NULL) - return "can not omit both user and group"; + return _(E_cannot_omit_both); + +#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) { @@ -140,16 +209,19 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) if (pwd == NULL) { - if (!isnumber (u)) - error_msg = "invalid user"; + if (!is_number (u)) + error_msg = _(E_invalid_user); else { int use_login_group; use_login_group = (separator != NULL && g == NULL); if (use_login_group) - error_msg = "cannot get the login group of a numeric UID"; + error_msg = _(E_bad_spec); else - *uid = atoi (u); + { + /* FIXME: don't use atoi! */ + *uid = atoi (u); + } } } else @@ -168,70 +240,78 @@ 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) + if (g != NULL && error_msg == NULL) { /* Explicit group. */ grp = getgrnam (g); if (grp == NULL) { - if (!isnumber (g)) - error_msg = "invalid group"; + if (!is_number (g)) + error_msg = _(E_invalid_group); else - *gid = atoi (g); + { + /* FIXME: don't use atoi! */ + *gid = atoi (g); + } } else *gid = grp->gr_gid; endgrent (); /* Save a file descriptor. */ if (error_msg == NULL) - { - *groupname = strdup (g); - if (*groupname == NULL) - return 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 = _(E_no_memory); } - 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 = _(E_no_memory); + } } } + if (error_msg && maybe_retry) + { + maybe_retry = 0; + separator = dot; + error_msg = NULL; + goto retry; + } + 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)