trinity/bonsix
1
0
Fork 0
forked from bonsai/harakit
Code Pull Requests Activity

scrut(1): return program_name ternary to former position

Browse Source
This commit is contained in:
Emma Tebibyte 2024-07-28 18:33:49 -06:00
parent 338a3e7155
commit 44d461fb16
Signed by untrusted user: emma
GPG Key ID: 06FA419A1698C270
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scrut.c
View File

@ -39,16 +39,15 @@ usage(char *argv0) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
char sel[(sizeof opts) / (sizeof *opts)]; char sel[(sizeof opts) / (sizeof *opts)];
program_name = (argv[0] == NULL ? program_name : argv[0]);
if (argc < 2) { return usage(program_name); } if (argc < 2) { return usage(argv[0] == NULL ? program_name : argv[0]); }
{ /* option parsing */ { /* option parsing */
char *p; char *p;
memset(sel, '\0', sizeof sel); memset(sel, '\0', sizeof sel);
for (int c; (c = getopt(argc, argv, opts)) != -1;) { for (int c; (c = getopt(argc, argv, opts)) != -1;) {
if ((p = strchr(opts, c)) == NULL) { return usage(program_name); } if ((p = strchr(opts, c)) == NULL) { return usage(argv[0]); }
else { sel[p - opts] = c; } else { sel[p - opts] = c; }
} }
@ -62,7 +61,7 @@ int main(int argc, char *argv[]) {
} }
} }
if (optind == argc) { return usage(program_name); } if (optind == argc) { return usage(argv[0]); }
for (argv += optind ; *argv != NULL; ++argv) { for (argv += optind ; *argv != NULL; ++argv) {
struct stat buf; struct stat buf;