Changes in libcfa/src/parseargs.cfa [6f94958:772b300]

File:

• libcfa/src/parseargs.cfa (modified) (7 diffs)

libcfa/src/parseargs.cfa

@@ -30 +30 @@
 
 static void usage(char * cmd, cfa_option options[], size_t opt_count, const char * usage, FILE * out)  __attribute__ ((noreturn));
-//-----------------------------------------------------------------------------
-// checking
-static void check_args(cfa_option options[], size_t opt_count) {
-        for(i; opt_count) {
-                for(j; opt_count) {
-                        if(i == j) continue;
-
-                        if( options[i].short_name != '\0'
-                        && options[i].short_name == options[j].short_name)
-                                abort("Parse Args error: two options have short name '%c' (%zu & %zu)", options[i].short_name, i, j);
-
-                        if(0 == strcmp(options[i].long_name, options[j].long_name)) abort("Parse Args error: two options have long name '%s' (%zu & %zu)", options[i].long_name, i, j);
-                }
-        }
-}
-
-
-//-----------------------------------------------------------------------------
-// Parsing args
+
 void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
         if( 0p != &cfa_args_argc ) {
@@ -59 +41 @@
 }
 
+//-----------------------------------------------------------------------------
+// getopt_long wrapping
 void parse_args(
         int argc,
@@ -67 +51 @@
         char ** & left
 ) {
-        check_args(options, opt_count);
-
-        int maxv = 'h';
-        char optstring[opt_count * 3] = { '\0' };
-        {
-                int idx = 0;
-                for(i; opt_count) {
-                        if (options[i].short_name) {
-                                maxv = max(options[i].short_name, maxv);
-                                optstring[idx] = options[i].short_name;
-                                idx++;
-                                if(    ((intptr_t)options[i].parse) != ((intptr_t)parse_settrue)
-                                && ((intptr_t)options[i].parse) != ((intptr_t)parse_setfalse) ) {
-                                        optstring[idx] = ':';
-                                        idx++;
-                                }
-                        }
-                }
-                optstring[idx+0] = 'h';
-                optstring[idx+1] = '\0';
-        }
-
         struct option optarr[opt_count + 2];
         {
@@ -94 +56 @@
                 for(i; opt_count) {
                         if(options[i].long_name) {
-                                options[i].val = (options[i].short_name != '\0') ? ((int)options[i].short_name) : ++maxv;
                                 optarr[idx].name = options[i].long_name;
                                 optarr[idx].flag = 0p;
-                                optarr[idx].val  = options[i].val;
+                                optarr[idx].val  = options[i].short_name;
                                 if(    ((intptr_t)options[i].parse) == ((intptr_t)parse_settrue)
                                     || ((intptr_t)options[i].parse) == ((intptr_t)parse_setfalse) ) {
@@ -109 +70 @@
                 optarr[idx+0].[name, has_arg, flag, val] = ["help", no_argument, 0, 'h'];
                 optarr[idx+1].[name, has_arg, flag, val] = [0, no_argument, 0, 0];
+        }
+
+        char optstring[opt_count * 3] = { '\0' };
+        {
+                int idx = 0;
+                for(i; opt_count) {
+                        optstring[idx] = options[i].short_name;
+                        idx++;
+                        if(    ((intptr_t)options[i].parse) != ((intptr_t)parse_settrue)
+                            && ((intptr_t)options[i].parse) != ((intptr_t)parse_setfalse) ) {
+                                optstring[idx] = ':';
+                                idx++;
+                        }
+                }
+                optstring[idx+0] = 'h';
+                optstring[idx+1] = '\0';
         }
 
@@ -126 +103 @@
                         default:
                                 for(i; opt_count) {
-                                        if(opt == options[i].val) {
+                                        if(opt == options[i].short_name) {
                                                 const char * arg = optarg ? optarg : "";
                                                 if( arg[0] == '=' ) { arg++; }
@@ -148 +125 @@
         if(hwidth <= 0) hwidth = max;
 
-        char sname[4] = { ' ', ' ', ' ', '\0' };
-        if(sn != '\0') {
-                sname[0] = '-';
-                sname[1] = sn;
-                sname[2] = ',';
-        }
-
-        fprintf(out, "  %s --%-*s   %.*s\n", sname, width, ln, hwidth, help);
+        fprintf(out, "  -%c, --%-*s   %.*s\n", sn, width, ln, hwidth, help);
         for() {
                 help += min(strlen(help), hwidth);