Fio 1.50-rc3

[fio.git] / init.c

diff --git a/init.c b/init.c
index 97eac4363bdcb277ca0fca8935b71a74ce2ce777..682135ba797cac3bc43bf5b17ce7b84862455a80 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.44.3";
+static char fio_version_string[] = "fio 1.50-rc3";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -158,8 +158,11 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 
        if (global)
                return &def_thread;
-       if (thread_number >= max_jobs)
+       if (thread_number >= max_jobs) {
+               log_err("error: maximum number of jobs (%d) reached.\n",
+                               max_jobs);
                return NULL;
+       }
 
        td = &threads[thread_number++];
        *td = *parent;
@@ -431,7 +434,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;
@@ -1105,7 +1110,7 @@ static int parse_cmd_line(int argc, char *argv[])
                        read_only = 1;
                        break;
                case 'v':
-                       printf("%s\n", fio_version_string);
+                       /* already being printed, just quit */
                        exit(0);
                case 'e':
                        if (!strcmp("always", optarg))
@@ -1224,7 +1229,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;
        }