commit: 61f63e4c641f34a1140c732a9155bb6f75f3ad63
parent 5a0e6f3404b6263fa5f35aa4bcb838b0b9e945ff
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 22 Mar 2025 04:26:31 +0100
cmd/*: still make -- end options when hangling long
Fixes bug introduced in
commit 6cd739a74b65f2cca5e87130168cf6f5bdc46324
commit 8d6cb11c793530c7e89db32808e3cb657a55fa8d
Otherwise observed as not ending options on FreeBSD 14.2 and NetBSD 10.0.
Diffstat:
37 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/cmd/base64.c b/cmd/base64.c
@@ -284,6 +284,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option '-%c'\n", argv0, optopt);
return 1;
case '?':
diff --git a/cmd/basename.c b/cmd/basename.c
@@ -68,6 +68,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/cat.c b/cmd/cat.c
@@ -36,6 +36,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/chmod.c b/cmd/chmod.c
@@ -381,6 +381,8 @@ main(int argc, char *argv[])
return 1;
#endif
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/chown.c b/cmd/chown.c
@@ -250,6 +250,8 @@ main(int argc, char *argv[])
return 1;
#endif
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/cmp.c b/cmd/cmp.c
@@ -130,6 +130,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/date.c b/cmd/date.c
@@ -266,6 +266,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/df.c b/cmd/df.c
@@ -88,6 +88,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
return 1;
case '?':
diff --git a/cmd/env.c b/cmd/env.c
@@ -123,6 +123,8 @@ main(int argc, char *argv[])
return 1;
#endif
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "env: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/head.c b/cmd/head.c
@@ -223,6 +223,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/install.c b/cmd/install.c
@@ -278,6 +278,8 @@ main(int argc, char *argv[])
return 1;
#endif
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "install: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/join.c b/cmd/join.c
@@ -200,6 +200,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/mkdir.c b/cmd/mkdir.c
@@ -76,6 +76,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/mkfifo.c b/cmd/mkfifo.c
@@ -46,6 +46,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "mkfifo: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/mknod.c b/cmd/mknod.c
@@ -70,6 +70,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "mknod: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/mv.c b/cmd/mv.c
@@ -433,6 +433,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "mv: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/nice.c b/cmd/nice.c
@@ -51,6 +51,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 125;
diff --git a/cmd/nproc.c b/cmd/nproc.c
@@ -42,6 +42,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/paste.c b/cmd/paste.c
@@ -252,6 +252,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/pathchk.c b/cmd/pathchk.c
@@ -61,6 +61,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "pathchk: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/pwd.c b/cmd/pwd.c
@@ -89,6 +89,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/realpath.c b/cmd/realpath.c
@@ -121,6 +121,8 @@ main_realpath(int argc, char *argv[])
usage_realpath();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage_realpath();
return 1;
@@ -187,6 +189,8 @@ main_readlink(int argc, char *argv[])
usage_readlink();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage_readlink();
return 1;
diff --git a/cmd/renice.c b/cmd/renice.c
@@ -122,6 +122,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "renice: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/rm.c b/cmd/rm.c
@@ -196,6 +196,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "rm: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/rmdir.c b/cmd/rmdir.c
@@ -71,6 +71,8 @@ main(int argc, char *argv[])
return 1;
#endif
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "rmdir: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c
@@ -178,6 +178,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
return 1;
case '?':
diff --git a/cmd/sha256sum.c b/cmd/sha256sum.c
@@ -178,6 +178,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
return 1;
case '?':
diff --git a/cmd/sha512sum.c b/cmd/sha512sum.c
@@ -178,6 +178,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
return 1;
case '?':
diff --git a/cmd/shuf.c b/cmd/shuf.c
@@ -131,6 +131,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
diff --git a/cmd/strings.c b/cmd/strings.c
@@ -171,6 +171,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "strings: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/tee.c b/cmd/tee.c
@@ -43,6 +43,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "tee: error: Missing operand for option: '-%c'\n", optopt);
return 1;
case '?':
diff --git a/cmd/time.c b/cmd/time.c
@@ -54,6 +54,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "time: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/timeout.c b/cmd/timeout.c
@@ -141,6 +141,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "timeout: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/touch.c b/cmd/touch.c
@@ -208,6 +208,8 @@ main(int argc, char *argv[])
fprintf(stderr, "%s: error: Unsupported long option: '--%s'\n", argv0, optarg);
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "touch: error: Missing operand for option: '-%c'\n", optopt);
return 1;
case '?':
diff --git a/cmd/truncate.c b/cmd/truncate.c
@@ -72,6 +72,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "truncate: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/uname.c b/cmd/uname.c
@@ -79,6 +79,8 @@ main(int argc, char *argv[])
usage();
return 1;
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "uname: error: Missing operand for option: '-%c'\n", optopt);
usage();
return 1;
diff --git a/cmd/wc.c b/cmd/wc.c
@@ -263,6 +263,8 @@ main(int argc, char *argv[])
return 1;
#endif
case ':':
+ if(optopt == '-') break;
+
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
