PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-05-29 03:54:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

(parse_group): Require base 10 when parsing groups as integers.

Browse Source 
(main): int -> bool when appropriate.
This commit is contained in:
Paul Eggert
2004-07-28 23:36:59 +00:00
parent 3badaccae1
commit a830ae0cbb
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chgrp.c
+8 -17
View File
@@ -88,19 +88,10 @@ parse_group (const char *name, gid_t *g)
grp = getgrnam (name);
if (grp == NULL)
{
strtol_error s_err;
unsigned long int tmp_long;
if (!ISDIGIT (*name))
error (EXIT_FAILURE, 0, _("invalid group name %s"), quote (name));
s_err = xstrtoul (name, NULL, 0, &tmp_long, NULL);
if (s_err != LONGINT_OK)
STRTOL_FATAL_ERROR (name, _("group number"), s_err);
if (tmp_long > GID_T_MAX)
error (EXIT_FAILURE, 0, _("invalid group number %s"), quote (name));
if (! (xstrtoul (name, NULL, 10, &tmp_long, "") == LONGINT_OK
&& tmp_long <= GID_T_MAX))
error (EXIT_FAILURE, 0, _("invalid group %s"), quote (name));
*g = tmp_long;
}
else
@@ -178,7 +169,7 @@ main (int argc, char **argv)
int dereference = -1;
struct Chown_option chopt;
int fail;
bool ok;
int optc;
initialize_main (&argc, &argv);
@@ -294,11 +285,11 @@ main (int argc, char **argv)
parse_group (chopt.group_name, &gid);
}
fail = chown_files (argv + optind, bit_flags,
(uid_t) -1, gid,
(uid_t) -1, (gid_t) -1, &chopt);
ok = chown_files (argv + optind, bit_flags,
(uid_t) -1, gid,
(uid_t) -1, (gid_t) -1, &chopt);
chopt_free (&chopt);
exit (fail ? EXIT_FAILURE : EXIT_SUCCESS);
exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
}