[PATCH] userspec: support optional parameters to parse_user_spec()

[Pádraig Brady]

* lib/userspec.c (parse_user_spec): If the GID param is NULL,
then avoid group processing and treat the full spec as a user.
(parse_with_separator): Allow the USERNAME and GROUPNAME to
be optional params (NULL), in which case they're ignored.
* tests/test-userspec.c (main): Ensure NULL params are ignored.
---
 ChangeLog             |    8 ++++++++
 lib/userspec.c        |   32 ++++++++++++++++++++++----------
 tests/test-userspec.c |   12 ++++++++++++
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a467bbe..10965bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-19  Pádraig Brady  <address@hidden>
+
+       userspec: support optional parameters to parse_user_spec()
+       * lib/userspec.c (parse_user_spec): If the GID param is NULL,
+       then avoid group processing and treat the full spec as a user.
+       (parse_with_separator): Allow the USERNAME and GROUPNAME to
+       be optional params (NULL), in which case they're ignored.
+
 2013-09-17  Kevin Cernekee  <address@hidden>
 
        fflush, freadahead, fseeko: Fix for Android
diff --git a/lib/userspec.c b/lib/userspec.c
index d760996..760b007 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -114,10 +114,13 @@ parse_with_separator (char const *spec, char const 
*separator,
   char const *g;
   char *gname = NULL;
   uid_t unum = *uid;
-  gid_t gnum = *gid;
+  gid_t gnum = gid ? *gid : 0;
 
   error_msg = NULL;
-  *username = *groupname = NULL;
+  if (username)
+    *username = NULL;
+  if (groupname)
+    *groupname = NULL;
 
   /* Set U and G to nonzero length strings corresponding to user and
      group specifiers or to NULL.  If U is not NULL, it is a newly
@@ -215,20 +218,29 @@ parse_with_separator (char const *spec, char const 
*separator,
   if (error_msg == NULL)
     {
       *uid = unum;
-      *gid = gnum;
-      *username = u;
-      *groupname = gname;
-      u = NULL;
+      if (gid)
+        *gid = gnum;
+      if (username)
+        {
+          *username = u;
+          u = NULL;
+        }
+      if (groupname)
+        {
+          *groupname = gname;
+          gname = NULL;
+        }
     }
-  else
-    free (gname);
 
   free (u);
+  free (gname);
   return _(error_msg);
 }
 
 /* Extract from SPEC, which has the form "[user][:.][group]",
    a USERNAME, UID U, GROUPNAME, and GID G.
+   If the GID parameter is NULL the entire SPEC is treated as a user.
+   If the USERNAME and GROUPNAME parameters are NULL they're ignored.
    Either user or group, or both, must be present.
    If the group is omitted but the separator is given,
    use the given user's login group.
@@ -247,11 +259,11 @@ char const *
 parse_user_spec (char const *spec, uid_t *uid, gid_t *gid,
                  char **username, char **groupname)
 {
-  char const *colon = strchr (spec, ':');
+  char const *colon = gid ? strchr (spec, ':') : NULL;
   char const *error_msg =
     parse_with_separator (spec, colon, uid, gid, username, groupname);
 
-  if (!colon && error_msg)
+  if (gid && !colon && error_msg)
     {
       /* If there's no colon but there is a dot, and if looking up the
          whole spec failed (i.e., the spec is not an owner name that
diff --git a/tests/test-userspec.c b/tests/test-userspec.c
index 5b02664..d6e0161 100644
--- a/tests/test-userspec.c
+++ b/tests/test-userspec.c
@@ -181,6 +181,18 @@ main (void)
         }
     }
 
+  /* Ensure NULL parameters are ignored.  */
+  {
+    uid_t uid = (uid_t) -1;
+    gid_t gid = (gid_t) -1;
+    char const *diag = parse_user_spec ("", &uid, NULL, NULL, NULL);
+    if (diag)
+      {
+        printf ("unexpected error: %s\n", diag);
+        fail = 1;
+      }
+  }
+
   return fail;
 }
 
-- 
1.7.7.6