tinyrad: refactoring members of TinyRadUtilWidget

2 files changed, 19 insertions, 32 deletions

diff --git a/src/tru/tinyradutil.c b/src/tru/tinyradutil.c
index e857282..9f4ab4f 100644
--- a/src/tru/tinyradutil.c
+++ b/src/tru/tinyradutil.c
@@ -109,31 +109,21 @@ const TinyRadUtilWidget tru_widget_map[] =
 {
    {
       .name       = "configuration",
-      .func       = &tru_widget_config,
-      .shortopts  = TRU_COMMON_SHORT TRU_DICT_SHORT,
-      .longopts   = (struct option []) { TRU_DICT_LONG TRU_COMMON_LONG },
-      .min_arg    = 0,
-      .max_arg    = 0,
+      .desc       = "print configuration",
       .usage      = NULL,
-      .desc       = "print configuration"
+      .aliases    = NULL,
+      .func       = &tru_widget_config
    },
    {
       .name       = "dictionary",
-      .func       = &tru_widget_dict,
-      .shortopts  = TRU_COMMON_SHORT TRU_DICT_SHORT,
-      .longopts   = (struct option []) { TRU_DICT_LONG TRU_COMMON_LONG },
-      .min_arg    = 0,
-      .max_arg    = 0,
+      .desc       = "print processed dictionary",
       .usage      = NULL,
-      .desc       = "print processed dictionary"
+      .aliases    = NULL,
+      .func       = &tru_widget_dict
    },
    {
       .name       = NULL,
       .func       = NULL,
-      .shortopts  = NULL,
-      .longopts   = NULL,
-      .min_arg    = -1,
-      .max_arg    = -1,
       .usage      = NULL,
       .desc       = NULL
    }
@@ -303,7 +293,7 @@ tru_cli_parse(
          return(TRU_GETOPT_ERROR);
 
          case 'h':
-         tru_usage(cnf);
+         tru_usage(cnf, short_opt);
          return(TRU_GETOPT_EXIT);
 
          case '?':
@@ -384,12 +374,13 @@ tru_getopt(
 
 int
 tru_usage(
-         TinyRadUtilConf *                 cnf )
+         TinyRadUtilConf *             cnf,
+         const char *                  short_opt )
 {
    int            i;
 
    tru_usage_summary(cnf);
-   tru_usage_options(cnf);
+   tru_usage_options(short_opt);
    if (!(cnf->widget))
    {
       printf("WIDGETS:\n");
@@ -404,13 +395,11 @@ tru_usage(
 
 void
 tru_usage_options(
-         TinyRadUtilConf *                 cnf )
+         const char *                  short_opt )
 {
    const char *   s;
 
-   s = TRU_COMMON_SHORT;
-   if ((cnf->widget))
-      s = ((cnf->widget->shortopts)) ? cnf->widget->shortopts : TRU_COMMON_SHORT;
+   s = short_opt;
 
    printf("OPTIONS:\n");
    if ((strchr(s, 'b'))) printf("  -b, --builtin-dict        load built-in dictionary\n");
diff --git a/src/tru/tinyradutil.h b/src/tru/tinyradutil.h
index 5ebd650..3871c21 100644
--- a/src/tru/tinyradutil.h
+++ b/src/tru/tinyradutil.h
@@ -131,14 +131,11 @@ struct tinyrad_util_config
 
 struct tinyrad_util_widget
 {
-   const char *            name;
+   const char *               name;
+   const char *               desc;
+   const char *               usage;
+   const char * const *       aliases;
    int  (*func)(TinyRadUtilConf * cnf);
-   const char *            shortopts;
-   struct option *         longopts;
-   int                     min_arg;
-   int                     max_arg;
-   const char *            usage;
-   const char *            desc;
 };
 
 
@@ -196,12 +193,13 @@ tru_getopt(
 
 int
 tru_usage(
-         TinyRadUtilConf *             cnf );
+         TinyRadUtilConf *             cnf,
+         const char *                  short_opt );
 
 
 void
 tru_usage_options(
-         TinyRadUtilConf *             cnf );
+         const char *                  short_opt );
 
 
 void