X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=d4554f8d8d56664c04959802c539b9350f7aedb9;hb=25b6b5120113989e0b91de9d0b75d3d625bbc753;hp=037961d4746374e5d3b02c2a03c0f64ddc2b4ac9;hpb=34a6f4d55164800bfdb64b660b188579363a2bd5;p=gnulib.git
diff --git a/lib/userspec.c b/lib/userspec.c
index 037961d47..d4554f8d8 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -1,11 +1,11 @@
/* userspec.c -- Parse a user and group string.
- Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2004 Free Software
+ Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2012 Free Software
Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,14 +13,11 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#include "userspec.h"
@@ -39,12 +36,10 @@
#include
#include
-#if HAVE_UNISTD_H
-# include
-#endif
+#include
+#include "intprops.h"
#include "inttostr.h"
-#include "strdup.h"
#include "xalloc.h"
#include "xstrtol.h"
@@ -52,12 +47,6 @@
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-#ifndef _POSIX_VERSION
-struct passwd *getpwnam ();
-struct group *getgrnam ();
-struct group *getgrgid ();
-#endif
-
#ifndef HAVE_ENDGRENT
# define endgrent() ((void) 0)
#endif
@@ -66,14 +55,6 @@ struct group *getgrgid ();
# define endpwent() ((void) 0)
#endif
-/* 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)))
-
#ifndef UID_T_MAX
# define UID_T_MAX TYPE_MAXIMUM (uid_t)
#endif
@@ -90,16 +71,16 @@ struct group *getgrgid ();
# define MAXGID GID_T_MAX
#endif
+#ifdef __DJGPP__
+
/* 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.
+ - Its arg may be any int or unsigned int; it need not be an unsigned char
+ or EOF.
- 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)
-
-#ifdef __DJGPP__
+ 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 int) (c) - '0' <= 9)
/* Return true if STR represents an unsigned decimal integer. */
@@ -109,7 +90,7 @@ is_number (const char *str)
do
{
if (!ISDIGIT (*str))
- return false;
+ return false;
}
while (*++str);
@@ -119,13 +100,12 @@ is_number (const char *str)
static char const *
parse_with_separator (char const *spec, char const *separator,
- uid_t *uid, gid_t *gid,
- char **username, char **groupname)
+ 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");
+ static const char *E_bad_spec = N_("invalid spec");
const char *error_msg;
struct passwd *pwd;
@@ -147,16 +127,16 @@ parse_with_separator (char const *spec, char const *separator,
if (separator == NULL)
{
if (*spec)
- u = xstrdup (spec);
+ u = xstrdup (spec);
}
else
{
size_t ulen = separator - spec;
if (ulen != 0)
- {
- u = xmemdup (spec, ulen + 1);
- u[ulen] = '\0';
- }
+ {
+ u = xmemdup (spec, ulen + 1);
+ u[ulen] = '\0';
+ }
}
g = (separator == NULL || *(separator + 1) == '\0'
@@ -165,7 +145,7 @@ parse_with_separator (char const *spec, char const *separator,
#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. */
+ 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))
@@ -174,54 +154,61 @@ parse_with_separator (char const *spec, char const *separator,
if (u != NULL)
{
- pwd = getpwnam (u);
+ /* If it starts with "+", skip the look-up. */
+ pwd = (*u == '+' ? NULL : getpwnam (u));
if (pwd == NULL)
- {
- bool use_login_group = (separator != NULL && g == NULL);
- if (use_login_group)
- error_msg = E_bad_spec;
- else
- {
- unsigned long int tmp;
- if (xstrtoul (u, NULL, 10, &tmp, "") == LONGINT_OK
- && tmp <= MAXUID)
- unum = tmp;
- else
- error_msg = E_invalid_user;
- }
- }
+ {
+ bool use_login_group = (separator != NULL && g == NULL);
+ if (use_login_group)
+ {
+ /* If there is no group,
+ then there may not be a trailing ":", either. */
+ error_msg = E_bad_spec;
+ }
+ else
+ {
+ unsigned long int tmp;
+ if (xstrtoul (u, NULL, 10, &tmp, "") == LONGINT_OK
+ && tmp <= MAXUID && (uid_t) tmp != (uid_t) -1)
+ unum = tmp;
+ else
+ error_msg = E_invalid_user;
+ }
+ }
else
- {
- unum = pwd->pw_uid;
- if (g == NULL && separator != NULL)
- {
- /* A separator was given, but a group was not specified,
- so get the login group. */
- char buf[INT_BUFSIZE_BOUND (uintmax_t)];
- gnum = pwd->pw_gid;
- grp = getgrgid (gnum);
- gname = xstrdup (grp ? grp->gr_name : umaxtostr (gnum, buf));
- endgrent ();
- }
- }
+ {
+ unum = pwd->pw_uid;
+ if (g == NULL && separator != NULL)
+ {
+ /* A separator was given, but a group was not specified,
+ so get the login group. */
+ 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 (g != NULL && error_msg == NULL)
{
/* Explicit group. */
- grp = getgrnam (g);
+ /* If it starts with "+", skip the look-up. */
+ grp = (*g == '+' ? NULL : getgrnam (g));
if (grp == NULL)
- {
- unsigned long int tmp;
- if (xstrtoul (g, NULL, 10, &tmp, "") == LONGINT_OK && tmp <= MAXGID)
- gnum = tmp;
- else
- error_msg = E_invalid_group;
- }
+ {
+ unsigned long int tmp;
+ if (xstrtoul (g, NULL, 10, &tmp, "") == LONGINT_OK
+ && tmp <= MAXGID && (gid_t) tmp != (gid_t) -1)
+ gnum = tmp;
+ else
+ error_msg = E_invalid_group;
+ }
else
- gnum = grp->gr_gid;
- endgrent (); /* Save a file descriptor. */
+ gnum = grp->gr_gid;
+ endgrent (); /* Save a file descriptor. */
gname = xstrdup (g);
}
@@ -245,10 +232,10 @@ parse_with_separator (char const *spec, char const *separator,
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
+ 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.
+ 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
@@ -258,7 +245,7 @@ parse_with_separator (char const *spec, char const *separator,
char const *
parse_user_spec (char const *spec, uid_t *uid, gid_t *gid,
- char **username, char **groupname)
+ char **username, char **groupname)
{
char const *colon = strchr (spec, ':');
char const *error_msg =
@@ -267,15 +254,15 @@ parse_user_spec (char const *spec, uid_t *uid, gid_t *gid,
if (!colon && error_msg)
{
/* 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. */
+ whole spec failed (i.e., the spec is not an 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;
+ && ! parse_with_separator (spec, dot, uid, gid, username, groupname))
+ error_msg = NULL;
}
return error_msg;
@@ -302,15 +289,21 @@ main (int argc, char **argv)
e = parse_user_spec (tmp, &uid, &gid, &username, &groupname);
free (tmp);
printf ("%s: %lu %lu %s %s %s\n",
- argv[i],
- (unsigned long int) uid,
- (unsigned long int) gid,
- NULL_CHECK (username),
- NULL_CHECK (groupname),
- NULL_CHECK (e));
+ argv[i],
+ (unsigned long int) uid,
+ (unsigned long int) gid,
+ NULL_CHECK (username),
+ NULL_CHECK (groupname),
+ NULL_CHECK (e));
}
exit (0);
}
#endif
+
+/*
+Local Variables:
+indent-tabs-mode: nil
+End:
+*/