Style fixup

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index cab6ca727d37005641afd36f83835dccf82101f5..0e8cd5ff1454f53309cc260019d7b3d27e898a7e 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -11,6 +11,35 @@
 
 #include "parse.h"
 
+static void show_option_range(struct fio_option *o)
+{
+       if (!o->minval && !o->maxval)
+               return;
+
+       printf("%20s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+}
+
+static void show_option_values(struct fio_option *o)
+{
+       const char *msg;
+       int i = 0;
+
+       do {
+               msg = o->posval[i].ival;
+               if (!msg)
+                       break;
+
+               if (!i)
+                       printf("%20s: ", "valid values");
+
+               printf("%s,", msg);
+               i++;
+       } while (i < PARSE_MAX_VP);
+
+       if (i)
+               printf("\n");
+}
+
 static unsigned long get_mult_time(char c)
 {
        switch (c) {
@@ -40,6 +69,9 @@ static unsigned long get_mult_bytes(char c)
                case 'g':
                case 'G':
                        return 1024 * 1024 * 1024;
+               case 'e':
+               case 'E':
+                       return 1024 * 1024 * 1024 * 1024UL;
                default:
                        return 1;
        }
@@ -56,7 +88,7 @@ static int str_to_decimal(const char *str, long long *val, int kilo)
        if (!len)
                return 1;
 
-       *val = strtol(str, NULL, 10);
+       *val = strtoll(str, NULL, 10);
        if (*val == LONG_MAX && errno == ERANGE)
                return 1;
 
@@ -162,8 +194,27 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        switch (o->type) {
        case FIO_OPT_STR: {
                fio_opt_str_fn *fn = o->cb;
+               const struct value_pair *vp;
+               int i;
+
+               ret = 1;
+               for (i = 0; i < PARSE_MAX_VP; i++) {
+                       vp = &o->posval[i];
+                       if (!vp->ival || vp->ival[0] == '\0')
+                               break;
+                       if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
+                               ret = 0;
+                               if (!o->off1)
+                                       break;
+                               val_store(ilp, vp->oval, o->off1, data);
+                               break;
+                       }
+               }
 
-               ret = fn(data, ptr);
+               if (ret)
+                       show_option_values(o);
+               else if (fn)
+                       ret = fn(data, ptr);
                break;
        }
        case FIO_OPT_STR_VAL_TIME:
@@ -384,38 +435,6 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
        return 1;
 }
 
-static void show_option_range(struct fio_option *o)
-{
-       if (!o->minval && !o->maxval)
-               return;
-
-       printf("%16s: min=%d, max=%d\n", "range", o->minval, o->maxval);
-}
-
-static void show_option_values(struct fio_option *o)
-{
-       const char *msg;
-       int i = 0;
-
-       if (!o->posval)
-               return;
-
-       do {
-               msg = o->posval[i];
-               if (!msg)
-                       break;
-
-               if (!i)
-                       printf("%16s: ", "valid values");
-
-               printf("%s,", msg);
-               i++;
-       } while (1);
-
-       if (i)
-               printf("\n");
-}
-
 int show_cmd_help(struct fio_option *options, const char *name)
 {
        int show_all = !strcmp(name, "all");
@@ -438,7 +457,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
 
                if (show_all || match) {
                        found = 1;
-                       printf("%16s: %s\n", o->name, o->help);
+                       printf("%20s: %s\n", o->name, o->help);
                        if (show_all)
                                continue;
                }
@@ -446,8 +465,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
                if (!match)
                        continue;
 
-               printf("%16s: %s\n", "type", typehelp[o->type]);
-               printf("%16s: %s\n", "default", o->def ? o->def : "no default");
+               printf("%20s: %s\n", "type", typehelp[o->type]);
+               printf("%20s: %s\n", "default", o->def ? o->def : "no default");
                show_option_range(o);
                show_option_values(o);
        }
@@ -484,6 +503,10 @@ void options_init(struct fio_option *options)
                        o->minval = 0;
                        o->maxval = 1;
                }
+               if (!o->cb && !o->off1)
+                       fprintf(stderr, "Option %s: neither cb nor offset given\n", o->name);
+               if (o->type == FIO_OPT_STR)
+                       continue;
                if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
                        fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
        }