commit: b3ec898d44678d5fbd965e2c0477f68eb0d5e656 parent 2e30e80f9d43654b40fcc8f6b3bbe1f1ae067e6f Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sat, 22 Mar 2025 04:46:58 +0100 Gracefully handle long options when unsupportedDiffstat:
56 files changed, 221 insertions(+), 81 deletions(-)diff --git a/Makefile b/Makefile@@ -99,40 +99,63 @@ cmd/expr: cmd/expr.tab.c lib/utils.a $(CC) -std=c99 $(CFLAGS) -D_POSIX_C_SOURCE=200809L -o cmd/expr cmd/expr.tab.c lib/utils.a $(LDFLAGS) $(LDSTATIC) # Needs -lm -cmd/seq: cmd/seq.c Makefile +cmd/seq: cmd/seq.c Makefile lib/utils.a $(RM) -f ${<:=.gcov} ${@:=.gcda} ${@:=.gcno} - $(CC) -std=c99 $(CFLAGS) -o $@ cmd/seq.c -lm $(LDFLAGS) $(LDSTATIC) + $(CC) -std=c99 $(CFLAGS) -o $@ cmd/seq.c lib/utils.a -lm $(LDFLAGS) $(LDSTATIC) cmd/getconf_vars.h: cmd/getconf_vars.m4 $(M4) cmd/getconf_vars.m4 > cmd/getconf_vars.h # cmd/getconf_vars.h needs to invalidate cmd/getconf but not be in command -cmd/getconf: cmd/getconf.c cmd/getconf_vars.h +cmd/getconf: cmd/getconf.c cmd/getconf_vars.h lib/utils.a $(RM) -f ${<:=.gcov} ${@:=.gcda} ${@:=.gcno} - $(CC) -std=c99 $(CFLAGS) -o cmd/getconf cmd/getconf.c $(LDFLAGS) $(LDSTATIC) + $(CC) -std=c99 $(CFLAGS) -o cmd/getconf cmd/getconf.c lib/utils.a $(LDFLAGS) $(LDSTATIC) +cmd/base64: cmd/base64.c lib/utils.a +cmd/basename: cmd/basename.c lib/utils.a cmd/chmod: cmd/chmod.c lib/utils.a cmd/chown: cmd/chown.c lib/utils.a +cmd/cmp: cmd/cmp.c lib/utils.a +cmd/cut: cmd/cut.c lib/utils.a cmd/date: cmd/date.c lib/utils.a cmd/df: cmd/df.c lib/utils.a +cmd/env: cmd/env.c lib/utils.a cmd/head: cmd/head.c lib/utils.a +cmd/id: cmd/id.c lib/utils.a cmd/install: cmd/install.c lib/utils.a cmd/join: cmd/join.c lib/utils.a +cmd/ln: cmd/ln.c lib/utils.a cmd/mkdir: cmd/mkdir.c lib/utils.a cmd/mkfifo: cmd/mkfifo.c lib/utils.a cmd/mknod: cmd/mknod.c lib/utils.a +cmd/mktemp: cmd/mktemp.c lib/utils.a cmd/mv: cmd/mv.c lib/utils.a +cmd/nice: cmd/nice.c lib/utils.a +cmd/nproc: cmd/nproc.c lib/utils.a +cmd/od: cmd/od.c lib/utils.a cmd/paste: cmd/paste.c lib/utils.a +cmd/pathchk: cmd/pathchk.c lib/utils.a +cmd/pwd: cmd/pwd.c lib/utils.a cmd/realpath: cmd/realpath.c lib/utils.a -cmd/seq: cmd/seq.c lib/utils.a +cmd/renice: cmd/renice.c lib/utils.a +cmd/rmdir: cmd/rmdir.c lib/utils.a cmd/sha1sum: cmd/sha1sum.c lib/utils.a cmd/sha256sum: cmd/sha256sum.c lib/utils.a cmd/sha512sum: cmd/sha512sum.c lib/utils.a +cmd/shuf: cmd/shuf.c lib/utils.a cmd/sleep: cmd/sleep.c lib/utils.a cmd/split: cmd/split.c lib/utils.a +cmd/strings: cmd/strings.c lib/utils.a +cmd/sync: cmd/sync.c lib/utils.a +cmd/tee: cmd/tee.c lib/utils.a +cmd/time: cmd/time.c lib/utils.a cmd/timeout: cmd/timeout.c lib/utils.a cmd/touch: cmd/touch.c lib/utils.a cmd/truncate: cmd/truncate.c lib/utils.a +cmd/uname: cmd/uname.c lib/utils.a +cmd/uniq: cmd/uniq.c lib/utils.a +cmd/wc: cmd/wc.c lib/utils.a +cmd/which: cmd/which.c lib/utils.a cmd/whoami: cmd/whoami.c lib/utils.a lib/mode.o: lib/mode.c lib/mode.hdiff --git a/cmd/base64.c b/cmd/base64.c@@ -4,6 +4,8 @@ // SPDX-License-Identifier: MPL-2.0 AND BSD-2-Clause #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <assert.h> /* assert */ #include <ctype.h> /* isspace */ #include <errno.h> /* errno */ @@ -11,7 +13,7 @@ #include <stdio.h> /* fopen(), fprintf(), BUFSIZ */ #include <stdlib.h> /* abort */ #include <string.h> /* strerror(), strncmp() */ -#include <unistd.h> /* read(), write(), close(), getopt(), opt* */ +#include <unistd.h> /* read(), write(), close() */ // 64(26+26+10+2) + NULL static const char *b64_encmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; @@ -259,7 +261,7 @@ main(int argc, char *argv[]) int ret = 0; - for(int c = -1; (c = getopt(argc, argv, ":dw:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":dw:")) != -1;) { switch(c) {diff --git a/cmd/basename.c b/cmd/basename.c@@ -4,6 +4,8 @@ #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <libgen.h> // basename #include <stdbool.h> #include <stdio.h> // puts, perror @@ -49,7 +51,7 @@ main(int argc, char *argv[]) char *suffix = NULL; char delim = '\n'; - for(int c = -1; (c = getopt(argc, argv, ":as:z")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":as:z")) != -1;) { switch(c) {diff --git a/cmd/cat.c b/cmd/cat.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L #include "../lib/fs.h" +#include "../lib/getopt_nolong.h" #include <errno.h> #include <fcntl.h> // open, O_RDONLY @@ -24,7 +25,7 @@ usage(void) int main(int argc, char *argv[]) { - for(int c = -1; (c = getopt(argc, argv, ":u")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":u")) != -1;) { switch(c) {diff --git a/cmd/chmod.c b/cmd/chmod.c@@ -10,6 +10,7 @@ #endif #include "../config.h" // HAS_* +#include "../lib/getopt_nolong.h" #include "../lib/mode.h" #include <dirent.h> // fdopendir, readdir, closedir @@ -356,7 +357,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing c = getopt_long(argc, argv, "+:cRv", opts, NULL); #else - c = getopt(argc, argv, ":cRv"); + c = getopt_nolong(argc, argv, ":cRv"); #endif if(c == -1) break;diff --git a/cmd/chown.c b/cmd/chown.c@@ -11,6 +11,7 @@ #include "../config.h" // HAS_* #include "../lib/fs.h" +#include "../lib/getopt_nolong.h" #include "../lib/user_group_parse.h" #include <dirent.h> // fdopendir, readdir, closedir @@ -220,7 +221,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing for(int c = -1; (c = getopt_long(argc, argv, "+:hRHLPv", opts, NULL)) != -1;) #else - for(int c = -1; (c = getopt(argc, argv, ":hRHLPv")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":hRHLPv")) != -1;) #endif { switch(c)diff --git a/cmd/cmp.c b/cmd/cmp.c@@ -3,6 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <assert.h> #include <errno.h> #include <stdbool.h> @@ -97,7 +99,7 @@ main(int argc, char *argv[]) { char *endptr = NULL; - for(int c = -1; (c = getopt(argc, argv, ":ln:s")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":ln:s")) != -1;) { switch(c) {diff --git a/cmd/cut.c b/cmd/cut.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 202405L +#include "../lib/getopt_nolong.h" #include "../lib/reallocarray.h" #include <assert.h> @@ -376,7 +377,7 @@ main(int argc, char *argv[]) } errno = 0; - for(int c = -1; (c = getopt(argc, argv, ":b:c:d:f:ns")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":b:c:d:f:ns")) != -1;) { switch(c) {diff --git a/cmd/date.c b/cmd/date.c@@ -6,6 +6,7 @@ #define _POSIX_C_SOURCE 200809L #define _XOPEN_SOURCE 700 // strptime is in XSI +#include "../lib/getopt_nolong.h" #include "../lib/iso_parse.h" /* iso_parse */ #include <assert.h> @@ -16,7 +17,7 @@ #include <stdlib.h> /* strtol() */ #include <string.h> /* strerror */ #include <time.h> /* time, localtime, tm, strftime, strptime, clock_settime */ -#include <unistd.h> /* getopt(), optarg, optind */ +#include <unistd.h> /* getopt(), opt… */ const char *argv0 = "date"; @@ -151,7 +152,7 @@ main(int argc, char *argv[]) return 1; } - for(int c = -1; (c = getopt(argc, argv, ":d:f:I:jr:Ru")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":d:f:I:jr:Ru")) != -1;) { const char *errstr = NULL; switch(c)diff --git a/cmd/df.c b/cmd/df.c@@ -5,6 +5,7 @@ #define _POSIX_C_SOURCE 200809L #define _DEFAULT_SOURCE // mntent in glibc 2.19+ +#include "../lib/getopt_nolong.h" #include "../lib/humanize.h" #include <ctype.h> // iscntrl, isspace @@ -50,7 +51,7 @@ main(int argc, char *argv[]) size_t only_count = 0; char *only[4096]; - for(int c = -1; (c = getopt(argc, argv, ":ahilPkTt:x:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":ahilPkTt:x:")) != -1;) { switch(c) {diff --git a/cmd/env.c b/cmd/env.c@@ -6,6 +6,7 @@ #define _XOPEN_SOURCE 800 // wordexp #include "../config.h" // HAS_* +#include "../lib/getopt_nolong.h" #include <assert.h> // assert #include <errno.h> // errno @@ -21,6 +22,8 @@ #include <getopt.h> #endif +const char *argv0 = "env"; + extern char **environ; char *envclear[1]; @@ -75,7 +78,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing for(int c = -1; (c = getopt_long(argc, argv, "+" OPTARGS, opts, NULL)) != -1;) #else - for(int c = -1; (c = getopt(argc, argv, OPTARGS)) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, OPTARGS)) != -1;) #endif { switch(c)diff --git a/cmd/expr.y b/cmd/expr.y@@ -19,6 +19,7 @@ #include <sys/types.h> #include <ctype.h> #include "../lib/err.h" +#include "../lib/getopt_nolong.h" #include <errno.h> #include <inttypes.h> #include <limits.h> @@ -297,16 +298,16 @@ main(int argc, char *argv[]) av = argv + 1; nonposix = 1; } else { - while ((c = getopt(argc, argv, ":e")) != -1) { + while ((c = getopt_nolong(argc, argv, ":e")) != -1) { switch (c) { case 'e': nonposix = 1; break; case ':': - utils_errx(1, "Missing operand for option: '-%c'\n", optopt); + utils_errx(1, "Missing operand for option: '-%c'", optopt); break; case '?': - utils_errx(1, "Unrecognised option: '-%c'\n", optopt); + utils_errx(1, "Unrecognised option: '-%c'", optopt); break; default: abort();diff --git a/cmd/getconf.c b/cmd/getconf.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 202405L #define _XOPEN_SOURCE 800 +#include "../lib/getopt_nolong.h" #include <assert.h> #include <errno.h> @@ -17,6 +18,8 @@ // need to be after system headers #include "./getconf_vars.h" +const char *argv0 = "getconf"; + static int print_system_var(const char *var) { @@ -133,7 +136,7 @@ main(int argc, char *argv[]) bool o_all = false; int c = -1; - while((c = getopt(argc, argv, ":av:")) != -1) + while((c = getopt_nolong(argc, argv, ":av:")) != -1) { switch(c) {diff --git a/cmd/head.c b/cmd/head.c@@ -4,7 +4,8 @@ #define _POSIX_C_SOURCE 200809L -#include "../lib/fs.h" // auto_fd_copy +#include "../lib/fs.h" // auto_fd_copy +#include "../lib/getopt_nolong.h" #include "../lib/truncation.h" // apply_size_suffix #include <ctype.h> // isdigit @@ -168,7 +169,7 @@ main(int argc, char *argv[]) continue; } - int c = getopt(argc, argv, ":qvc:n:z"); + int c = getopt_nolong(argc, argv, ":qvc:n:z"); if(c == -1) break; switch(c)diff --git a/cmd/id.c b/cmd/id.c@@ -3,13 +3,15 @@ // SPDX-License-Identifier: MPL-2.0 #define _DEFAULT_SOURCE // getgrouplist (4.4BSD+) -#include <grp.h> // getgrgid, getgroups, getgrouplist(glibc) -#include <pwd.h> // getpwuid -#include <stdbool.h> // bool -#include <stdio.h> // printf, perror -#include <stdlib.h> // calloc, free -#include <sys/types.h> // uid_t -#include <unistd.h> // getuid, getgid, getopt, opt*, getgrouplist(FreeBSD, NetBSD) +#include "../lib/getopt_nolong.h" + +#include <grp.h> // getgrgid, getgroups, getgrouplist(glibc) +#include <pwd.h> // getpwuid +#include <stdbool.h> // bool +#include <stdio.h> // printf, perror +#include <stdlib.h> // calloc, free +#include <sys/types.h> // uid_t +#include <unistd.h> // getuid, getgid, getopt, opt*, getgrouplist(FreeBSD, NetBSD) const char *argv0 = "id"; bool name_flag = false; @@ -188,7 +190,7 @@ main(int argc, char *argv[]) struct passwd pw = {.pw_uid = uid, .pw_gid = gid}; struct passwd epw = {.pw_uid = euid, .pw_gid = egid}; - for(int c = -1; (c = getopt(argc, argv, ":Ggunr")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":Ggunr")) != -1;) { switch(c) {diff --git a/cmd/install.c b/cmd/install.c@@ -8,6 +8,7 @@ #include "../config.h" // HAS_* #include "../lib/fs.h" +#include "../lib/getopt_nolong.h" #include "../lib/lib_mkdir.h" #include "../lib/mode.h" #include "../lib/user_group_parse.h" @@ -227,7 +228,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing for(int c = -1; (c = getopt_long(argc, argv, "+:CcDdpTt:g:m:o:v", opts, NULL)) != -1;) #else - for(int c = -1; (c = getopt(argc, argv, ":CcDdpTt:g:m:o:v")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":CcDdpTt:g:m:o:v")) != -1;) #endif { switch(c)diff --git a/cmd/join.c b/cmd/join.c@@ -36,6 +36,7 @@ #define _BSD_SOURCE // fgetln, strsep #include "../lib/err.h" +#include "../lib/getopt_nolong.h" #include <errno.h> #include <limits.h> @@ -127,7 +128,7 @@ main(int argc, char *argv[]) F2 = &input2; aflag = vflag = 0; - while((ch = getopt(argc, argv, ":a:e:j:1:2:o:t:v:")) != -1) + while((ch = getopt_nolong(argc, argv, ":a:e:j:1:2:o:t:v:")) != -1) { switch(ch) {diff --git a/cmd/ln.c b/cmd/ln.c@@ -5,6 +5,7 @@ #define _POSIX_C_SOURCE 200809L #include "../lib/bitmasks.h" +#include "../lib/getopt_nolong.h" // NetBSD (9.3 and 10) hides symlink behind _XOPEN_SOURCE / _NETBSD_SOURCE #ifdef __NetBSD__ @@ -21,6 +22,8 @@ #include <sys/stat.h> #include <unistd.h> // getopt, symlink, link +const char *argv0 = "ln"; + static bool opt_s = false, force = false; static int link_flags = 0; static int open_dir_flags = O_RDONLY | O_DIRECTORY; @@ -136,7 +139,7 @@ main(int argc, char *argv[]) { bool verbose = false; - for(int c = -1; (c = getopt(argc, argv, ":fnsLPv")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":fnsLPv")) != -1;) { switch(c) {diff --git a/cmd/mkdir.c b/cmd/mkdir.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include "../lib/lib_mkdir.h" #include "../lib/mode.h" @@ -53,7 +54,7 @@ main(int argc, char *argv[]) const char *errstr = NULL; // clang-format on - for(int c = -1; (c = getopt(argc, argv, ":pvm:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":pvm:")) != -1;) { switch(c) {diff --git a/cmd/mkfifo.c b/cmd/mkfifo.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include "../lib/mode.h" #include <errno.h> @@ -14,6 +15,7 @@ #include <unistd.h> // getopt mode_t filemask; +const char *argv0 = "mkfifo"; static void usage(void) @@ -28,7 +30,7 @@ main(int argc, char *argv[]) const char *errstr = NULL; - for(int c = -1; (c = getopt(argc, argv, ":m:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":m:")) != -1;) { switch(c) {diff --git a/cmd/mknod.c b/cmd/mknod.c@@ -5,6 +5,7 @@ #define _POSIX_C_SOURCE 200809L #define _XOPEN_SOURCE 700 // mknod is in XSI +#include "../lib/getopt_nolong.h" #include "../lib/mode.h" #include <errno.h> @@ -16,6 +17,7 @@ #include <unistd.h> // getopt mode_t filemask; +const char *argv0 = "mknod"; static void usage(void) @@ -52,7 +54,7 @@ main(int argc, char *argv[]) const char *errstr = NULL; - for(int c = -1; (c = getopt(argc, argv, ":m:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":m:")) != -1;) { switch(c) {diff --git a/cmd/mktemp.c b/cmd/mktemp.c@@ -5,6 +5,7 @@ // getentropy got in POSIX.1-2024 but defining _POSIX_C_SOURCE causes too much side-effects #define _DEFAULT_SOURCE // getentropy #include "../config.h" // HAS_* +#include "../lib/getopt_nolong.h" #include <errno.h> #include <limits.h> // PATH_MAX @@ -96,7 +97,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing for(int c = -1; (c = getopt_long(argc, argv, "+:dqp:tu", opts, NULL)) != -1;) #else - for(int c = -1; (c = getopt(argc, argv, ":dqp:tu")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":dqp:tu")) != -1;) #endif { switch(c)diff --git a/cmd/mv.c b/cmd/mv.c@@ -13,6 +13,7 @@ #include "../lib/consent.h" #include "../lib/fs.h" +#include "../lib/getopt_nolong.h" #include <dirent.h> // fdopendir #include <errno.h> @@ -392,7 +393,7 @@ main(int argc, char *argv[]) .sep = "", }; - for(int c = -1; (c = getopt(argc, argv, ":fint:v")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":fint:v")) != -1;) { switch(c) {diff --git a/cmd/nice.c b/cmd/nice.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L #define _XOPEN_SOURCE 700 // nice() is in XSI +#include "../lib/getopt_nolong.h" #include <assert.h> #include <errno.h> @@ -25,7 +26,7 @@ main(int argc, char *argv[]) { long incr = 0; - for(int c = -1; (c = getopt(argc, argv, ":n:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":n:")) != -1;) { char *endptr = NULL;diff --git a/cmd/nproc.c b/cmd/nproc.c@@ -9,6 +9,8 @@ // Sadly {Free,Net}BSD hides _SC_NPROCESSORS_{CONF,ONLN} if _POSIX_C_SOURCE is defined *sigh* // #define _POSIX_C_SOURCE 202405L +#include "../lib/getopt_nolong.h" + #include <errno.h> #include <stdio.h> // printf #include <string.h> // strerror @@ -29,7 +31,7 @@ main(int argc, char *argv[]) int target = _SC_NPROCESSORS_ONLN; const char *target_str = "_SC_NPROCESSORS_ONLN"; - for(int c = -1; (c = getopt(argc, argv, ":a")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":a")) != -1;) { switch(c) {diff --git a/cmd/paste.c b/cmd/paste.c@@ -35,6 +35,7 @@ #define _POSIX_C_SOURCE 200809L #include "../lib/err.h" +#include "../lib/getopt_nolong.h" #include <errno.h> #include <limits.h> @@ -223,7 +224,7 @@ main(int argc, char *argv[]) int seq = 0; - for(int c = -1; (c = getopt(argc, argv, ":d:sz")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":d:sz")) != -1;) { switch(c) {diff --git a/cmd/pathchk.c b/cmd/pathchk.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include <errno.h> #include <limits.h> // PATH_MAX @@ -12,6 +13,8 @@ #include <sys/stat.h> // lstat #include <unistd.h> // getopt +const char *argv0 = "pathchk"; + // POSIX Portable Character Set // Returns 0 on success, or the first invalid character found static char @@ -42,7 +45,7 @@ main(int argc, char *argv[]) size_t path_max = PATH_MAX - 1; size_t name_max = NAME_MAX; - for(int c = -1; (c = getopt(argc, argv, ":pP")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":pP")) != -1;) { switch(c) {diff --git a/cmd/printf.c b/cmd/printf.c@@ -39,6 +39,7 @@ #define _POSIX_C_SOURCE 200809L #include "../lib/err.h" +#include "../lib/getopt_nolong.h" #include <assert.h> #include <ctype.h> @@ -105,7 +106,7 @@ main(int argc, char *argv[]) strerror(errno)); } - for(int c = -1; (c = getopt(argc, argv, "")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, "")) != -1;) { switch(c) {diff --git a/cmd/pwd.c b/cmd/pwd.c@@ -3,6 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <limits.h> // PATH_MAX #include <stdbool.h> #include <stdio.h> // puts, perror, printf @@ -74,7 +76,7 @@ main(int argc, char *argv[]) { enum pwd mode = PWD_L; - for(int c = -1; (c = getopt(argc, argv, ":LP")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":LP")) != -1;) { switch(c) {diff --git a/cmd/realpath.c b/cmd/realpath.c@@ -6,6 +6,7 @@ #define _XOPEN_SOURCE 700 // realpath is in XSI #include "../lib/fs.h" +#include "../lib/getopt_nolong.h" #include <errno.h> #include <limits.h> // PATH_MAX @@ -18,7 +19,7 @@ static bool must_exists = false; static bool offline = false; -static char *argv0 = NULL; +const char *argv0 = NULL; static char sep = '\n'; static int @@ -97,7 +98,7 @@ main_realpath(int argc, char *argv[]) int offset_sep = 0; - for(int c = -1; (c = getopt(argc, argv, ":Eemnsz")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":Eemnsz")) != -1;) { switch(c) { @@ -161,7 +162,7 @@ main_readlink(int argc, char *argv[]) int offset_sep = 0; - for(int c = -1; (c = getopt(argc, argv, ":femnz")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":femnz")) != -1;) { switch(c) {diff --git a/cmd/renice.c b/cmd/renice.c@@ -5,6 +5,8 @@ #define _POSIX_C_SOURCE 200809L #define _XOPEN_SOURCE 700 // getpriority, setpriority +#include "../lib/getopt_nolong.h" + #include <errno.h> #include <stdio.h> // fprintf #include <stdlib.h> // abort @@ -12,6 +14,8 @@ #include <sys/resource.h> // getpriority, setpriority #include <unistd.h> // getopt, nice +const char *argv0 = "renice"; + static int renice(int which, id_t who, int adj) { @@ -71,7 +75,7 @@ main(int argc, char *argv[]) long adj = 0; int which = PRIO_PROCESS; - for(int c = -1; (c = getopt(argc, argv, ":gpun:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":gpun:")) != -1;) { char *endptr = NULL;diff --git a/cmd/rm.c b/cmd/rm.c@@ -10,6 +10,7 @@ #endif #include "../lib/consent.h" +#include "../lib/getopt_nolong.h" #include <ctype.h> // isprint #include <dirent.h> // fdopendir, readdir, closedir @@ -169,7 +170,7 @@ usage(void) int main(int argc, char *argv[]) { - for(int c = -1; (c = getopt(argc, argv, ":dfirRv")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":dfirRv")) != -1;) { switch(c) {diff --git a/cmd/rmdir.c b/cmd/rmdir.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L #include "../config.h" // HAS_* +#include "../lib/getopt_nolong.h" #include <errno.h> #include <stdbool.h> @@ -15,6 +16,8 @@ #include <getopt.h> #endif +const char *argv0 = "rmdir"; + static void usage(void) { @@ -46,7 +49,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing for(int c = -1; (c = getopt_long(argc, argv, "+:pv", opts, NULL)) != -1;) #else - for(int c = -1; (c = getopt(argc, argv, ":pv")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":pv")) != -1;) #endif { switch(c)diff --git a/cmd/seq.c b/cmd/seq.c@@ -3,6 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <ctype.h> // isdigit #include <errno.h> // errno #include <math.h> // fabs @@ -12,6 +14,7 @@ #include <string.h> // strerror #include <unistd.h> // getopt, optarg, optind +const char *argv0 = "seq"; const char *sep = "\n"; const char *term = "\n"; @@ -78,7 +81,7 @@ usage(void) int main(int argc, char *argv[]) { - for(int c = -1; (c = getopt(argc, argv, ":ws:t:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":ws:t:")) != -1;) { switch(c) {diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include "../lib/sha1.h" // sha1_* #include "../lib/strconv.h" // bytes2hex @@ -167,7 +168,7 @@ main(int argc, char *argv[]) { bool opt_c = false; - for(int c = -1; (c = getopt(argc, argv, ":c")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":c")) != -1;) { switch(c) {diff --git a/cmd/sha256sum.c b/cmd/sha256sum.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include "../lib/sha256.h" // sha256_* #include "../lib/strconv.h" // bytes2hex @@ -167,7 +168,7 @@ main(int argc, char *argv[]) { bool opt_c = false; - for(int c = -1; (c = getopt(argc, argv, ":c")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":c")) != -1;) { switch(c) {diff --git a/cmd/sha512sum.c b/cmd/sha512sum.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include "../lib/sha512.h" // sha512_* #include "../lib/strconv.h" // bytes2hex @@ -167,7 +168,7 @@ main(int argc, char *argv[]) { bool opt_c = false; - for(int c = -1; (c = getopt(argc, argv, ":c")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":c")) != -1;) { switch(c) {diff --git a/cmd/shuf.c b/cmd/shuf.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include <errno.h> #include <stdbool.h> @@ -92,7 +93,7 @@ main(int argc, char *argv[]) bool e_flag = false; srand((int)time(NULL)); - for(int c = -1; (c = getopt(argc, argv, ":en:z")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":en:z")) != -1;) { char *endptr = NULL;diff --git a/cmd/split.c b/cmd/split.c@@ -4,7 +4,8 @@ #define _POSIX_C_SOURCE 200809L -#include "../lib/fs.h" // auto_file_copy +#include "../lib/fs.h" // auto_file_copy +#include "../lib/getopt_nolong.h" #include "../lib/truncation.h" // apply_size_suffix #include <errno.h> @@ -233,7 +234,7 @@ static const char *error_opt_b_l = "%s: error: Options -b and -l are mutually ex int main(int argc, char *argv[]) { - for(int c = -1; (c = getopt(argc, argv, ":a:b:l:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":a:b:l:")) != -1;) { char *endptr = NULL;diff --git a/cmd/strings.c b/cmd/strings.c@@ -3,6 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <ctype.h> /* isprint() */ #include <errno.h> /* errno */ #include <fcntl.h> /* open(), O_RDONLY */ @@ -10,8 +12,9 @@ #include <stdio.h> /* fprintf(), BUFSIZ */ #include <stdlib.h> /* strtol() */ #include <string.h> /* strerror(), strncmp() */ -#include <unistd.h> /* read(), write(), close(), getopt(), optarg, optind */ +#include <unistd.h> /* read(), write(), close() */ +const char *argv0 = "strings"; size_t opt_min_strlen = 4; const char *opt_offset_format = NULL; int delim = '\n'; @@ -102,7 +105,7 @@ usage(void) int main(int argc, char *argv[]) { - for(int c = -1; (c = getopt(argc, argv, ":an:t:z")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":an:t:z")) != -1;) { char *endptr = NULL;diff --git a/cmd/sync.c b/cmd/sync.c@@ -7,6 +7,7 @@ #define _XOPEN_SOURCE 700 // sync #include "../config.h" // HAS_* +#include "../lib/getopt_nolong.h" #include <errno.h> #include <fcntl.h> // open, O_* @@ -16,13 +17,15 @@ #include <string.h> // strerror #include <unistd.h> // fsync, sync, getopt, syncfs +const char *argv0 = "sync"; + int main(int argc, char *argv[]) { int err = 0; int (*sync_func)(int) = fsync; - for(int c = -1; (c = getopt(argc, argv, ":df")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":df")) != -1;) { switch(c) {diff --git a/cmd/tee.c b/cmd/tee.c@@ -3,6 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <assert.h> /* assert() */ #include <errno.h> /* errno */ #include <signal.h> /* signal() */ @@ -11,6 +13,8 @@ #include <string.h> /* strerror() */ #include <unistd.h> /* getopt(), opt… */ +const char *argv0 = "tee"; + static void cleanup(FILE **fds) { @@ -27,7 +31,7 @@ main(int argc, char *argv[]) FILE **fds = {NULL}; // Shut up GCC int c; - for(int c = -1; (c = getopt(argc, argv, ":ai")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":ai")) != -1;) { switch(c) {diff --git a/cmd/time.c b/cmd/time.c@@ -3,6 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" + #include <errno.h> // errno #include <stdio.h> // perror, fprintf #include <stdlib.h> // abort @@ -12,6 +14,8 @@ #include <sys/wait.h> // waitpid #include <unistd.h> // sysconf, fork, execvp, getopt +const char *argv0 = "time"; + enum cmd_time_mode { CMD_TIME_POSIX = 0, @@ -37,7 +41,7 @@ main(int argc, char *argv[]) return 0; } - for(int c = -1; (c = getopt(argc, argv, ":pv")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":pv")) != -1;) { switch(c) {diff --git a/cmd/timeout.c b/cmd/timeout.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L #define _DEFAULT_SOURCE // For NSIG in sys_signame.h, thanks glibc +#include "../lib/getopt_nolong.h" #include "../lib/strtodur.h" #include "../lib/sys_signame.h" @@ -60,7 +61,7 @@ main(int argc, char *argv[]) char *arg = NULL; - for(int c = -1; (c = getopt(argc, argv, ":fk:ps:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":fk:ps:")) != -1;) { switch(c) {diff --git a/cmd/touch.c b/cmd/touch.c@@ -6,7 +6,8 @@ #define _XOPEN_SOURCE 700 // strptime (NetBSD) #define _POSIX_C_SOURCE 200809L // O_NOFOLLOW, st_atim/st_mtim -#include "../lib/bitmasks.h" /* FIELD_* */ +#include "../lib/bitmasks.h" /* FIELD_* */ +#include "../lib/getopt_nolong.h" #include "../lib/iso_parse.h" /* iso_parse */ #include <assert.h> @@ -19,6 +20,8 @@ #include <time.h> /* mktime */ #include <unistd.h> /* getopt, opt*, close */ +const char *argv0 = "touch"; + // [[CC]YY]MMDDhhmm[.SS] static struct timespec opt_t_parse(char *arg, const char **errstr) @@ -123,7 +126,7 @@ main(int argc, char *argv[]) int open_flags = O_WRONLY | O_CREAT | O_NOCTTY; int utimensat_flags = 0; - for(int c = -1; (c = getopt(argc, argv, ":acfhmr:t:d:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":acfhmr:t:d:")) != -1;) { const char *errstr = NULL;diff --git a/cmd/tr.c b/cmd/tr.c@@ -33,6 +33,7 @@ #define _DEFAULT_SOURCE #include "../lib/err.h" +#include "../lib/getopt_nolong.h" #include "../lib/tr_str.h" #include <stdio.h> @@ -77,7 +78,7 @@ main(int argc, char *argv[]) int cflag, dflag, sflag; cflag = dflag = sflag = 0; - for(int c = -1; (c = getopt(argc, argv, "Ccds")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, "Ccds")) != -1;) { switch(c) {diff --git a/cmd/truncate.c b/cmd/truncate.c@@ -4,7 +4,8 @@ #define _POSIX_C_SOURCE 200809L -#include "../lib/bitmasks.h" // FIELD_CLR +#include "../lib/bitmasks.h" // FIELD_CLR +#include "../lib/getopt_nolong.h" #include "../lib/truncation.h" // parse_size #include <errno.h> @@ -36,7 +37,7 @@ main(int argc, char *argv[]) }; char *ref_file = NULL; - for(int c = -1; (c = getopt(argc, argv, ":cr:s:")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":cr:s:")) != -1;) { switch(c) {diff --git a/cmd/uname.c b/cmd/uname.c@@ -4,6 +4,7 @@ #define _POSIX_C_SOURCE 200809L #include "../lib/bitmasks.h" +#include "../lib/getopt_nolong.h" #include <errno.h> #include <stdio.h> // printf @@ -12,6 +13,8 @@ #include <sys/utsname.h> // uname #include <unistd.h> // getopt +const char *argv0 = "uname"; + enum uname_names { CMD_UNAME_SYSNAME = 1 << 1, @@ -49,7 +52,7 @@ usage(void) int main(int argc, char *argv[]) { - for(int c = -1; (c = getopt(argc, argv, ":amnprsv")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":amnprsv")) != -1;) { switch(c) {diff --git a/cmd/uniq.c b/cmd/uniq.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include <ctype.h> // isblank #include <errno.h> @@ -30,7 +31,7 @@ main(int argc, char *argv[]) char *endptr = NULL; - for(int c = -1; (c = getopt(argc, argv, ":cdf:s:u")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":cdf:s:u")) != -1;) { switch(c) {diff --git a/cmd/wc.c b/cmd/wc.c@@ -5,6 +5,7 @@ #define _POSIX_C_SOURCE 200809L #include "../config.h" // HAS_* #include "../lib/bitmasks.h" +#include "../lib/getopt_nolong.h" #include <ctype.h> // isspace #include <errno.h> @@ -26,7 +27,7 @@ #define WC_BUFSIZ 16320 static char buf[WC_BUFSIZ] = ""; -static const char *argv0 = "wc"; +const char *argv0 = "wc"; static enum { WC_OPT_C = 1 << 0, @@ -237,7 +238,7 @@ main(int argc, char *argv[]) // Need + as first character to get POSIX-style option parsing for(int c = -1; (c = getopt_long(argc, argv, "+:clmw", opts, NULL)) != -1;) #else - for(int c = -1; (c = getopt(argc, argv, ":clmw")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, ":clmw")) != -1;) #endif { switch(c)diff --git a/cmd/which.c b/cmd/which.c@@ -3,6 +3,7 @@ // SPDX-License-Identifier: MPL-2.0 #define _POSIX_C_SOURCE 200809L +#include "../lib/getopt_nolong.h" #include <limits.h> // PATH_MAX #include <stdbool.h> @@ -11,6 +12,8 @@ #include <string.h> // strtok #include <unistd.h> // access, getopt +const char *argv0 = "which"; + int main(int argc, char *argv[]) { @@ -24,7 +27,7 @@ main(int argc, char *argv[]) return 1; } - for(int c = -1; (c = getopt(argc, argv, "as")) != -1;) + for(int c = -1; (c = getopt_nolong(argc, argv, "as")) != -1;) { switch(c) {diff --git a/common.mk b/common.mk@@ -6,7 +6,7 @@ lib/fs.o: lib/fs.c lib/fs.h config.h lib/err.o: lib/err.c lib/err.h lib/consent.o: lib/consent.c lib/consent.h lib/tr_str.o: lib/tr_str.c lib/tr_str.h -cmd/cat: cmd/cat.c lib/fs.o -cmd/printf: cmd/printf.c lib/err.o -cmd/rm: cmd/rm.c lib/consent.o -cmd/tr: cmd/tr.c lib/tr_str.o lib/err.o +cmd/cat: cmd/cat.c lib/fs.o lib/getopt_nolong.o +cmd/printf: cmd/printf.c lib/err.o lib/getopt_nolong.o +cmd/rm: cmd/rm.c lib/consent.o lib/getopt_nolong.o +cmd/tr: cmd/tr.c lib/tr_str.o lib/err.o lib/getopt_nolong.odiff --git a/lib/getopt_nolong.c b/lib/getopt_nolong.c@@ -0,0 +1,22 @@ +// utils-std: Collection of commonly available Unix tools +// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me> +// SPDX-License-Identifier: MPL-2.0 + +#define _POSIX_C_SOURCE 200809L + +#include "getopt_nolong.h" + +#include <stdio.h> // fprintf +#include <unistd.h> // getopt + +int +getopt_nolong(int argc, char *const argv[], const char *optstring) +{ + if(argv[optind][0] == '-' && argv[optind][1] == '-' && argv[optind][2] != '\0') + { + fprintf(stderr, "%s: error: Long options unsupported: '%s'\n", argv0, argv[optind]); + return -1; + } + + return getopt(argc, argv, optstring); +}diff --git a/lib/getopt_nolong.h b/lib/getopt_nolong.h@@ -0,0 +1,7 @@ +// utils-std: Collection of commonly available Unix tools +// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me> +// SPDX-License-Identifier: MPL-2.0 + +extern const char *argv0; + +int getopt_nolong(int argc, char *const argv[], const char *optstring);diff --git a/test-cmd/cat.sh b/test-cmd/cat.sh@@ -47,6 +47,5 @@ t --exit=1 enoent /var/empty/e/no/ent "cat: error: Failed opening file '/var/emp t_file doubledash "$WD/inputs/all_bytes" -- "$WD/inputs/all_bytes" -t --exit=1 tripledash "--- $WD/inputs/all_bytes" "cat: error: Unrecognised option: '--' -Usage: cat [-u] [files ...] +t --exit=1 tripledash "--- $WD/inputs/all_bytes" "cat: error: Long options unsupported: '---' "diff --git a/test-cmd/tee.sh b/test-cmd/tee.sh@@ -45,5 +45,5 @@ t --exit=1 --input='foo' enoent '/var/empty/e/no/ent' 'tee: error: Failed openin t_file --infile="${WD}/inputs/all_bytes" doubledash "${WD}/inputs/all_bytes" -- -t --exit=1 --input='foo' tripledash '---' "tee: error: Unrecognised option: '--' +t --exit=1 --input='foo' tripledash '---' "tee: error: Long options unsupported: '---' "