diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/options.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/options.c b/src/options.c index d9fd6c0..b975794 100644 --- a/src/options.c +++ b/src/options.c @@ -19,7 +19,7 @@ /* === GLOBAL VARIABLES === */ struct option long_options[] = { { "help", no_argument, 0, 0 }, - { "format-string", required_argument, 0, 0 }, + { "format", required_argument, 0, 0 }, { "long-timestamp", no_argument, 0, 0 }, { "print-boxed", no_argument, 0, 0 }, { "print-header", no_argument, 0, 0 }, @@ -55,11 +55,11 @@ void usage(char *executable) { /* long name, short name, optional argument, explanation */ fprintf(stderr, " %-25s %2s %10s - %s\n", "--help", "-h", "", "Show this message and exit"); - fprintf(stderr, " %-25s %2s %10s - %s\n", "--format-string", "-f", "format", + fprintf(stderr, " %-25s %2s %10s - %s\n", "--format", "-f", "format", "define columns to print, details below"); fprintf(stderr, " %-25s %2s %10s - %s\n", "--long-timestamp", "-t", "", "Print timestamp in long form yyyymmdd HH:MM:SS ZONE"); - fprintf(stderr, " %-25s %2s %10s - %s\n", "--print-boxed", "", "", + fprintf(stderr, " %-25s %2s %10s - %s\n", "--print-boxed", "-b", "", "Print a boxed table"); fprintf(stderr, " %-25s %2s %10s - %s\n", "--print-header", "-H", "", "Print a header above the columns"); @@ -76,7 +76,7 @@ void usage(char *executable) { fprintf(stderr, "\n\n--sort-by variants: name | size | time\n"); - fprintf(stderr, "\n--format-string: Characters unlike the following are ignored\n"); + fprintf(stderr, "\n--format: Characters unlike the following are ignored\n"); fprintf(stderr, " A - access time\n"); fprintf(stderr, " C - change time\n"); fprintf(stderr, " G - group name\n"); @@ -138,7 +138,7 @@ void set_option(const char *option_name, char *option_argument) { exit(EXIT_FAILURE); } - if (strcmp("format-string", option_name) == 0) { + if (strcmp("format", option_name) == 0) { option_format_string = option_argument; return; } @@ -189,7 +189,7 @@ int parse_arguments(int argc, char **argv) { while(1) { index = 0; - c = getopt_long(argc, argv, "aHhtf:", long_options, &index); + c = getopt_long(argc, argv, "abHhtf:", long_options, &index); if (c == -1) { break; @@ -199,6 +199,15 @@ int parse_arguments(int argc, char **argv) { case 0: set_option(long_options[index].name, optarg); break; + case 'a': + option_show_hidden_entries = true; + break; + case 'b': + option_print_boxed_table = true; + break; + case 'f': + option_format_string = optarg; + break; case 'h': usage(exec_name); exit(EXIT_SUCCESS); @@ -208,12 +217,6 @@ int parse_arguments(int argc, char **argv) { case 't': option_timestamp_long = true; break; - case 'a': - option_show_hidden_entries = true; - break; - case 'f': - option_format_string = optarg; - break; case '?': break; default: |