X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fuserspec.c;h=17f9326ae680b8f86e9647af9893a68a35fccb02;hb=fa3486514bd8f15f8eb4c49821d0356b52e5a335;hp=33a9cfd1a2c43103c1627e419e0bb19dd2280e9a;hpb=eef56b544e01755a52fdfbf204e6f2d5800efd21;p=gnulib.git
diff --git a/lib/userspec.c b/lib/userspec.c
index 33a9cfd1a..17f9326ae 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-2007 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,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"
@@ -53,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
@@ -83,17 +71,17 @@ 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
+ 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__
-
/* Return true if STR represents an unsigned decimal integer. */
static bool
@@ -117,8 +105,7 @@ parse_with_separator (char const *spec, char const *separator,
{
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;
@@ -167,12 +154,17 @@ 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;
+ {
+ /* If there is no group,
+ then there may not be a trailing ":", either. */
+ error_msg = E_bad_spec;
+ }
else
{
unsigned long int tmp;
@@ -203,7 +195,8 @@ parse_with_separator (char const *spec, char const *separator,
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;