X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=a96b63a003b364f8aa5007ff04f91bd648890a71;hb=c6f9e663d25b0980c51f609a3fe237deca168461;hp=5488c31ec8864ed9dfca37f105a3b83afdfcfa1e;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git
diff --git a/lib/userspec.c b/lib/userspec.c
index 5488c31ec..a96b63a00 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-2005 Free Software
+ Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2011 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie . */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#include "userspec.h"
@@ -39,13 +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"
@@ -77,16 +71,16 @@
# 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
+ 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)
-
-#ifdef __DJGPP__
+# define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
/* Return true if STR represents an unsigned decimal integer. */
@@ -96,7 +90,7 @@ is_number (const char *str)
do
{
if (!ISDIGIT (*str))
- return false;
+ return false;
}
while (*++str);
@@ -106,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;
@@ -134,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'
@@ -161,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,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 =
@@ -254,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;
@@ -289,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:
+*/