server: fix += -> + typo

[fio.git] / init.c

diff --git a/init.c b/init.c
index c4d6a1ee150860de95c322d945a9731a519d181c..486b743578873e945b982538e37588ed479c40ca 100644 (file)
--- a/init.c
+++ b/init.c
@@ -69,6 +69,7 @@ unsigned int fio_debug_jobno = -1;
 unsigned int *fio_debug_jobp = NULL;
 
 static char cmd_optstr[256];
+static int did_arg;
 
 const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = {
        { .u.f  =  1.0 },
@@ -187,7 +188,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
        },
        {
                .name           = (char *) "server",
-               .has_arg        = no_argument,
+               .has_arg        = optional_argument,
                .val            = 'S',
        },
        {       .name           = (char *) "daemonize",
@@ -1099,7 +1100,7 @@ static int fill_def_thread(void)
 
 static void usage(const char *name)
 {
-       printf("%s\n", fio_version_string);
+       printf("fio %s\n", fio_version_string);
        printf("%s [options] [job options] <job file(s)>\n", name);
        printf("\t--debug=options\tEnable debug logging\n");
        printf("\t--output\tWrite output to file\n");
@@ -1267,6 +1268,8 @@ int parse_cmd_line(int argc, char *argv[])
        optind = 1;
 
        while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
+               did_arg = 1;
+
                if ((c & FIO_CLIENT_FLAG) || client_flag_set(c)) {
                        if (parse_cmd_client(cur_client, argv[optind - 1])) {
                                exit_val = 1;
@@ -1301,14 +1304,16 @@ int parse_cmd_line(int argc, char *argv[])
                        terse_output = 1;
                        break;
                case 'h':
-                       if (!cur_client)
+                       if (!cur_client) {
                                usage(argv[0]);
-                       do_exit++;
+                               do_exit++;
+                       }
                        break;
                case 'c':
-                       if (!cur_client)
+                       if (!cur_client) {
                                fio_show_option_help(optarg);
-                       do_exit++;
+                               do_exit++;
+                       }
                        break;
                case 's':
                        dump_cmdline = 1;
@@ -1317,9 +1322,10 @@ int parse_cmd_line(int argc, char *argv[])
                        read_only = 1;
                        break;
                case 'v':
-                       if (!cur_client)
-                               log_info("%s\n", fio_version_string);
-                       do_exit++;
+                       if (!cur_client) {
+                               log_info("fio %s\n", fio_version_string);
+                               do_exit++;
+                       }
                        break;
                case 'V':
                        terse_version = atoi(optarg);
@@ -1404,6 +1410,8 @@ int parse_cmd_line(int argc, char *argv[])
                                exit_val = 1;
                                break;
                        }
+                       if (optarg)
+                               fio_server_add_arg(optarg);
                        is_backend = 1;
                        backend = 1;
                        break;
@@ -1451,7 +1459,7 @@ int parse_cmd_line(int argc, char *argv[])
                        ret = add_job(td, td->o.name ?: "fio", 0);
        }
 
-       while (optind < argc) {
+       while (!ret && optind < argc) {
                ini_idx++;
                ini_file = realloc(ini_file, ini_idx * sizeof(char *));
                ini_file[ini_idx - 1] = strdup(argv[optind]);
@@ -1504,10 +1512,17 @@ int parse_options(int argc, char *argv[])
                        return 0;
                if (is_backend || nr_clients)
                        return 0;
+               if (did_arg)
+                       return 0;
 
                log_err("No jobs(s) defined\n\n");
-               usage(argv[0]);
-               return 1;
+
+               if (!did_arg) {
+                       usage(argv[0]);
+                       return 1;
+               }
+
+               return 0;
        }
 
        if (def_thread.o.gtod_offload) {
@@ -1516,6 +1531,6 @@ int parse_options(int argc, char *argv[])
                fio_gtod_cpu = def_thread.o.gtod_cpu;
        }
 
-       log_info("%s\n", fio_version_string);
+       log_info("fio %s\n", fio_version_string);
        return 0;
 }