From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 9 Sep 2006 12:03:20 +0000 (+0000)
Subject: vvfat fixes (Roger Lathrop)
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~14200
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bcb76c3b62195820daed29d621cda3fbe4256f3;p=sdk%2Femulator%2Fqemu.git

vvfat fixes (Roger Lathrop)


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

diff --git a/block-vvfat.c b/block-vvfat.c
index ad6b7d29e8..48a52e3116 100644
--- a/block-vvfat.c
+++ b/block-vvfat.c
@@ -61,7 +61,7 @@ void nonono(const char* file, int line, const char* msg) {
     exit(-5);
 }
 #undef assert
-#define assert(a) if (!(a)) nonono(__FILE__, __LINE__, #a)
+#define assert(a) do {if (!(a)) nonono(__FILE__, __LINE__, #a);}while(0)
 #endif
 
 #else
@@ -2174,7 +2174,7 @@ static int commit_one_file(BDRVVVFATState* s,
     for (i = s->cluster_size; i < offset; i += s->cluster_size)
 	c = modified_fat_get(s, c);
 
-    fd = open(mapping->path, O_RDWR | O_CREAT, 0666);
+    fd = open(mapping->path, O_RDWR | O_CREAT | O_BINARY, 0666);
     if (fd < 0) {
 	fprintf(stderr, "Could not open %s... (%s, %d)\n", mapping->path,
 		strerror(errno), errno);