Always exit if do_exit is set after parse

[fio.git] / init.c

diff --git a/init.c b/init.c
index 0cc6a520b15269c177ff1fa7ab01a4fddc2ac038..c44fa671aa9a3851da57270dd4b901ec272223be 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1725,7 +1725,13 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
                                fio_options_set_ioengine_opts(l_opts, td);
                        }
 
-                       ret = fio_cmd_option_parse(td, opt, val);
+                       if ((!val || !strlen(val)) &&
+                           l_opts[lidx].has_arg == required_argument) {
+                               log_err("fio: option %s requires an argument\n", opt);
+                               ret = 1;
+                       } else
+                               ret = fio_cmd_option_parse(td, opt, val);
+
                        if (ret) {
                                if (td) {
                                        put_job(td);
@@ -1838,10 +1844,8 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
                        break;
        }
 
-       if (do_exit) {
-               if (exit_val && !(is_backend || nr_clients))
-                       exit(exit_val);
-       }
+       if (do_exit && !(is_backend || nr_clients))
+               exit(exit_val);
 
        if (nr_clients && fio_clients_connect()) {
                do_exit++;