emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last_patch59 from vodz to cleanup chmod and correctly parse '-rwxgoa'

Browse Source
This commit is contained in:
Eric Andersen
2002-10-10 03:47:01 +00:00
parent 1bb1e83454
commit d274b53c1d
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
coreutils/chmod.c
View File

@ -5,6 +5,9 @@
* Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
* Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
* *
* Reworked by (C) 2002 Vladimir Oleynik <dzo@simtreas.ru>
* to correctly parse '-rwxgoa'
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
@ -31,7 +34,7 @@
static int fileAction(const char *fileName, struct stat *statbuf, void* junk) static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
{ {
if (!parse_mode((char *)junk, &(statbuf->st_mode))) if (!parse_mode((char *)junk, &(statbuf->st_mode)))
error_msg_and_die("internal error"); error_msg_and_die( "unknown mode: %s", (char *)junk);
if (chmod(fileName, statbuf->st_mode) == 0) if (chmod(fileName, statbuf->st_mode) == 0)
return (TRUE); return (TRUE);
perror(fileName); perror(fileName);
@ -40,35 +43,44 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
int chmod_main(int argc, char **argv) int chmod_main(int argc, char **argv)
{ {
int i;
int opt; int opt;
int recursiveFlag = FALSE; int recursiveFlag = FALSE;
int modeind = 0; /* Index of the mode argument in `argv'. */
char *smode;
static const char chmod_modes[] = "Rrwxstugoa,+-=";
/* do normal option parsing */ /* do normal option parsing */
while ((opt = getopt(argc, argv, "R")) > 0) { while (1) {
switch (opt) { int thisind = optind ? optind : 1;
case 'R':
recursiveFlag = TRUE; opt = getopt(argc, argv, chmod_modes);
if (opt == EOF)
break; break;
default: smode = strchr(chmod_modes, opt);
if(smode == NULL)
show_usage(); show_usage();
if(smode == chmod_modes) { /* 'R' */
recursiveFlag = TRUE;
} else {
if (modeind != 0 && modeind != thisind)
show_usage();
modeind = thisind;
} }
} }
if (argc > optind && argc > 2 && argv[optind]) { if (modeind == 0)
/* Parse the specified mode */ modeind = optind++;
mode_t mode;
if (! parse_mode(argv[optind], &mode)) { opt = optind;
error_msg_and_die( "unknown mode: %s", argv[optind]); if (opt >= argc) {
}
} else {
error_msg_and_die(too_few_args); error_msg_and_die(too_few_args);
} }
smode = argv[modeind];
/* Ok, ready to do the deed now */ /* Ok, ready to do the deed now */
for (i = optind + 1; i < argc; i++) { for (; opt < argc; opt++) {
if (! recursive_action (argv[i], recursiveFlag, FALSE, FALSE, fileAction, if (! recursive_action (argv[opt], recursiveFlag, FALSE, FALSE, fileAction,
fileAction, argv[optind])) { fileAction, smode)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }