commit: 2e30e80f9d43654b40fcc8f6b3bbe1f1ae067e6f
parent aff9f6426b53d394a46080742cc42c23b4e682d6
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 22 Mar 2025 04:35:10 +0100
Revert "cmd/*: still make -- end options when hangling long"
This reverts commit 61f63e4c641f34a1140c732a9155bb6f75f3ad63.
Diffstat:
37 files changed, 0 insertions(+), 76 deletions(-)
diff --git a/cmd/base64.c b/cmd/base64.c
@@ -281,8 +281,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -64,8 +64,6 @@ main(int argc, char *argv[])
delim = '\0';
break;
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
@@ -32,8 +32,6 @@ main(int argc, char *argv[])
// POSIX: Ignored, buffered streams aren't used
break;
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
@@ -375,8 +375,6 @@ main(int argc, char *argv[])
opt_v = true;
break;
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
@@ -244,8 +244,6 @@ main(int argc, char *argv[])
opt_v = true;
break;
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
@@ -126,8 +126,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -262,8 +262,6 @@ main(int argc, char *argv[])
jflag = true;
break;
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
@@ -85,8 +85,6 @@ main(int argc, char *argv[])
excluded[excluded_count++] = optarg;
break;
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
@@ -116,8 +116,6 @@ main(int argc, char *argv[])
break;
#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
@@ -219,8 +219,6 @@ main(int argc, char *argv[])
delim = '\0';
break;
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
@@ -272,8 +272,6 @@ main(int argc, char *argv[])
mkdir_parents_verbose = true;
break;
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
@@ -196,8 +196,6 @@ main(int argc, char *argv[])
if(*end) utils_errx(1, "illegal file number -- %s", optarg);
break;
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
@@ -72,8 +72,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -41,8 +41,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -65,8 +65,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -429,8 +429,6 @@ main(int argc, char *argv[])
verbose = true;
break;
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
@@ -47,8 +47,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -38,8 +38,6 @@ main(int argc, char *argv[])
target_str = "_SC_NPROCESSORS_CONF";
break;
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
@@ -248,8 +248,6 @@ main(int argc, char *argv[])
linedelim = L'\0';
break;
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
@@ -55,8 +55,6 @@ main(int argc, char *argv[])
name_max = _POSIX_NAME_MAX;
break;
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
@@ -85,8 +85,6 @@ main(int argc, char *argv[])
mode = PWD_P;
break;
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
@@ -117,8 +117,6 @@ main_realpath(int argc, char *argv[])
sep = '\0';
break;
case ':':
- if(optopt == '-') break;
-
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage_realpath();
return 1;
@@ -181,8 +179,6 @@ main_readlink(int argc, char *argv[])
sep = '\0';
break;
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
@@ -116,8 +116,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -192,8 +192,6 @@ main(int argc, char *argv[])
verbose = true;
break;
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
@@ -63,8 +63,6 @@ main(int argc, char *argv[])
verbose = true;
break;
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
@@ -175,8 +175,6 @@ main(int argc, char *argv[])
opt_c = true;
break;
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
@@ -175,8 +175,6 @@ main(int argc, char *argv[])
opt_c = true;
break;
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
@@ -175,8 +175,6 @@ main(int argc, char *argv[])
opt_c = true;
break;
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
@@ -127,8 +127,6 @@ main(int argc, char *argv[])
delim = '\0';
break;
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
@@ -165,8 +165,6 @@ main(int argc, char *argv[])
delim = '\0';
break;
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
@@ -38,8 +38,6 @@ main(int argc, char *argv[])
signal(SIGINT, SIG_IGN);
break;
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
@@ -48,8 +48,6 @@ main(int argc, char *argv[])
mode = CMD_TIME_VERBOSE;
break;
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
@@ -137,8 +137,6 @@ main(int argc, char *argv[])
}
break;
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
@@ -203,8 +203,6 @@ main(int argc, char *argv[])
break;
}
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
@@ -68,8 +68,6 @@ main(int argc, char *argv[])
size_set = true;
break;
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
@@ -73,8 +73,6 @@ main(int argc, char *argv[])
names |= CMD_UNAME_VERSION;
break;
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
@@ -257,8 +257,6 @@ main(int argc, char *argv[])
wc_opts |= WC_OPT_W;
break;
case ':':
- if(optopt == '-') break;
-
fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
usage();
return 1;
