Changes in libcfa/src/parseargs.cfa [56e8cb3:fa5e0112]

File:

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

libcfa/src/parseargs.cfa

@@ -19 +19 @@
         extern          long long int strtoll (const char* str, char** endptr, int base);
         extern unsigned long long int strtoull(const char* str, char** endptr, int base);
+        extern                 double strtod  (const char* str, char** endptr);
 }
 
@@ -24 +25 @@
 #include "limits.hfa"
 
-void printopt(FILE * out, int width, int max, char sn, const char * ln, const char * help) {
-        int hwidth = max - (11 + width);
-        if(hwidth <= 0) hwidth = max;
-
-        fprintf(out, "  -%c, --%-*s   %.*s\n", sn, width, ln, hwidth, help);
-        for() {
-                help += min(strlen(help), hwidth);
-                if('\0' == *help) break;
-                fprintf(out, "%*s%.*s\n", width + 11, "", hwidth, help);
-        }
-}
-
+extern int cfa_args_argc;
+extern char ** cfa_args_argv;
+extern char ** cfa_args_envp;
+
+static void usage(char * cmd, cfa_option options[], size_t opt_count, const char * usage, FILE * out)  __attribute__ ((noreturn));
+
+void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
+        parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
+}
+
+//-----------------------------------------------------------------------------
+// getopt_long wrapping
 void parse_args(
         int argc,
@@ -45 +46 @@
 ) {
         struct option optarr[opt_count + 2];
-        int width = 0;
-        int max_width = 1_000_000;
         {
                 int idx = 0;
@@ -61 +60 @@
                                 }
                                 idx++;
-
-                                int w = strlen(options[i].long_name);
-                                if(w > width) width = w;
                         }
                 }
@@ -98 +94 @@
                                 out = stdout;
                         case '?':
-                                goto USAGE;
+                                usage(argv[0], options, opt_count, usage, out);
                         default:
                                 for(i; opt_count) {
@@ -107 +103 @@
 
                                                 fprintf(out, "Argument '%s' for option %c could not be parsed\n\n", arg, (char)opt);
-                                                goto USAGE;
+                                                usage(argv[0], options, opt_count, usage, out);
                                         }
                                 }
@@ -114 +110 @@
 
         }
-
-        USAGE:;
+}
+
+//-----------------------------------------------------------------------------
+// Print usage
+static void printopt(FILE * out, int width, int max, char sn, const char * ln, const char * help) {
+        int hwidth = max - (11 + width);
+        if(hwidth <= 0) hwidth = max;
+
+        fprintf(out, "  -%c, --%-*s   %.*s\n", sn, width, ln, hwidth, help);
+        for() {
+                help += min(strlen(help), hwidth);
+                if('\0' == *help) break;
+                fprintf(out, "%*s%.*s\n", width + 11, "", hwidth, help);
+        }
+}
+
+void print_args_usage(cfa_option options[], size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn)) {
+        usage(cfa_args_argv[0], options, opt_count, usage, error ? stderr : stdout);
+}
+
+void print_args_usage(int , char * argv[], cfa_option options[], size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn)) {
+        usage(argv[0], options, opt_count, usage, error ? stderr : stdout);
+}
+
+static void usage(char * cmd, cfa_option options[], size_t opt_count, const char * help, FILE * out) __attribute__((noreturn)) {
+        int width = 0;
+        {
+                for(i; opt_count) {
+                        if(options[i].long_name) {
+                                int w = strlen(options[i].long_name);
+                                if(w > width) width = w;
+                        }
+                }
+        }
+
+        int max_width = 1_000_000;
         int outfd = fileno(out);
         if(isatty(outfd)) {
@@ -124 +154 @@
         }
 
-        fprintf(out, "Usage:\n  %s %s\n", argv[0], usage);
+        fprintf(out, "Usage:\n  %s %s\n", cmd, help);
 
         for(i; opt_count) {
@@ -133 +163 @@
 }
 
+//-----------------------------------------------------------------------------
+// Typed argument parsing
 bool parse_yesno(const char * arg, bool & value ) {
         if(strcmp(arg, "yes") == 0) {
@@ -159 +191 @@
 bool parse(const char * arg, const char * & value ) {
         value = arg;
+        return true;
+}
+
+bool parse(const char * arg, int & value) {
+        char * end;
+        int r = strtoll(arg, &end, 10);
+        if(*end != '\0') return false;
+
+        value = r;
         return true;
 }
@@ -192 +233 @@
 }
 
-bool parse(const char * arg, int & value) {
-        char * end;
-        int r = strtoll(arg, &end, 10);
-        if(*end != '\0') return false;
-
-        value = r;
-        return true;
-}
+bool parse(const char * arg, double & value) {
+        char * end;
+        double r = strtod(arg, &end);
+        if(*end != '\0') return false;
+
+        value = r;
+        return true;
+}