diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-17 06:06:48 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-17 06:06:48 +0000 |
| commit | 5f531596a92e1205a700218dedfe7a525eef21c8 (patch) | |
| tree | 43198350d38d7a770d9c309265e06e3588b2c762 /lib/userspec.c | |
| parent | c7c220336bdebb2f0302e2a618a3537a80f8e979 (diff) | |
| download | gnulib-5f531596a92e1205a700218dedfe7a525eef21c8.tar.gz | |
Import from coreutils.
* MODULES.html.sh: Add mkancestors.
* modules/mkancesdirs: New module.
* modules/mkdir-p (Files): Remove lib/chdir-safer.c, lib/chdir-safer.h,
lib/same-inode.h, m4/afs.m4, m4/chdir-safer.m4.
The chdir-safer and afs files are now orphans; I'll remove them
unless someone speaks up.
Add lib/dirchownmod.c, lib/dirchownmod.h.
(Depends-on): Remove alloca, chown, save-cwd, dirname.
Add lchown, mkancesdirs.
(Maintainer): Add self.
* lib/dirchownmod.c, lib/dirchownmod.h:
* lib/mkancesdirs.c, lib/mkancesdirs.h: New files.
* lib/mkdir-p.c: Don't include alloca.h, stdio.h, sys/types.h,
unistd.h, string.h, chdir-safer.h, dirname.h, lchmod.h, lchown.h,
save-cwd.h. Instead, include dirchownmod.h and mkancesdirs.h.
(make_dir_parents): New args MAKE_ANCESTOR, OPTIONS, ANNOUNCE,
MODE_BITS. Remove options VERBOSE_FMT_STRING, CWD_ERRNO. All
callers changed. Revamp internals significantly, by not
attempting to create directories that are temporarily more
permissive than the final results. Do not attempt to use
save_cwd/restore_cwd; it isn't worth it for mkdir and install.
This removes some race conditions, fixes some bugs, and simplifies
things. Use new dirchownmod function to do owner and mode changes.
* lib/mkdir-p.h: Likewise.
* lib/modechange.c (octal_to_mode): New function.
(struct mode_change): New member mentioned.
(make_node_op_equals): New arg mentioned. All callers changed.
(mode_compile): Keep track of which mode bits the user has explicitly
mentioned.
(mode_adjust): New arg DIR, so that we implement the X op correctly.
New arg PMODE_BITS, to keep track of which mode bits the user
mentioned; it treats S_ISUID and S_ISGID speciall.
All callers changed.
* lib/modechange.h: Likewise.
* mkancesdirs.m4: New file.
* mkdir-p.m4 (gl_MKDIR_PARENTS): Mention dirchownmod.c, dirchownmod.h.
Don't require AC_FUNC_ALLOCA, gl_AFS, gl_CHDIR_SAFER; no longer needed.
Require gl_FUNC_LCHOWN, since dirchownmod.c needs it.
Diffstat (limited to 'lib/userspec.c')
| -rw-r--r-- | lib/userspec.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/userspec.c b/lib/userspec.c index fbdc2f9a13..fd2c941f81 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-2005 Free Software + Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -109,8 +109,7 @@ parse_with_separator (char const *spec, char const *separator, { 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_bad_spec = N_("invalid spec"); const char *error_msg; struct passwd *pwd; @@ -164,7 +163,11 @@ parse_with_separator (char const *spec, char const *separator, { bool use_login_group = (separator != NULL && g == NULL); if (use_login_group) - error_msg = E_bad_spec; + { + /* If there is no group, + then there may not be a trailing ":", either. */ + error_msg = E_bad_spec; + } else { unsigned long int tmp; |