X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=7f7851cbb662e5f13574e228cb15505c63964574;hp=70cfa0b07a46c05f665f68c53659f776c6fa98bd;hb=1b8dbf256b974fac2864052931f3041ff3ead157;hpb=06b0be6efb3da5131bc8386251d017f0abafbdac diff --git a/parse.c b/parse.c index 70cfa0b0..7f7851cb 100644 --- a/parse.c +++ b/parse.c @@ -199,9 +199,9 @@ static unsigned long long get_mult_bytes(const char *str, int len, void *data, if (len < 2) return __get_mult_bytes(str, data, percent); - /* - * Go forward until we hit a non-digit, or +/- sign - */ + /* + * Go forward until we hit a non-digit, or +/- sign + */ while ((p - str) <= len) { if (!isdigit((int) *p) && (((*p != '+') && (*p != '-')) || digit_seen)) @@ -273,6 +273,8 @@ void strip_blank_front(char **p) { char *s = *p; + if (!strlen(s)) + return; while (isspace((int) *s)) s++; @@ -283,6 +285,9 @@ void strip_blank_end(char *p) { char *start = p, *s; + if (!strlen(p)) + return; + s = strchr(p, ';'); if (s) *s = '\0'; @@ -364,7 +369,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, o->type, ptr); if (!ptr && o->type != FIO_OPT_STR_SET && o->type != FIO_OPT_STR) { - fprintf(stderr, "Option %s requires an argument\n", o->name); + log_err("Option %s requires an argument\n", o->name); return 1; } @@ -418,12 +423,12 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, break; if (o->maxval && ull > o->maxval) { - fprintf(stderr, "max value out of range: %lld" + log_err("max value out of range: %lld" " (%d max)\n", ull, o->maxval); return 1; } if (o->minval && ull < o->minval) { - fprintf(stderr, "min value out of range: %lld" + log_err("min value out of range: %lld" " (%d min)\n", ull, o->minval); return 1; } @@ -469,22 +474,21 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, *ilp = ul2; } if (curr >= o->maxlen) { - fprintf(stderr, "the list exceeding max length %d\n", + log_err("the list exceeding max length %d\n", o->maxlen); return 1; } if(!str_to_float(ptr, &uf)){ - fprintf(stderr, "not a floating point value: %s\n", - ptr); + log_err("not a floating point value: %s\n", ptr); return 1; } if (!isnan(o->maxfp) && uf > o->maxfp) { - fprintf(stderr, "value out of range: %f" + log_err("value out of range: %f" " (range max: %f)\n", uf, o->maxfp); return 1; } if (!isnan(o->minfp) && uf < o->minfp) { - fprintf(stderr, "value out of range: %f" + log_err("value out of range: %f" " (range min: %f)\n", uf, o->minfp); return 1; } @@ -610,12 +614,12 @@ match: break; if (o->maxval && il > (int) o->maxval) { - fprintf(stderr, "max value out of range: %d (%d max)\n", + log_err("max value out of range: %d (%d max)\n", il, o->maxval); return 1; } if (o->minval && il < o->minval) { - fprintf(stderr, "min value out of range: %d (%d min)\n", + log_err("min value out of range: %d (%d min)\n", il, o->minval); return 1; } @@ -655,8 +659,8 @@ match: if (o->verify) { ret = o->verify(o, data); if (ret) { - fprintf(stderr,"Correct format for offending option\n"); - fprintf(stderr, "%20s: %s\n", o->name, o->help); + log_err("Correct format for offending option\n"); + log_err("%20s: %s\n", o->name, o->help); show_option_help(o, 1); } } @@ -794,83 +798,28 @@ int parse_cmd_option(const char *opt, const char *val, return 1; } -/* - * Return a copy of the input string with substrings of the form ${VARNAME} - * substituted with the value of the environment variable VARNAME. The - * substitution always occurs, even if VARNAME is empty or the corresponding - * environment variable undefined. - */ -static char *option_dup_subs(const char *opt) -{ - char out[OPT_LEN_MAX+1]; - char in[OPT_LEN_MAX+1]; - char *outptr = out; - char *inptr = in; - char *ch1, *ch2, *env; - ssize_t nchr = OPT_LEN_MAX; - size_t envlen; - - if (strlen(opt) + 1 > OPT_LEN_MAX) { - fprintf(stderr, "OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX); - return NULL; - } - - in[OPT_LEN_MAX] = '\0'; - strncpy(in, opt, OPT_LEN_MAX); - - while (*inptr && nchr > 0) { - if (inptr[0] == '$' && inptr[1] == '{') { - ch2 = strchr(inptr, '}'); - if (ch2 && inptr+1 < ch2) { - ch1 = inptr+2; - inptr = ch2+1; - *ch2 = '\0'; - - env = getenv(ch1); - if (env) { - envlen = strlen(env); - if (envlen <= nchr) { - memcpy(outptr, env, envlen); - outptr += envlen; - nchr -= envlen; - } - } - - continue; - } - } - - *outptr++ = *inptr++; - --nchr; - } - - *outptr = '\0'; - return strdup(out); -} - -int parse_option(const char *opt, struct fio_option *options, void *data) +int parse_option(const char *opt, const char *input, + struct fio_option *options, void *data) { struct fio_option *o; - char *post, *tmp; + char *post; - tmp = option_dup_subs(opt); - if (!tmp) + if (!opt) { + log_err("fio: failed parsing %s\n", input); return 1; + } - o = get_option(tmp, options, &post); + o = get_option(opt, options, &post); if (!o) { - log_err("Bad option <%s>\n", tmp); - free(tmp); + log_err("Bad option <%s>\n", input); return 1; } if (!handle_option(o, post, data)) { - free(tmp); return 0; } - log_err("fio: failed parsing %s\n", opt); - free(tmp); + log_err("fio: failed parsing %s\n", input); return 1; } @@ -943,7 +892,7 @@ static void __print_option(struct fio_option *o, struct fio_option *org, sprintf(p, "%s", o->name); - printf("%-24s: %s\n", name, o->help); + log_info("%-24s: %s\n", name, o->help); } static void print_option(struct fio_option *o) @@ -1008,7 +957,7 @@ int show_cmd_help(struct fio_option *options, const char *name) if (show_all || match) { found = 1; if (match) - printf("%20s: %s\n", o->name, o->help); + log_info("%20s: %s\n", o->name, o->help); if (show_all) { if (!o->parent) print_option(o); @@ -1025,18 +974,18 @@ int show_cmd_help(struct fio_option *options, const char *name) if (found) return 0; - printf("No such command: %s", name); + log_err("No such command: %s", name); /* * Only print an appropriately close option, one where the edit * distance isn't too big. Otherwise we get crazy matches. */ if (closest && best_dist < 3) { - printf(" - showing closest match\n"); - printf("%20s: %s\n", closest->name, closest->help); + log_info(" - showing closest match\n"); + log_info("%20s: %s\n", closest->name, closest->help); show_option_help(closest, 0); } else - printf("\n"); + log_info("\n"); return 1; } @@ -1095,3 +1044,22 @@ void options_init(struct fio_option *options) for (o = &options[0]; o->name; o++) option_init(o); } + +void options_free(struct fio_option *options, void *data) +{ + struct fio_option *o; + char **ptr; + + dprint(FD_PARSE, "free options\n"); + + for (o = &options[0]; o->name; o++) { + if (o->type != FIO_OPT_STR_STORE) + continue; + + ptr = td_var(data, o->off1); + if (*ptr) { + free(*ptr); + *ptr = NULL; + } + } +}