X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fuserspec.c;h=17f9326ae680b8f86e9647af9893a68a35fccb02;hb=18d9031f0a79d68edeac0d36dd78c5cbe52a9031;hp=4dbaee0a36823c354f491155ce922edec3baea38;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git
diff --git a/lib/userspec.c b/lib/userspec.c
index 4dbaee0a3..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-2006 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,8 +13,7 @@
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 . */
@@ -41,7 +40,6 @@
#include "intprops.h"
#include "inttostr.h"
-#include "strdup.h"
#include "xalloc.h"
#include "xstrtol.h"
@@ -73,6 +71,8 @@
# 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
or EOF.
@@ -82,8 +82,6 @@
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
@@ -156,7 +154,8 @@ 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);
@@ -196,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;