commit f45512feac6622615e08cca33d172abb87b01921
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Aug 23 21:40:13 2006 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Aug 23 21:40:13 2006 +0000
tree b07fd7452ccda48a7b0b77740420cc2c11c0abaa
parent 6b21b973ab9aa2bfc3ebfe1df4474466ceb4d88b

win32 compilation fixes


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2134 c046a42c-6fe2-441c-8c8c-71466251a162

block.c

diff --git a/block.c b/block.c
index 3b35500..12fc2ef 100644
--- a/block.c
+++ b/block.c
@@ -182,11 +182,17 @@
 #endif
 
 #ifdef _WIN32
+static int is_windows_drive_prefix(const char *filename)
+{
+    return (((filename[0] >= 'a' && filename[0] <= 'z') ||
+             (filename[0] >= 'A' && filename[0] <= 'Z')) &&
+            filename[1] == ':');
+}
+    
 static int is_windows_drive(const char *filename)
 {
-    if (((filename[0] >= 'a' && filename[0] <= 'z') ||
-         (filename[0] >= 'A' && filename[0] <= 'Z')) &&
-        filename[1] == ':' && filename[2] == '\0')
+    if (is_windows_drive_prefix(filename) && 
+        filename[2] == '\0')
         return 1;
     if (strstart(filename, "\\\\.\\", NULL) ||
         strstart(filename, "//./", NULL))
@@ -203,7 +209,8 @@
     const char *p;
 
 #ifdef _WIN32
-    if (is_windows_drive(filename))
+    if (is_windows_drive(filename) ||
+        is_windows_drive_prefix(filename))
         return &bdrv_raw;
 #endif
     p = strchr(filename, ':');