Fio 1.50-rc1

[fio.git] / init.c

diff --git a/init.c b/init.c
index fe4dbf2551d8926f49190372d1d883716e7e0d14..124bdbbbf2fa30beabcb62e69814f2b20f951791 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.43.2";
+static char fio_version_string[] = "fio 1.50-rc1";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -431,7 +431,9 @@ static int exists_and_not_file(const char *filename)
        if (lstat(filename, &sb) == -1)
                return 0;
 
-       if (S_ISREG(sb.st_mode))
+       /* \\.\ is the device namespace in Windows, where every file
+        * is a device node */
+       if (S_ISREG(sb.st_mode) && strncmp(filename, "\\\\.\\", 4) != 0)
                return 0;
 
        return 1;
@@ -561,7 +563,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
        td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
        td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
-       td->ddir_seq_nr = td->o.ddir_seq_nr + 1;
+       td->ddir_seq_nr = td->o.ddir_seq_nr;
 
        if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
                prev_group_jobs = 0;
@@ -958,7 +960,6 @@ static int setup_thread_area(void)
 
 static void usage(const char *name)
 {
-       printf("%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");
@@ -1197,6 +1198,8 @@ int parse_options(int argc, char *argv[])
        f_out = stdout;
        f_err = stderr;
 
+       log_info("%s\n", fio_version_string);
+
        fio_options_dup_and_init(l_opts);
 
        if (setup_thread_area())
@@ -1223,7 +1226,7 @@ int parse_options(int argc, char *argv[])
                if (exec_profile)
                        return 0;
 
-               log_err("No jobs defined(s)\n\n");
+               log_err("No jobs(s) defined\n\n");
                usage(argv[0]);
                return 1;
        }