summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-01-18 05:22:22 -0700
committerJens Axboe <jaxboe@fusionio.com>2011-01-18 05:22:22 -0700
commit4c6107ff4db87f50545bad515543f5024bb39e4a (patch)
tree5f2958d3c2feb19574ed1b8b6eac71fb6fb52ce6
parenta6294434450db2728f1253ec6b6d2f57ef864b94 (diff)
downloadfio-4c6107ff4db87f50545bad515543f5024bb39e4a.tar.gz
fio-4c6107ff4db87f50545bad515543f5024bb39e4a.tar.bz2
Ensure that short command line options work
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--init.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/init.c b/init.c
index dcb01934..bce28466 100644
--- a/init.c
+++ b/init.c
@@ -55,6 +55,8 @@ unsigned long fio_debug = 0;
unsigned int fio_debug_jobno = -1;
unsigned int *fio_debug_jobp = NULL;
+static char cmd_optstr[256];
+
/*
* Command line options. These will contain the above, plus a few
* extra that only pertain to fio itself and not jobs.
@@ -1093,12 +1095,32 @@ static int set_debug(const char *string)
}
#endif
+static void fio_options_fill_optstring(void)
+{
+ char *ostr = cmd_optstr;
+ int i, c;
+
+ c = i = 0;
+ while (l_opts[i].name) {
+ ostr[c++] = l_opts[i].val;
+ if (l_opts[i].has_arg == required_argument)
+ ostr[c++] = ':';
+ else if (l_opts[i].has_arg == optional_argument) {
+ ostr[c++] = ':';
+ ostr[c++] = ':';
+ }
+ i++;
+ }
+ ostr[c] = '\0';
+}
+
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
+ char *ostr = cmd_optstr;
- while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
+ while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
switch (c) {
case 'a':
smalloc_pool_size = atoi(optarg);
@@ -1231,6 +1253,7 @@ int parse_options(int argc, char *argv[])
log_info("%s\n", fio_version_string);
+ fio_options_fill_optstring();
fio_options_dup_and_init(l_opts);
if (setup_thread_area())