diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cut.c | 2 | ||||
| -rw-r--r-- | coreutils/date.c | 2 | ||||
| -rw-r--r-- | coreutils/env.c | 12 | ||||
| -rw-r--r-- | coreutils/id.c | 7 | ||||
| -rw-r--r-- | coreutils/install.c | 2 |
5 files changed, 10 insertions, 15 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index f9c72ca..839bab6 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -294,7 +294,7 @@ extern int cut_main(int argc, char **argv) unsigned long opt; char *sopt, *sdopt; - bb_opt_complementally = "b~bcf:c~bcf:f~bcf"; + bb_opt_complementally = "b--bcf:c--bcf:f--bcf"; opt = bb_getopt_ulflags(argc, argv, optstring, &sopt, &sopt, &sopt, &sdopt); part = opt & (OPT_BYTE_FLGS|OPT_CHAR_FLGS|OPT_FIELDS_FLGS); if(part == 0) diff --git a/coreutils/date.c b/coreutils/date.c index 43130f9..6593df9 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -149,7 +149,7 @@ int date_main(int argc, char **argv) #else # define GETOPT_ISOFMT #endif - bb_opt_complementally = "?d~s:s~d"; + bb_opt_complementally = "?:d--s:s--d"; opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:" GETOPT_ISOFMT, &date_str, &date_str, &filename #ifdef CONFIG_FEATURE_DATE_ISOFMT diff --git a/coreutils/env.c b/coreutils/env.c index 1a8ad7c..d59e738 100644 --- a/coreutils/env.c +++ b/coreutils/env.c @@ -38,7 +38,7 @@ * - correct "-" option usage * - multiple "-u unsetenv" support * - GNU long option support - * - save errno after exec failed before bb_perror_msg() + * - use bb_default_error_retval */ @@ -65,7 +65,7 @@ extern int env_main(int argc, char** argv) llist_t *unset_env = NULL; extern char **environ; - bb_opt_complementally = "u*"; + bb_opt_complementally = "u::"; bb_applet_long_options = env_long_options; opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env); @@ -93,12 +93,10 @@ extern int env_main(int argc, char** argv) } if (*argv) { - int er; - execvp(*argv, argv); - er = errno; - bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */ - return (er == ENOENT) ? 127 : 126; /* SUSv3-mandated exit codes. */ + /* SUSv3-mandated exit codes. */ + bb_default_error_retval = (errno == ENOENT) ? 127 : 126; + bb_perror_msg_and_die("%s", *argv); } for (ep = environ; *ep; ep++) { diff --git a/coreutils/id.c b/coreutils/id.c index 14497b4..39a57c1 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -62,12 +62,9 @@ extern int id_main(int argc, char **argv) short status; /* Don't allow -n -r -nr -ug -rug -nug -rnug */ - bb_opt_complementally = "?u~g:g~u:r?ug:n?ug"; - flags = bb_getopt_ulflags(argc, argv, "rnug"); - /* Don't allow more than one username */ - if (argc > (optind + 1)) - bb_show_usage(); + bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug"; + flags = bb_getopt_ulflags(argc, argv, "rnug"); /* This values could be overwritten later */ uid = geteuid(); diff --git a/coreutils/install.c b/coreutils/install.c index 9e5eb60..a4a9615 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -61,7 +61,7 @@ extern int install_main(int argc, char **argv) int ret = EXIT_SUCCESS, flags, i, isdir; bb_applet_long_options = install_long_options; - bb_opt_complementally = "?s~d:d~s"; + bb_opt_complementally = "?:s--d:d--s"; /* -c exists for backwards compatability, its needed */ flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str); /* 'a' must be 2nd */ |