X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fuserspec.c;h=f00308d45e543a060db0035471a8a8e26f564e8e;hb=c4ce48ac70176ce110a9d568975972096ffed88d;hp=135a36c5d949a0aa4aede0c3ae448bc0e8ba6c29;hpb=2cbc4063244a149c6454b87eaa061fc290f1c6e3;p=gnulib.git

diff --git a/lib/userspec.c b/lib/userspec.c
index 135a36c5d..f00308d45 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -57,6 +57,14 @@ char *alloca ();
 # include <unistd.h>
 #endif
 
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+#define N_(Text) Text
+
 #ifndef _POSIX_VERSION
 struct passwd *getpwnam ();
 struct group *getgrnam ();
@@ -112,8 +120,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.
-   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.
+   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
@@ -125,13 +137,22 @@ const char *
 parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 		 char **username_arg, char **groupname_arg)
 {
-  static const char *tired = "virtual memory exhausted";
+  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 =
+    N_("cannot get the login group of a numeric UID");
+  static const char *E_cannot_omit_both =
+    N_("cannot omit both user and group");
+
   const char *error_msg;
   char *spec;			/* A copy we can write on.  */
   struct passwd *pwd;
   struct group *grp;
   char *g, *u, *separator;
   char *groupname;
+  int maybe_retry = 0;
+  char *dot = NULL;
 
   error_msg = NULL;
   *username_arg = *groupname_arg = NULL;
@@ -139,10 +160,24 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 
   V_STRDUP (spec, spec_arg);
 
-  /* Find the separator if there is one.  */
+  /* Find the POSIX `:' separator if there is one.  */
   separator = strchr (spec, ':');
+
+  /* If there is no colon, then see if there's a `.'.  */
   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)
@@ -157,7 +192,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
        : separator + 1);
 
   if (u == NULL && g == NULL)
-    return "can not omit both user and group";
+    return _(E_cannot_omit_both);
 
 #ifdef __DJGPP__
   /* Pretend that we are the user U whose group is G.  This makes
@@ -175,13 +210,13 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 	{
 
 	  if (!is_number (u))
-	    error_msg = "invalid user";
+	    error_msg = _(E_invalid_user);
 	  else
 	    {
 	      int use_login_group;
 	      use_login_group = (separator != NULL && g == NULL);
 	      if (use_login_group)
-		error_msg = "cannot get the login group of a numeric UID";
+		error_msg = _(E_bad_spec);
 	      else
 		{
 		  /* FIXME: don't use atoi!  */
@@ -224,7 +259,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
       if (grp == NULL)
 	{
 	  if (!is_number (g))
-	    error_msg = "invalid group";
+	    error_msg = _(E_invalid_group);
 	  else
 	    {
 	      /* FIXME: don't use atoi!  */
@@ -245,7 +280,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 	{
 	  *username_arg = strdup (u);
 	  if (*username_arg == NULL)
-	    error_msg = tired;
+	    error_msg = _(E_no_memory);
 	}
 
       if (groupname != NULL && error_msg == NULL)
@@ -258,11 +293,19 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
 		  free (*username_arg);
 		  *username_arg = NULL;
 		}
-	      error_msg = tired;
+	      error_msg = _(E_no_memory);
 	    }
 	}
     }
 
+  if (error_msg && maybe_retry)
+    {
+      maybe_retry = 0;
+      separator = dot;
+      error_msg = NULL;
+      goto retry;
+    }
+
   return error_msg;
 }