diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 12:13:01 +0300 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 12:13:01 +0300 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /coreutils/chmod.c | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) |
Major coreutils update.
Diffstat (limited to 'coreutils/chmod.c')
-rw-r--r-- | coreutils/chmod.c | 85 |
1 files changed, 51 insertions, 34 deletions
diff --git a/coreutils/chmod.c b/coreutils/chmod.c index ba80e020a..28c98552a 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c @@ -24,67 +24,84 @@ * */ +/* BB_AUDIT SUSv3 compliant */ +/* BB_AUDIT GNU defects - unsupported options -c, -f, -v, and long options. */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */ + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <getopt.h> +#include <sys/stat.h> #include "busybox.h" static int fileAction(const char *fileName, struct stat *statbuf, void* junk) { - if (!parse_mode((char *)junk, &(statbuf->st_mode))) - error_msg_and_die( "unknown mode: %s", (char *)junk); + if (!bb_parse_mode((char *)junk, &(statbuf->st_mode))) + bb_error_msg_and_die( "unknown mode: %s", (char *)junk); if (chmod(fileName, statbuf->st_mode) == 0) return (TRUE); - perror(fileName); + bb_perror_msg("%s", fileName); /* Avoid multibyte problems. */ return (FALSE); } int chmod_main(int argc, char **argv) { - int opt; + int retval = EXIT_SUCCESS; int recursiveFlag = FALSE; - int modeind = 0; /* Index of the mode argument in `argv'. */ + int count; char *smode; - static const char chmod_modes[] = "Rrwxstugoa,+-="; + char **p; + char *p0; + char opt = '-'; - /* do normal option parsing */ - while (1) { - int thisind = optind ? optind : 1; + ++argv; + count = 0; - opt = getopt(argc, argv, chmod_modes); - if (opt == EOF) - break; - smode = strchr(chmod_modes, opt); - if(smode == NULL) - show_usage(); - if(smode == chmod_modes) { /* 'R' */ - recursiveFlag = TRUE; - } else { - if (modeind != 0 && modeind != thisind) - show_usage(); - modeind = thisind; + for (p = argv ; *p ; p++) { + p0 = p[0]; + if (p0[0] == opt) { + if ((p0[1] == '-') && !p0[2]) { + opt = 0; /* Disable further option processing. */ + continue; + } + if (p0[1] == 'R') { + char *s = p0 + 2; + while (*s == 'R') { + ++s; + } + if (*s) { + bb_show_usage(); + } + recursiveFlag = TRUE; + continue; + } + if (count) { + bb_show_usage(); + } } + argv[count] = p0; + ++count; } - if (modeind == 0) - modeind = optind++; + argv[count] = NULL; - opt = optind; - if (opt >= argc) { - error_msg_and_die(too_few_args); + if (count < 2) { + bb_show_usage(); } - smode = argv[modeind]; + smode = *argv; + ++argv; + /* Ok, ready to do the deed now */ - for (; opt < argc; opt++) { - if (! recursive_action (argv[opt], recursiveFlag, FALSE, FALSE, fileAction, - fileAction, smode)) { - return EXIT_FAILURE; + do { + if (! recursive_action (*argv, recursiveFlag, FALSE, FALSE, + fileAction, fileAction, smode)) { + retval = EXIT_FAILURE; } - } - return EXIT_SUCCESS; + } while (*++argv); + + return retval; } /* |