e47000490
Denys Vlasenko
2021-06-15
Subject
shuf: simplify check that we have at least one FILE
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/shred.c+2 -5
| @@ -15,7 +15,7 @@ | |
| //kbuild:lib-$(CONFIG_SHRED) += shred.o | |
| //usage:#define shred_trivial_usage | |
| - | //usage: "FILE..." |
| + | //usage: "[-fuz] [-n N] FILE..." |
| //usage:#define shred_full_usage "\n\n" | |
| //usage: "Overwrite/delete FILEs\n" | |
| //usage: "\n -f Chmod to ensure writability" | |
| @@ -54,16 +54,13 @@ int shred_main(int argc UNUSED_PARAM, char **argv) | |
| OPT_x = (1 << 5), | |
| }; | |
| - | opt = getopt32(argv, "fuzn:+vx", &num_iter); |
| + | opt = getopt32(argv, "^" "fuzn:+vx" "\0" "-1"/*min 1 arg*/, &num_iter); |
| argv += optind; | |
| zero_fd = xopen("/dev/zero", O_RDONLY); | |
| if (num_iter != 0) | |
| rand_fd = xopen("/dev/urandom", O_RDONLY); | |
| - | if (!*argv) |
| - | bb_show_usage(); |
| - | |
| for (;;) { | |
| struct stat sb; | |
| const char *fname; | |
miscutils/strings.c+2 -2
| @@ -18,7 +18,7 @@ | |
| //kbuild:lib-$(CONFIG_STRINGS) += strings.o | |
| //usage:#define strings_trivial_usage | |
| - | //usage: "[-fo] [-t o/d/x] [-n LEN] [FILE]..." |
| + | //usage: "[-fo] [-t o|d|x] [-n LEN] [FILE]..." |
| //usage:#define strings_full_usage "\n\n" | |
| //usage: "Display printable strings in a binary file\n" | |
| //We usually don't bother user with "nop" options. They work, but are not shown: | |
| @@ -26,7 +26,7 @@ | |
| //unimplemented alternative is -d: Only strings from initialized, loaded data sections | |
| //usage: "\n -f Precede strings with filenames" | |
| //usage: "\n -o Precede strings with octal offsets" | |
| - | //usage: "\n -t o/d/x Precede strings with offsets in base 8/10/16" |
| + | //usage: "\n -t o|d|x Precede strings with offsets in base 8/10/16" |
| //usage: "\n -n LEN At least LEN characters form a string (default 4)" | |
| #include "libbb.h" | |