From 42956c5d101d677aa660e1cdd5df3d8ab1a1d348 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 28 Nov 2009 07:26:53 +0100 Subject: [PATCH 1/1] userspec: reformat to use spaces, not TABs * lib/userspec.c: Expand TABs to spaces. Add Emacs' "indent-tabs-mode: nil" hint. --- ChangeLog | 6 +++ lib/userspec.c | 130 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 74 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index 036bf072a..e274ef72a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-28 Jim Meyering + + userspec: reformat to use spaces, not TABs + * lib/userspec.c: Expand TABs to spaces. + Add Emacs' "indent-tabs-mode: nil" hint. + 2009-11-27 Eric Blake getopt-gnu: flush out another BSD bug diff --git a/lib/userspec.c b/lib/userspec.c index 17f9326ae..fa2f26fa0 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -1,5 +1,5 @@ /* userspec.c -- Parse a user and group string. - Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2007 Free Software + Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -90,7 +90,7 @@ is_number (const char *str) do { if (!ISDIGIT (*str)) - return false; + return false; } while (*++str); @@ -100,8 +100,8 @@ is_number (const char *str) static char const * parse_with_separator (char const *spec, char const *separator, - uid_t *uid, gid_t *gid, - char **username, char **groupname) + uid_t *uid, gid_t *gid, + char **username, char **groupname) { static const char *E_invalid_user = N_("invalid user"); static const char *E_invalid_group = N_("invalid group"); @@ -127,16 +127,16 @@ parse_with_separator (char const *spec, char const *separator, if (separator == NULL) { if (*spec) - u = xstrdup (spec); + u = xstrdup (spec); } else { size_t ulen = separator - spec; if (ulen != 0) - { - u = xmemdup (spec, ulen + 1); - u[ulen] = '\0'; - } + { + u = xmemdup (spec, ulen + 1); + u[ulen] = '\0'; + } } g = (separator == NULL || *(separator + 1) == '\0' @@ -157,38 +157,38 @@ parse_with_separator (char const *spec, char const *separator, /* 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 there is no group, - then there may not be a trailing ":", either. */ - error_msg = E_bad_spec; - } - else - { - unsigned long int tmp; - if (xstrtoul (u, NULL, 10, &tmp, "") == LONGINT_OK - && tmp <= MAXUID) - unum = tmp; - else - error_msg = E_invalid_user; - } - } + { + bool use_login_group = (separator != NULL && g == NULL); + if (use_login_group) + { + /* If there is no group, + then there may not be a trailing ":", either. */ + error_msg = E_bad_spec; + } + else + { + unsigned long int tmp; + if (xstrtoul (u, NULL, 10, &tmp, "") == LONGINT_OK + && tmp <= MAXUID) + unum = tmp; + else + error_msg = E_invalid_user; + } + } else - { - unum = pwd->pw_uid; - if (g == NULL && separator != NULL) - { - /* A separator was given, but a group was not specified, - so get the login group. */ - char buf[INT_BUFSIZE_BOUND (uintmax_t)]; - gnum = pwd->pw_gid; - grp = getgrgid (gnum); - gname = xstrdup (grp ? grp->gr_name : umaxtostr (gnum, buf)); - endgrent (); - } - } + { + unum = pwd->pw_uid; + if (g == NULL && separator != NULL) + { + /* A separator was given, but a group was not specified, + so get the login group. */ + char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + gnum = pwd->pw_gid; + grp = getgrgid (gnum); + gname = xstrdup (grp ? grp->gr_name : umaxtostr (gnum, buf)); + endgrent (); + } + } endpwent (); } @@ -198,16 +198,16 @@ parse_with_separator (char const *spec, char const *separator, /* If it starts with "+", skip the look-up. */ grp = (*g == '+' ? NULL : getgrnam (g)); if (grp == NULL) - { - unsigned long int tmp; - if (xstrtoul (g, NULL, 10, &tmp, "") == LONGINT_OK && tmp <= MAXGID) - gnum = tmp; - else - error_msg = E_invalid_group; - } + { + unsigned long int tmp; + if (xstrtoul (g, NULL, 10, &tmp, "") == LONGINT_OK && tmp <= MAXGID) + gnum = tmp; + else + error_msg = E_invalid_group; + } else - gnum = grp->gr_gid; - endgrent (); /* Save a file descriptor. */ + gnum = grp->gr_gid; + endgrent (); /* Save a file descriptor. */ gname = xstrdup (g); } @@ -244,7 +244,7 @@ parse_with_separator (char const *spec, char const *separator, char const * parse_user_spec (char const *spec, uid_t *uid, gid_t *gid, - char **username, char **groupname) + char **username, char **groupname) { char const *colon = strchr (spec, ':'); char const *error_msg = @@ -253,15 +253,15 @@ parse_user_spec (char const *spec, uid_t *uid, gid_t *gid, if (!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 a owner name that - includes a dot), then try again, but interpret the dot as a - separator. This is a compatible extension to POSIX, since - the POSIX-required behavior is always tried first. */ + whole spec failed (i.e., the spec is not a owner name that + includes a dot), then try again, but interpret the dot as a + separator. This is a compatible extension to POSIX, since + the POSIX-required behavior is always tried first. */ char const *dot = strchr (spec, '.'); if (dot - && ! parse_with_separator (spec, dot, uid, gid, username, groupname)) - error_msg = NULL; + && ! parse_with_separator (spec, dot, uid, gid, username, groupname)) + error_msg = NULL; } return error_msg; @@ -288,15 +288,21 @@ main (int argc, char **argv) e = parse_user_spec (tmp, &uid, &gid, &username, &groupname); free (tmp); printf ("%s: %lu %lu %s %s %s\n", - argv[i], - (unsigned long int) uid, - (unsigned long int) gid, - NULL_CHECK (username), - NULL_CHECK (groupname), - NULL_CHECK (e)); + argv[i], + (unsigned long int) uid, + (unsigned long int) gid, + NULL_CHECK (username), + NULL_CHECK (groupname), + NULL_CHECK (e)); } exit (0); } #endif + +/* +Local Variables: +indent-tabs-mode: nil +End: +*/ -- 2.11.0