shrink tmp array length from 80 to 16.

[gnulib.git] / lib / userspec.c

diff --git a/lib/userspec.c b/lib/userspec.c
index e058b54..67bde65 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -40,6 +40,14 @@ char *alloca ();
 #include <pwd.h>
 #include <grp.h>
 
 #include <pwd.h>
 #include <grp.h>
 

+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+

 #if HAVE_STRING_H
 # include <string.h>
 #else
 #if HAVE_STRING_H
 # include <string.h>
 #else


@@ -57,6 +65,9 @@ char *alloca ();
 # include <unistd.h>
 #endif
 
 # include <unistd.h>
 #endif
 

+#include "xalloc.h"
+#include "xstrtol.h"
+

 #if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
 #if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)


@@ -79,6 +90,34 @@ struct group *getgrgid ();
 # define endpwent() ((void) 0)
 #endif
 
 # define endpwent() ((void) 0)
 #endif
 

+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+
+/* The extra casts work around common compiler bugs.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
+   It is necessary at least when t == time_t.  */
+#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
+                             ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
+#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
+
+#ifndef UID_T_MAX
+# define UID_T_MAX TYPE_MAXIMUM (uid_t)
+#endif
+
+#ifndef GID_T_MAX
+# define GID_T_MAX TYPE_MAXIMUM (gid_t)
+#endif
+
+/* MAXUID may come from limits.h or sys/params.h.  */
+#ifndef MAXUID
+# define MAXUID UID_T_MAX
+#endif
+#ifndef MAXGID
+# define MAXGID GID_T_MAX
+#endif
+

 /* Perform the equivalent of the statement `dest = strdup (src);',
    but obtaining storage via alloca instead of from the heap.  */
 
 /* Perform the equivalent of the statement `dest = strdup (src);',
    but obtaining storage via alloca instead of from the heap.  */
 


@@ -120,8 +159,12 @@ is_number (const char *str)
 /* Extract from NAME, which has the form "[user][:.][group]",
    a USERNAME, UID U, GROUPNAME, and GID G.
    Either user or group, or both, must be present.
 /* Extract from NAME, which has the form "[user][:.][group]",
    a USERNAME, UID U, GROUPNAME, and GID G.
    Either user or group, or both, must be present.

-   If the group is omitted but the ":" or "." separator is given,
+   If the group is omitted but the ":" separator is given,

    use the given user's login group.
    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.

 
    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


@@ -133,7 +176,6 @@ const char *
 parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
                 char **username_arg, char **groupname_arg)
 {
 parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
                 char **username_arg, char **groupname_arg)
 {

-  static const char *E_no_memory = N_("virtual memory exhausted");

   static const char *E_invalid_user = N_("invalid user");
   static const char *E_invalid_group = N_("invalid group");
   static const char *E_bad_spec =
   static const char *E_invalid_user = N_("invalid user");
   static const char *E_invalid_group = N_("invalid group");
   static const char *E_bad_spec =


@@ -147,6 +189,8 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
   struct group *grp;
   char *g, *u, *separator;
   char *groupname;
   struct group *grp;
   char *g, *u, *separator;
   char *groupname;

+  int maybe_retry = 0;
+  char *dot = NULL;

 
   error_msg = NULL;
   *username_arg = *groupname_arg = NULL;
 
   error_msg = NULL;
   *username_arg = *groupname_arg = NULL;


@@ -154,13 +198,24 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 
   V_STRDUP (spec, spec_arg);
 
 
   V_STRDUP (spec, spec_arg);
 

-  /* Find the separator if there is one.  */
+  /* Find the POSIX `:' separator if there is one.  */

   separator = strchr (spec, ':');
 
   separator = strchr (spec, ':');
 

-  /* FIXME: accepting `.' as the separator is contrary to POSIX.
-     someday we should drop support for this.  */
+  /* If there is no colon, then see if there's a `.'.  */

   if (separator == NULL)
   if (separator == NULL)

-    separator = strchr (spec, '.');
+    {
+      dot = strchr (spec, '.');
+      /* If there's no colon but there is a `.', then first look up the
+        whole spec, in case it's an OWNER name that includes a dot.
+        If that fails, then we'll try again, but interpreting the `.'
+        as a separator.  */
+      /* FIXME: accepting `.' as the separator is contrary to POSIX.
+        someday we should drop support for this.  */
+      if (dot)
+       maybe_retry = 1;
+    }
+
+ retry:

 
   /* Replace separator with a NUL.  */
   if (separator != NULL)
 
   /* Replace separator with a NUL.  */
   if (separator != NULL)


@@ -193,17 +248,21 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
        {
 
          if (!is_number (u))
        {
 
          if (!is_number (u))

-           error_msg = _(E_invalid_user);
+           error_msg = E_invalid_user;

          else
            {
              int use_login_group;
              use_login_group = (separator != NULL && g == NULL);
              if (use_login_group)
          else
            {
              int use_login_group;
              use_login_group = (separator != NULL && g == NULL);
              if (use_login_group)

-               error_msg = _(E_bad_spec);
+               error_msg = E_bad_spec;

              else
                {
              else
                {

-                 /* FIXME: don't use atoi!  */
-                 *uid = atoi (u);
+                 unsigned long int tmp_long;
+                 if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+                     || tmp_long > MAXUID)
+                   return _(E_invalid_user);
+                 printf ("MAXUID: %u\n", (uid_t) MAXUID);
+                 *uid = tmp_long;

                }
            }
        }
                }
            }
        }


@@ -242,11 +301,14 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
       if (grp == NULL)
        {
          if (!is_number (g))
       if (grp == NULL)
        {
          if (!is_number (g))

-           error_msg = _(E_invalid_group);
+           error_msg = E_invalid_group;

          else
            {
          else
            {

-             /* FIXME: don't use atoi!  */
-             *gid = atoi (g);
+             unsigned long int tmp_long;
+             if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK
+                 || tmp_long > MAXGID)
+               return _(E_invalid_group);
+             *gid = tmp_long;

            }
        }
       else
            }
        }
       else


@@ -263,7 +325,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
        {
          *username_arg = strdup (u);
          if (*username_arg == NULL)
        {
          *username_arg = strdup (u);
          if (*username_arg == NULL)

-           error_msg = _(E_no_memory);
+           error_msg = xalloc_msg_memory_exhausted;

        }
 
       if (groupname != NULL && error_msg == NULL)
        }
 
       if (groupname != NULL && error_msg == NULL)


@@ -276,12 +338,20 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
                  free (*username_arg);
                  *username_arg = NULL;
                }
                  free (*username_arg);
                  *username_arg = NULL;
                }

-             error_msg = _(E_no_memory);
+             error_msg = xalloc_msg_memory_exhausted;

            }
        }
     }
 
            }
        }
     }
 

-  return error_msg;
+  if (error_msg && maybe_retry)
+    {
+      maybe_retry = 0;
+      separator = dot;
+      error_msg = NULL;
+      goto retry;
+    }
+
+  return _(error_msg);

 }
 
 #ifdef TEST
 }
 
 #ifdef TEST