projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New modules unistr/u*-mbsnlen.
[gnulib.git]
/
lib
/
userspec.c
diff --git
a/lib/userspec.c
b/lib/userspec.c
index
33a9cfd
..
c1f580a
100644
(file)
--- a/
lib/userspec.c
+++ b/
lib/userspec.c
@@
-1,5
+1,5
@@
/* userspec.c -- Parse a user and group string.
/* userspec.c -- Parse a user and group string.
- Copyright (C) 1989-1992, 1997-1998, 2000, 2002-200
5
Free Software
+ Copyright (C) 1989-1992, 1997-1998, 2000, 2002-200
7
Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-14,13
+14,11
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "userspec.h"
/* Specification. */
#include "userspec.h"
@@
-39,13
+37,10
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include "intprops.h"
#include "inttostr.h"
#include "intprops.h"
#include "inttostr.h"
-#include "strdup.h"
#include "xalloc.h"
#include "xstrtol.h"
#include "xalloc.h"
#include "xstrtol.h"
@@
-53,12
+48,6
@@
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#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
#ifndef HAVE_ENDGRENT
# define endgrent() ((void) 0)
#endif
@@
-84,11
+73,11
@@
struct group *getgrgid ();
#endif
/* ISDIGIT differs from isdigit, as follows:
#endif
/* 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
- 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)
of `digit' even when the host does not conform to POSIX. */
#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
@@
-117,8
+106,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_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;
const char *error_msg;
struct passwd *pwd;
@@
-167,12
+155,17
@@
parse_with_separator (char const *spec, char const *separator,
if (u != NULL)
{
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)
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;
else
{
unsigned long int tmp;
@@
-203,7
+196,8
@@
parse_with_separator (char const *spec, char const *separator,
if (g != NULL && error_msg == NULL)
{
/* Explicit group. */
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 (grp == NULL)
{
unsigned long int tmp;