kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Better argument parsing in column(1).

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2012-03-01 16:59:53 +01:00
parent c5302df277
commit f2f4b2ca60
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
utils/column.cpp
View file

@ -94,6 +94,9 @@ int main(int argc, char* argv[])
for ( int i = 1; i < argc; i++ ) for ( int i = 1; i < argc; i++ )
{ {
const char* arg = argv[i]; const char* arg = argv[i];
if ( arg[0] != '-' ) { continue; }
if ( strcmp(arg, "-") == 0 ) { continue; }
argv[i] = NULL;
if ( strcmp(arg, "--") == 0 ) { break; } if ( strcmp(arg, "--") == 0 ) { break; }
if ( strcmp(arg, "--usage") == 0 ) { usage(argv0); exit(0); } if ( strcmp(arg, "--usage") == 0 ) { usage(argv0); exit(0); }
if ( strcmp(arg, "--help") == 0 ) { help(argv0); exit(0); } if ( strcmp(arg, "--help") == 0 ) { help(argv0); exit(0); }
@ -101,26 +104,20 @@ int main(int argc, char* argv[])
if ( strcmp(arg, "-c") == 0 ) if ( strcmp(arg, "-c") == 0 )
{ {
if ( i+1 == argc ) { usage(argv0); exit(1); } if ( i+1 == argc ) { usage(argv0); exit(1); }
termwidth = atoi(argv[++i]); termwidth = atoi(argv[++i]); argv[i] = NULL;
argv[i] = (char*) "-c"; // TODO: This is a bit hacky.
continue; continue;
} }
if ( strcmp(arg, "-") == 0 ) { continue; }
if ( arg[0] != '-') { continue; }
error(0, 0, "unknown option %s", arg); error(0, 0, "unknown option %s", arg);
usage(argv0); usage(argv0);
return 1; return 1;
} }
bool parsing = true;
bool hadany = false; bool hadany = false;
for ( int i = 1; i < argc; i++ ) for ( int i = 1; i < argc; i++ )
{ {
const char* arg = argv[i]; const char* arg = argv[i];
if ( strcmp(arg, "--") == 0 && parsing ) { parsing = false; break; } if ( !arg ) { continue; }
bool isstdin = strcmp(arg, "-") == 0; bool isstdin = strcmp(arg, "-") == 0;
if ( parsing && arg[0] == '-' && !isstdin ) { continue; }
errno = 0;
FILE* fp = isstdin ? stdin : fopen(arg, "r"); FILE* fp = isstdin ? stdin : fopen(arg, "r");
if ( !fp ) { error(1, errno, "fopen failed: %s", arg); } if ( !fp ) { error(1, errno, "fopen failed: %s", arg); }
hadany = true; hadany = true;