X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=037961d4746374e5d3b02c2a03c0f64ddc2b4ac9;hb=44fd637accbdb4f21edb7cc5194f5cf0848eac62;hp=6de8b824d055cb783a1cde4457a8506ccc1ce96a;hpb=5a84bc4587b2b38448098dd7f69843a83ecd24dc;p=gnulib.git diff --git a/lib/userspec.c b/lib/userspec.c index 6de8b824d..037961d47 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -1,5 +1,6 @@ /* 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, 2002-2004 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,179 +13,198 @@ 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" -#endif + +#if HAVE_CONFIG_H +# include #endif +/* Specification. */ +#include "userspec.h" + +#include #include #include #include #include -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -#include -#ifndef index -#define index strchr -#endif -#else -#include +#if HAVE_SYS_PARAM_H +# include #endif -#ifdef STDC_HEADERS +#include #include -#endif +#include -#ifdef HAVE_UNISTD_H -#include +#if HAVE_UNISTD_H +# include #endif +#include "inttostr.h" +#include "strdup.h" +#include "xalloc.h" +#include "xstrtol.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + #ifndef _POSIX_VERSION struct passwd *getpwnam (); 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 -char *strdup (); +/* The extra casts work around common compiler bugs. */ +#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) +/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. + It is necessary at least when t == time_t. */ +#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ + ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) +#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) -/* Return nonzero if STR represents an unsigned decimal integer, - otherwise return 0. */ +#ifndef UID_T_MAX +# define UID_T_MAX TYPE_MAXIMUM (uid_t) +#endif -static int -isnumber (str) - const char *str; -{ - for (; *str; str++) - if (!isdigit (*str)) - return 0; - return 1; -} +#ifndef GID_T_MAX +# define GID_T_MAX TYPE_MAXIMUM (gid_t) +#endif -/* 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, - use the given user's login group. +/* MAXUID may come from limits.h or sys/params.h. */ +#ifndef MAXUID +# define MAXUID UID_T_MAX +#endif +#ifndef MAXGID +# define MAXGID GID_T_MAX +#endif - USERNAME and GROUPNAME will be in newly malloc'd memory. - Either one might be NULL instead, indicating that it was not - given and the corresponding numeric ID was left unchanged. +/* 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 says that only '0' through '9' are digits. Prefer ISDIGIT to + ISDIGIT_LOCALE 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 int) (c) - '0' <= 9) - Return NULL if successful, a static error message string if not. */ +#ifdef __DJGPP__ + +/* Return true if STR represents an unsigned decimal integer. */ -const char * -parse_user_spec (spec_arg, uid, gid, username, groupname) - const char *spec_arg; - uid_t *uid; - gid_t *gid; - char **username, **groupname; +static bool +is_number (const char *str) { - static const char *tired = "virtual memory exhausted"; + do + { + if (!ISDIGIT (*str)) + return false; + } + while (*++str); + + return true; +} +#endif + +static char const * +parse_with_separator (char const *spec, char const *separator, + uid_t *uid, gid_t *gid, + char **username, char **groupname) +{ + 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"); + 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 *u; + char const *g; + char *gname = NULL; + uid_t unum = *uid; + gid_t gnum = *gid; error_msg = NULL; *username = *groupname = NULL; - spec_len = strlen (spec_arg); - spec = (char *) alloca (strlen (spec_arg) + 1); - strcpy (spec, spec_arg); + /* Set U and G to nonzero length strings corresponding to user and + group specifiers or to NULL. If U is not NULL, it is a newly + allocated string. */ - /* Find the separator if there is one. */ - separator = index (spec, ':'); + u = NULL; if (separator == NULL) - separator = index (spec, '.'); - - /* Replace separator with a NUL. */ - if (separator != NULL) - *separator = '\0'; - - /* Set U and G to non-zero length strings corresponding to user and - group specifiers or to NULL. */ - u = (*spec == '\0' ? NULL : spec); + { + if (*spec) + u = xstrdup (spec); + } + else + { + size_t ulen = separator - spec; + if (ulen != 0) + { + u = xmemdup (spec, ulen + 1); + u[ulen] = '\0'; + } + } g = (separator == NULL || *(separator + 1) == '\0' ? NULL : separator + 1); - 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)) - error_msg = "invalid user"; + bool use_login_group = (separator != NULL && g == NULL); + if (use_login_group) + error_msg = E_bad_spec; 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"; + unsigned long int tmp; + if (xstrtoul (u, NULL, 10, &tmp, "") == LONGINT_OK + && tmp <= MAXUID) + unum = tmp; else - *uid = atoi (u); + error_msg = E_invalid_user; } } else { - *uid = pwd->pw_uid; + unum = pwd->pw_uid; if (g == NULL && separator != NULL) { /* A separator was given, but a group was not specified, so get the login group. */ - *gid = pwd->pw_gid; - grp = getgrgid (pwd->pw_gid); - if (grp == NULL) - { - /* This is enough room to hold the unsigned decimal - representation of any 32-bit quantity and the trailing - zero byte. */ - char uint_buf[21]; - sprintf (uint_buf, "%u", (unsigned) (pwd->pw_gid)); - *groupname = strdup (uint_buf); - } - else - { - *groupname = strdup (grp->gr_name); - } - if (*groupname == NULL) - error_msg = tired; + char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + gnum = pwd->pw_gid; + grp = getgrgid (gnum); + gname = xstrdup (grp ? grp->gr_name : umaxtostr (gnum, buf)); endgrent (); } } endpwent (); - - if (error_msg == NULL) - { - *username = strdup (u); - if (*username == NULL) - error_msg = tired; - } } if (g != NULL && error_msg == NULL) @@ -193,43 +213,77 @@ parse_user_spec (spec_arg, uid, gid, username, groupname) grp = getgrnam (g); if (grp == NULL) { - if (!isnumber (g)) - error_msg = "invalid group"; + unsigned long int tmp; + if (xstrtoul (g, NULL, 10, &tmp, "") == LONGINT_OK && tmp <= MAXGID) + gnum = tmp; else - *gid = atoi (g); + error_msg = E_invalid_group; } else - *gid = grp->gr_gid; + gnum = grp->gr_gid; endgrent (); /* Save a file descriptor. */ + gname = xstrdup (g); + } - if (error_msg == NULL) - { - *groupname = strdup (g); - if (*groupname == NULL) - error_msg = tired; - } + if (error_msg == NULL) + { + *uid = unum; + *gid = gnum; + *username = u; + *groupname = gname; + u = NULL; } + else + free (gname); + + free (u); + return _(error_msg); +} + +/* Extract from SPEC, 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 separator is given, + use the given user's login group. + If SPEC contains a `:', then use that as the separator, ignoring + any `.'s. If there is no `:', but there is a `.', then first look + up the entire SPEC 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 + given and the corresponding numeric ID was left unchanged. - if (error_msg) + Return NULL if successful, a static error message string if not. */ + +char const * +parse_user_spec (char const *spec, uid_t *uid, gid_t *gid, + char **username, char **groupname) +{ + char const *colon = strchr (spec, ':'); + char const *error_msg = + parse_with_separator (spec, colon, uid, gid, username, groupname); + + if (!colon && error_msg) { - if (*groupname != NULL) - { - free (*groupname); - *groupname = NULL; - } - if (*username != NULL) - { - free (*username); - *username = NULL; - } + /* If there's no colon but there is a dot, and if looking up the + whole spec failed (i.e., the spec is not a owner name that + includes a dot), then try again, but interpret the dot as a + separator. This is a compatible extension to POSIX, since + the POSIX-required behavior is always tried first. */ + + char const *dot = strchr (spec, '.'); + if (dot + && ! parse_with_separator (spec, dot, uid, gid, username, groupname)) + error_msg = NULL; } 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) @@ -247,10 +301,10 @@ main (int argc, char **argv) tmp = strdup (argv[i]); e = parse_user_spec (tmp, &uid, &gid, &username, &groupname); free (tmp); - printf ("%s: %u %u %s %s %s\n", + printf ("%s: %lu %lu %s %s %s\n", argv[i], - (unsigned int) uid, - (unsigned int) gid, + (unsigned long int) uid, + (unsigned long int) gid, NULL_CHECK (username), NULL_CHECK (groupname), NULL_CHECK (e));