Mercurial > hg > octave-kai > gnulib-hg
annotate lib/userspec.c @ 7944:a1d177cd9523
* doc/gnulib-tool.texi (Initial import): Update to match current
behavior with strdup module.
* lib/.cppi-disable: Remove strcase.h, strdup.h, strndup.h, strnlen.h.
* lib/memmem.h: Remove; all uses removed. This is now done
by <string.h>.
* lib/mempcpy.h: Likewise.
* lib/memrchr.h: Likewise.
* lib/stpcpy.h: Likewise.
* lib/stpncpy.h: Likewise.
* lib/strcase.h: Likewise.
* lib/strchrnul.h: Likewise.
* lib/strdup.h: Likewise.
* lib/strndup.h: Likewise.
* lib/strnlen.h: Likewise.
* lib/strpbrk.h: Likewise.
* lib/strsep.h: Likewise.
* lib/strstr.h: Likewise.
* lib/strtok_r.h: Likewise.
* lib/string_.h: New file.
* lib/argp-namefrob.h: Don't include no-longer-existent include files.
Rely on <string.h> instead.
* lib/canon-host.c: Likewise.
* lib/chdir-long.c: Likewise.
* lib/concatpath.c: Likewise.
* lib/exclude.c: Likewise.
* lib/fchdir.c: Likewise.
* lib/getaddrinfo.c: Likewise.
* lib/getcwd.c: Likewise.
* lib/getsubopt.c: Likewise.
* lib/glob.c: Likewise.
* lib/hard-locale.c: Likewise.
* lib/iconvme.c: Likewise.
* lib/javacomp.c: Likewise.
* lib/mempcpy.c: Likewise.
* lib/memrchr.c: Likewise.
* lib/regex_internal.h: Likewise.
* lib/stpncpy.c: Likewise.
* lib/strcasecmp.c: Likewise.
* lib/strchrnul.c: Likewise.
* lib/strdup.c: Likewise.
* lib/striconv.c: Likewise.
* lib/striconveh.c: Likewise.
* lib/striconveha.c: Likewise.
* lib/strncasecmp.c: Likewise.
* lib/strndup.c: Likewise.
* lib/strnlen.c: Likewise.
* lib/strsep.c: Likewise.
* lib/strstr.c: Likewise.
* lib/strtok_r.c: Likewise.
* lib/userspec.c: Likewise.
* lib/w32spawn.h: Likewise.
* lib/xstrndup.c: Likewise.
* lib/mountlist.c (strstr): Remove decl.
* m4/string_h.m4: New file.
* m4/memmem.m4 (gl_FUNC_MEMMEM): Set HAVE_DECL_MEMMEM if necessary.
* m4/mempcpy.m4 (gl_FUNC_MEMPCPY): Set HAVE_MEMPCPY if necessary.
* m4/memrchr.m4 (gl_FUNC_MEMRCHR): Set HAVE_MEMRCHR
* m4/stpcpy.m4 (gl_FUNC_STPCPY): Set HAVE_STPCPY if necessary.
* m4/stpncpy.m4 (gl_PREREQ_STPNCPY): Set HAVE_STPNCPY if necessary.
* m4/strcase.m4 (gl_FUNC_STRCASECMP):
Set REPLACE_STRCASECMP if necessary.
(gl_FUNC_STRNCASECMP): Set HAVE_DECL_STRNCASECMP if necessary.
* m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Set HAVE_STRCHRNUL if necessary.
* m4/strdup.m4 (gl_FUNC_STRDUP): Set HAVE_DECL_STRDUP if necessary.
* m4/strndup.m4 (gl_FUNC_STRNDUP): Set HAVE_DECL_STRNLEN and
HAVE_DECL_STRDUP if necessary.
(gl_PREREQ_STRNLEN): Don't bother to check for strnlen decl,
since gl_FUNC_STRNDUP does that now.
* m4/strnlen.m4 (gl_FUNC_STRNLEN): Set HAVE_DECL_STRNLEN if necessary.
Check for decl here...
(gl_PREREQ_STRNLEN): ... not here.
* m4/strpbrk.m4 (gl_FUNC_STRPBRK): Set HAVE_STRPBRK if necessary.
* m4/strsep.m4 (gl_FUNC_STRSEP): Set HAVE_STRSEP if necessary.
* m4/strstr.m4 (gl_FUNC_STRSTR): Set REPLACE_STRSTR if necessary.
* m4/strtok_r.m4 (gl_FUNC_STRTOK_R): Set HAVE_DECL_STRTOK_R if
necessary.
* modules/string: New file.
* modules/memmem (Files): Remove special-purpose include file.
(Depends-on): Add string.
(Include): Include <string.h>, not the removed file.
* modules/mempcpy: Likewise.
* modules/memrchr: Likewise.
* modules/stpcpy: Likewise.
* modules/stpncpy: Likewise.
* modules/strcase: Likewise.
* modules/strchrnul: Likewise.
* modules/strdup: Likewise.
* modules/strndup: Likewise.
* modules/strnlen: Likewise.
* modules/strpbrk: Likewise.
* modules/strsep: Likewise.
* modules/strstr: Likewise.
* modules/strtok_r: Likewise.
* tests/test-dirname.c: Don't include "stdup.h", since
<string.h> now suffices.
* tests/test-memmem.c: Don't include "memmem.h", since
<string.h> now suffices.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 26 Jan 2007 22:16:55 +0000 (2007-01-26) |
| parents | 23cd146c58fd |
| children | bbbbbf4cd1c5 |
| rev | line source |
|---|---|
| 5 | 1 /* userspec.c -- Parse a user and group string. |
|
7909
23cd146c58fd
* lib/userspec.c (parse_with_separator): If a user or group string
Jim Meyering <jim@meyering.net>
parents:
7302
diff
changeset
|
2 Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2007 Free Software |
| 4844 | 3 Foundation, Inc. |
| 5 | 4 |
| 5 This program is free software; you can redistribute it and/or modify | |
| 6 it under the terms of the GNU General Public License as published by | |
| 7 the Free Software Foundation; either version 2, or (at your option) | |
| 8 any later version. | |
| 9 | |
| 10 This program is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 GNU General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
|
650
b4ef1c1a0171
update FSF address in copyright
Jim Meyering <jim@meyering.net>
parents:
499
diff
changeset
|
16 along with this program; if not, write to the Free Software Foundation, |
|
5848
a48fb0e98c8c
*** empty log message ***
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
17 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ |
| 5 | 18 |
| 19 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ | |
| 966 | 20 |
|
7302
8a1a9361108c
* _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents:
6969
diff
changeset
|
21 #include <config.h> |
| 105 | 22 |
|
4962
6bec4bfbd56e
Include strdup.h. From Simon Josefsson.
Bruno Haible <bruno@clisp.org>
parents:
4844
diff
changeset
|
23 /* Specification. */ |
|
6bec4bfbd56e
Include strdup.h. From Simon Josefsson.
Bruno Haible <bruno@clisp.org>
parents:
4844
diff
changeset
|
24 #include "userspec.h" |
|
6bec4bfbd56e
Include strdup.h. From Simon Josefsson.
Bruno Haible <bruno@clisp.org>
parents:
4844
diff
changeset
|
25 |
| 5159 | 26 #include <stdbool.h> |
| 5 | 27 #include <stdio.h> |
| 28 #include <sys/types.h> | |
| 29 #include <pwd.h> | |
| 30 #include <grp.h> | |
| 31 | |
| 2854 | 32 #if HAVE_SYS_PARAM_H |
| 33 # include <sys/param.h> | |
| 34 #endif | |
| 35 | |
| 4333 | 36 #include <limits.h> |
| 4691 | 37 #include <stdlib.h> |
| 38 #include <string.h> | |
| 5 | 39 |
| 6275 | 40 #include <unistd.h> |
| 5 | 41 |
|
5691
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5322
diff
changeset
|
42 #include "intprops.h" |
| 5159 | 43 #include "inttostr.h" |
|
2810
aff553209434
(same_name): Invoke xalloc_die instead of printing our own message.
Jim Meyering <jim@meyering.net>
parents:
2284
diff
changeset
|
44 #include "xalloc.h" |
| 2854 | 45 #include "xstrtol.h" |
|
2810
aff553209434
(same_name): Invoke xalloc_die instead of printing our own message.
Jim Meyering <jim@meyering.net>
parents:
2284
diff
changeset
|
46 |
|
3966
22d3032f0239
Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents:
3700
diff
changeset
|
47 #include "gettext.h" |
|
22d3032f0239
Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents:
3700
diff
changeset
|
48 #define _(msgid) gettext (msgid) |
|
22d3032f0239
Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents:
3700
diff
changeset
|
49 #define N_(msgid) msgid |
| 2273 | 50 |
|
499
62aa0b766a11
[HAVE_ENDGRENT]: Define away endgrent.
Jim Meyering <jim@meyering.net>
parents:
475
diff
changeset
|
51 #ifndef HAVE_ENDGRENT |
|
62aa0b766a11
[HAVE_ENDGRENT]: Define away endgrent.
Jim Meyering <jim@meyering.net>
parents:
475
diff
changeset
|
52 # define endgrent() ((void) 0) |
|
62aa0b766a11
[HAVE_ENDGRENT]: Define away endgrent.
Jim Meyering <jim@meyering.net>
parents:
475
diff
changeset
|
53 #endif |
|
62aa0b766a11
[HAVE_ENDGRENT]: Define away endgrent.
Jim Meyering <jim@meyering.net>
parents:
475
diff
changeset
|
54 |
|
62aa0b766a11
[HAVE_ENDGRENT]: Define away endgrent.
Jim Meyering <jim@meyering.net>
parents:
475
diff
changeset
|
55 #ifndef HAVE_ENDPWENT |
|
62aa0b766a11
[HAVE_ENDGRENT]: Define away endgrent.
Jim Meyering <jim@meyering.net>
parents:
475
diff
changeset
|
56 # define endpwent() ((void) 0) |
| 5 | 57 #endif |
| 58 | |
| 2854 | 59 #ifndef UID_T_MAX |
| 60 # define UID_T_MAX TYPE_MAXIMUM (uid_t) | |
| 61 #endif | |
| 62 | |
| 63 #ifndef GID_T_MAX | |
| 64 # define GID_T_MAX TYPE_MAXIMUM (gid_t) | |
| 65 #endif | |
| 66 | |
| 67 /* MAXUID may come from limits.h or sys/params.h. */ | |
| 68 #ifndef MAXUID | |
| 69 # define MAXUID UID_T_MAX | |
| 70 #endif | |
| 71 #ifndef MAXGID | |
| 72 # define MAXGID GID_T_MAX | |
| 73 #endif | |
| 74 | |
| 2271 | 75 /* ISDIGIT differs from isdigit, as follows: |
|
6932
6aeb4d6c28d9
* lib/.cppi-disable: Add wcwidth.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6275
diff
changeset
|
76 - Its arg may be any int or unsigned int; it need not be an unsigned char |
|
6aeb4d6c28d9
* lib/.cppi-disable: Add wcwidth.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6275
diff
changeset
|
77 or EOF. |
| 2271 | 78 - It's typically faster. |
| 3699 | 79 POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to |
|
6932
6aeb4d6c28d9
* lib/.cppi-disable: Add wcwidth.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6275
diff
changeset
|
80 isdigit unless it's important to use the locale's definition |
| 3699 | 81 of `digit' even when the host does not conform to POSIX. */ |
| 5159 | 82 #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) |
| 83 | |
| 84 #ifdef __DJGPP__ | |
| 5 | 85 |
| 5159 | 86 /* Return true if STR represents an unsigned decimal integer. */ |
| 194 | 87 |
| 5159 | 88 static bool |
| 1557 | 89 is_number (const char *str) |
| 194 | 90 { |
| 5159 | 91 do |
| 92 { | |
| 93 if (!ISDIGIT (*str)) | |
| 94 return false; | |
| 95 } | |
| 96 while (*++str); | |
| 97 | |
| 98 return true; | |
| 194 | 99 } |
| 5159 | 100 #endif |
| 5 | 101 |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
102 static char const * |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
103 parse_with_separator (char const *spec, char const *separator, |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
104 uid_t *uid, gid_t *gid, |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
105 char **username, char **groupname) |
| 5 | 106 { |
| 2273 | 107 static const char *E_invalid_user = N_("invalid user"); |
| 108 static const char *E_invalid_group = N_("invalid group"); | |
| 6969 | 109 static const char *E_bad_spec = N_("invalid spec"); |
| 2273 | 110 |
| 194 | 111 const char *error_msg; |
| 5 | 112 struct passwd *pwd; |
| 113 struct group *grp; | |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
114 char *u; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
115 char const *g; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
116 char *gname = NULL; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
117 uid_t unum = *uid; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
118 gid_t gnum = *gid; |
| 5 | 119 |
| 194 | 120 error_msg = NULL; |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
121 *username = *groupname = NULL; |
| 194 | 122 |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
123 /* Set U and G to nonzero length strings corresponding to user and |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
124 group specifiers or to NULL. If U is not NULL, it is a newly |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
125 allocated string. */ |
| 2273 | 126 |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
127 u = NULL; |
| 4996 | 128 if (separator == NULL) |
|
2284
ce1bca7b77d5
(parse_user_spec): If there is no `:' but there is a `.',
Jim Meyering <jim@meyering.net>
parents:
2273
diff
changeset
|
129 { |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
130 if (*spec) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
131 u = xstrdup (spec); |
|
2284
ce1bca7b77d5
(parse_user_spec): If there is no `:' but there is a `.',
Jim Meyering <jim@meyering.net>
parents:
2273
diff
changeset
|
132 } |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
133 else |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
134 { |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
135 size_t ulen = separator - spec; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
136 if (ulen != 0) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
137 { |
| 5322 | 138 u = xmemdup (spec, ulen + 1); |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
139 u[ulen] = '\0'; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
140 } |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
141 } |
| 194 | 142 |
| 143 g = (separator == NULL || *(separator + 1) == '\0' | |
| 144 ? NULL | |
| 145 : separator + 1); | |
| 146 | |
|
1260
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
147 #ifdef __DJGPP__ |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
148 /* Pretend that we are the user U whose group is G. This makes |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
149 pwd and grp functions ``know'' about the UID and GID of these. */ |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
150 if (u && !is_number (u)) |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
151 setenv ("USER", u, 1); |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
152 if (g && !is_number (g)) |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
153 setenv ("GROUP", g, 1); |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
154 #endif |
|
7aff74949325
(parse_user_spec) [__DJGPP__]: Make function know
Jim Meyering <jim@meyering.net>
parents:
966
diff
changeset
|
155 |
| 194 | 156 if (u != NULL) |
| 5 | 157 { |
|
7909
23cd146c58fd
* lib/userspec.c (parse_with_separator): If a user or group string
Jim Meyering <jim@meyering.net>
parents:
7302
diff
changeset
|
158 /* If it starts with "+", skip the look-up. */ |
|
23cd146c58fd
* lib/userspec.c (parse_with_separator): If a user or group string
Jim Meyering <jim@meyering.net>
parents:
7302
diff
changeset
|
159 pwd = (*u == '+' ? NULL : getpwnam (u)); |
| 194 | 160 if (pwd == NULL) |
| 5 | 161 { |
| 5159 | 162 bool use_login_group = (separator != NULL && g == NULL); |
| 163 if (use_login_group) | |
| 6969 | 164 { |
| 165 /* If there is no group, | |
| 166 then there may not be a trailing ":", either. */ | |
| 167 error_msg = E_bad_spec; | |
| 168 } | |
| 5 | 169 else |
| 194 | 170 { |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
171 unsigned long int tmp; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
172 if (xstrtoul (u, NULL, 10, &tmp, "") == LONGINT_OK |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
173 && tmp <= MAXUID) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
174 unum = tmp; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
175 else |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
176 error_msg = E_invalid_user; |
| 194 | 177 } |
| 5 | 178 } |
| 179 else | |
| 180 { | |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
181 unum = pwd->pw_uid; |
| 194 | 182 if (g == NULL && separator != NULL) |
| 5 | 183 { |
| 194 | 184 /* A separator was given, but a group was not specified, |
| 185 so get the login group. */ | |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
186 char buf[INT_BUFSIZE_BOUND (uintmax_t)]; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
187 gnum = pwd->pw_gid; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
188 grp = getgrgid (gnum); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
189 gname = xstrdup (grp ? grp->gr_name : umaxtostr (gnum, buf)); |
| 194 | 190 endgrent (); |
| 5 | 191 } |
| 194 | 192 } |
| 193 endpwent (); | |
| 5 | 194 } |
| 195 | |
| 195 | 196 if (g != NULL && error_msg == NULL) |
| 194 | 197 { |
| 198 /* Explicit group. */ | |
|
7909
23cd146c58fd
* lib/userspec.c (parse_with_separator): If a user or group string
Jim Meyering <jim@meyering.net>
parents:
7302
diff
changeset
|
199 /* If it starts with "+", skip the look-up. */ |
|
23cd146c58fd
* lib/userspec.c (parse_with_separator): If a user or group string
Jim Meyering <jim@meyering.net>
parents:
7302
diff
changeset
|
200 grp = (*g == '+' ? NULL : getgrnam (g)); |
| 194 | 201 if (grp == NULL) |
| 202 { | |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
203 unsigned long int tmp; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
204 if (xstrtoul (g, NULL, 10, &tmp, "") == LONGINT_OK && tmp <= MAXGID) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
205 gnum = tmp; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
206 else |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
207 error_msg = E_invalid_group; |
| 194 | 208 } |
| 209 else | |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
210 gnum = grp->gr_gid; |
| 194 | 211 endgrent (); /* Save a file descriptor. */ |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
212 gname = xstrdup (g); |
| 5 | 213 } |
| 194 | 214 |
| 230 | 215 if (error_msg == NULL) |
| 5 | 216 { |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
217 *uid = unum; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
218 *gid = gnum; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
219 *username = u; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
220 *groupname = gname; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
221 u = NULL; |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
222 } |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
223 else |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
224 free (gname); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
225 |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
226 free (u); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
227 return _(error_msg); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
228 } |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
229 |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
230 /* Extract from SPEC, which has the form "[user][:.][group]", |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
231 a USERNAME, UID U, GROUPNAME, and GID G. |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
232 Either user or group, or both, must be present. |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
233 If the group is omitted but the separator is given, |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
234 use the given user's login group. |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
235 If SPEC contains a `:', then use that as the separator, ignoring |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
236 any `.'s. If there is no `:', but there is a `.', then first look |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
237 up the entire SPEC as a login name. If that look-up fails, then |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
238 try again interpreting the `.' as a separator. |
| 230 | 239 |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
240 USERNAME and GROUPNAME will be in newly malloc'd memory. |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
241 Either one might be NULL instead, indicating that it was not |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
242 given and the corresponding numeric ID was left unchanged. |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
243 |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
244 Return NULL if successful, a static error message string if not. */ |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
245 |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
246 char const * |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
247 parse_user_spec (char const *spec, uid_t *uid, gid_t *gid, |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
248 char **username, char **groupname) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
249 { |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
250 char const *colon = strchr (spec, ':'); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
251 char const *error_msg = |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
252 parse_with_separator (spec, colon, uid, gid, username, groupname); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
253 |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
254 if (!colon && error_msg) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
255 { |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
256 /* If there's no colon but there is a dot, and if looking up the |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
257 whole spec failed (i.e., the spec is not a owner name that |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
258 includes a dot), then try again, but interpret the dot as a |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
259 separator. This is a compatible extension to POSIX, since |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
260 the POSIX-required behavior is always tried first. */ |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
261 |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
262 char const *dot = strchr (spec, '.'); |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
263 if (dot |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
264 && ! parse_with_separator (spec, dot, uid, gid, username, groupname)) |
|
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
265 error_msg = NULL; |
| 5 | 266 } |
| 194 | 267 |
|
5209
ef929daf6639
Import userspec from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5166
diff
changeset
|
268 return error_msg; |
| 5 | 269 } |
| 270 | |
|
232
0d9395790eb7
(main): Change #ifdef TESTING to TEST.
Jim Meyering <jim@meyering.net>
parents:
231
diff
changeset
|
271 #ifdef TEST |
| 194 | 272 |
| 966 | 273 # define NULL_CHECK(s) ((s) == NULL ? "(null)" : (s)) |
| 194 | 274 |
| 275 int | |
| 276 main (int argc, char **argv) | |
| 277 { | |
| 278 int i; | |
| 279 | |
| 280 for (i = 1; i < argc; i++) | |
| 281 { | |
| 282 const char *e; | |
| 283 char *username, *groupname; | |
| 284 uid_t uid; | |
| 285 gid_t gid; | |
| 286 char *tmp; | |
| 5 | 287 |
| 194 | 288 tmp = strdup (argv[i]); |
| 289 e = parse_user_spec (tmp, &uid, &gid, &username, &groupname); | |
| 290 free (tmp); | |
| 5159 | 291 printf ("%s: %lu %lu %s %s %s\n", |
| 194 | 292 argv[i], |
| 5159 | 293 (unsigned long int) uid, |
| 294 (unsigned long int) gid, | |
| 194 | 295 NULL_CHECK (username), |
| 296 NULL_CHECK (groupname), | |
| 297 NULL_CHECK (e)); | |
| 298 } | |
| 299 | |
| 300 exit (0); | |
| 5 | 301 } |
| 194 | 302 |
| 303 #endif |