Adjust to work with new autoconf macros, AC_FUNC_MALLOC

[gnulib.git] / lib / userspec.c

diff --git a/lib/userspec.c b/lib/userspec.c
index 27b687d..9def456 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 Free Software Foundation, Inc.
+   Copyright (C) 1989-1992, 1997, 1998, 2000, 2002 Free Software Foundation, Inc.

 
    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
 
    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


@@ -68,13 +68,9 @@ char *alloca ();
 #include "xalloc.h"
 #include "xstrtol.h"
 
 #include "xalloc.h"
 #include "xstrtol.h"
 

-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid

 
 #ifndef _POSIX_VERSION
 struct passwd *getpwnam ();
 
 #ifndef _POSIX_VERSION
 struct passwd *getpwnam ();


@@ -134,10 +130,9 @@ struct group *getgrgid ();
    - 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.
    - It's typically faster.
    - 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.
    - It's typically faster.

-   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
-   only '0' through '9' are digits.  Prefer ISDIGIT to isdigit unless
-   it's important to use the locale's definition of `digit' even when the
-   host does not conform to Posix.  */
+   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) (c) - '0' <= 9)
 
 #ifndef strdup
 #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
 
 #ifndef strdup


@@ -163,8 +158,8 @@ is_number (const char *str)
    use the given user's login group.
    If SPEC_ARG contains a `:', then use that as the separator, ignoring
    any `.'s.  If there is no `:', but there is a `.', then first look
    use the given user's login group.
    If SPEC_ARG contains a `:', then use that as the separator, ignoring
    any `.'s.  If there is no `:', but there is a `.', then first look

-   up SPEC_ARG as a login name.  If that look-up fails, then try again
-   interpreting the `.'  as a separator.
+   up the entire SPEC_ARG as a login name.  If that look-up fails, then
+   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
 
    USERNAME and GROUPNAME will be in newly malloc'd memory.
    Either one might be NULL instead, indicating that it was not


@@ -304,7 +299,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
          else
            {
              unsigned long int tmp_long;
          else
            {
              unsigned long int tmp_long;

-             if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+             if (xstrtoul (g, NULL, 0, &tmp_long, NULL) != LONGINT_OK

                  || tmp_long > MAXGID)
                return _(E_invalid_group);
              *gid = tmp_long;
                  || tmp_long > MAXGID)
                return _(E_invalid_group);
              *gid = tmp_long;