Updating how common options are processed.

8 files changed, 48 insertions, 16 deletions

diff --git a/src/securecoreutils.c b/src/securecoreutils.c
index ee50c7b..03a3d81 100644
--- a/src/securecoreutils.c
+++ b/src/securecoreutils.c
@@ -193,7 +193,7 @@ int main(int argc, char * argv[])
          break;
 
          case 'h':
-         scu_usage();
+         scu_usage(&cnf);
          return(0);
 
          case 's':
@@ -328,7 +328,7 @@ int scu_pathcheck(const char * path, int isdir)
 }
 
 
-void scu_usage(void)
+void scu_usage(scu_config * cnf)
 {
    int  x;
    int  y;
@@ -337,7 +337,7 @@ void scu_usage(void)
    printf("       widget [OPTIONS]\n");
    printf("\n");
 
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("\n");
 
    printf("WIDGETS:\n");
@@ -369,13 +369,38 @@ void scu_usage(void)
 }
 
 
-void scu_usage_options(void)
+void scu_usage_options(scu_config * cnf)
 {
+   int i;
+
+   cnf->short_opt = (cnf->short_opt == NULL) ? "hqVv" : cnf->short_opt;
    printf("OPTIONS:\n");
-   printf("  -h, --help                print this help and exit\n");
-   printf("  -q, --quiet, --silent     do not print messages\n");
-   printf("  -V, --version             print version number and exit\n");
-   printf("  -v, --verbose             print verbose messages\n");
+
+   for (i = 0; ((cnf->short_opt[i])); i++)
+   {
+      switch (cnf->short_opt[i])
+      {
+         case 'h':
+         printf("  -h, --help                print this help and exit\n");
+         break;
+
+         case 'q':
+         printf("  -q, --quiet, --silent     do not print messages\n");
+         break;
+
+         case 'V':
+         printf("  -V, --version             print version number and exit\n");
+         break;
+
+         case 'v':
+         printf("  -v, --verbose             print verbose messages\n");
+         break;
+
+         default:
+         break;
+      };
+   };
+
    return;
 }
 
diff --git a/src/securecoreutils.h b/src/securecoreutils.h
index daa21d7..694d911 100644
--- a/src/securecoreutils.h
+++ b/src/securecoreutils.h
@@ -133,6 +133,7 @@ struct scu_config
    int                  argc;
    const char         * prog_name;
    char              ** argv;
+   const char         * short_opt;
    const scu_widget   * widget;
 };
 
@@ -159,8 +160,8 @@ struct scu_widget
 int scu_pathcheck(const char * path, int isdir);
 
 /// Displays secure core utils wrapper usage
-void scu_usage(void);
-void scu_usage_options(void);
+void scu_usage(scu_config * cnf);
+void scu_usage_options(scu_config * cnf);
 void scu_usage_restrictions(void);
 void scu_usage_summary(scu_config * cnf, const char * suffix);
 
diff --git a/src/widget-cat.c b/src/widget-cat.c
index f62314e..f92784f 100644
--- a/src/widget-cat.c
+++ b/src/widget-cat.c
@@ -95,6 +95,7 @@ int scu_widget_cat(scu_config * cnf)
    };
 
    assert(cnf != NULL);
+   cnf->short_opt = short_opt;
 
    while((c = getopt_long(cnf->argc, cnf->argv, short_opt, long_opt, &opt_index)) != -1)
    {
@@ -217,7 +218,7 @@ void scu_widget_cat_usage(scu_config * cnf)
 {
    scu_usage_summary(cnf, " [OPTIONS] file");
    printf("\n");
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("\n");
    scu_usage_restrictions();
    printf("\n");
diff --git a/src/widget-pathcheck.c b/src/widget-pathcheck.c
index 1018a77..77d670f 100644
--- a/src/widget-pathcheck.c
+++ b/src/widget-pathcheck.c
@@ -88,6 +88,7 @@ int scu_widget_pathcheck(scu_config * cnf)
    };
 
    assert(cnf != NULL);
+   cnf->short_opt = short_opt;
 
    isdir = 0;
 
@@ -171,7 +172,7 @@ void scu_widget_pathcheck_usage(scu_config * cnf)
 {
    scu_usage_summary(cnf, " [OPTIONS] file");
    printf("\n");
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("  -d, --directory           check path for directory instead of file\n");
    printf("\n");
    scu_usage_restrictions();
diff --git a/src/widget-rm.c b/src/widget-rm.c
index 85beb4a..573f13f 100644
--- a/src/widget-rm.c
+++ b/src/widget-rm.c
@@ -100,6 +100,7 @@ int scu_widget_rm(scu_config * cnf)
    };
 
    assert(cnf != NULL);
+   cnf->short_opt = short_opt;
 
    force    = 0;
    prompt   = 0;
@@ -240,7 +241,7 @@ void scu_widget_rm_usage(scu_config * cnf)
 {
    scu_usage_summary(cnf, " [OPTIONS] file");
    printf("\n");
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("  -i                        prompt for confirmation\n");
    printf("  -f, --force               ignore nonexistent files\n");
    printf("\n");
diff --git a/src/widget-rmdir.c b/src/widget-rmdir.c
index 6018eee..962e16b 100644
--- a/src/widget-rmdir.c
+++ b/src/widget-rmdir.c
@@ -93,6 +93,7 @@ int scu_widget_rmdir(scu_config * cnf)
    };
 
    assert(cnf != NULL);
+   cnf->short_opt = short_opt;
 
    while((c = getopt_long(cnf->argc, cnf->argv, short_opt, long_opt, &opt_index)) != -1)
    {
@@ -192,7 +193,7 @@ void scu_widget_rmdir_usage(scu_config * cnf)
 {
    scu_usage_summary(cnf, " [OPTIONS] file");;
    printf("\n");
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("  -i                        prompt for confirmation\n");
    printf("  -f, --force               ignore nonexistent files\n");
    printf("\n");
diff --git a/src/widget-tail.c b/src/widget-tail.c
index a33abc7..1abc5e3 100644
--- a/src/widget-tail.c
+++ b/src/widget-tail.c
@@ -137,6 +137,7 @@ int scu_widget_tail(scu_config * cnf)
    };
 
    assert(cnf != NULL);
+   cnf->short_opt = short_opt;
 
    opts     = 0;
    optnum   = 10;
@@ -515,7 +516,7 @@ void scu_widget_tail_usage(scu_config * cnf)
 {
    scu_usage_summary(cnf, " [OPTIONS] file");
    printf("\n");
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("  -c, --bytes=X             output the last X bytes\n");
    printf("  -f, --follow              output appended data as the file grows\n");
    printf("  -n, --lines=X             output the last X lines\n");
diff --git a/src/widget-zcat.c b/src/widget-zcat.c
index bb122e6..720e254 100644
--- a/src/widget-zcat.c
+++ b/src/widget-zcat.c
@@ -137,6 +137,7 @@ int scu_widget_zcat(scu_config * cnf)
    };
 
    assert(cnf != NULL);
+   cnf->short_opt = short_opt;
 
    bzero(magic, sizeof(magic));
 
@@ -381,7 +382,7 @@ void scu_widget_zcat_usage(scu_config * cnf)
 {
    scu_usage_summary(cnf, " [OPTIONS] file");
    printf("\n");
-   scu_usage_options();
+   scu_usage_options(cnf);
    printf("\n");
    scu_usage_restrictions();
    printf("\n");