From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 13 Apr 2013 19:54:42 +0000 (+0100)
Subject: libblkid: check writing to a file was successful
X-Git-Tag: v2.24-rc1~597
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d21d9ab8ff65decfd03499a29627b6c9ecb21f2;p=thirdparty%2Futil-linux.git

libblkid: check writing to a file was successful

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c
index 8853009c9f..8ef927756f 100644
--- a/libblkid/src/evaluate.c
+++ b/libblkid/src/evaluate.c
@@ -24,6 +24,7 @@
 
 #include "pathnames.h"
 #include "canonicalize.h"
+#include "closestream.h"
 
 #include "blkidP.h"
 
@@ -123,7 +124,8 @@ int blkid_send_uevent(const char *devname, const char *action)
 		rc = 0;
 		if (fputs(action, f) >= 0)
 			rc = 0;
-		fclose(f);
+		if (close_stream(f) != 0)
+			DBG(EVALUATE, blkid_debug("write failed: %s", uevent));
 	}
 	DBG(EVALUATE, blkid_debug("%s: send uevent %s",
 			uevent, rc == 0 ? "SUCCES" : "FAILED"));
diff --git a/libblkid/src/save.c b/libblkid/src/save.c
index 86eda6cbcf..424017a32e 100644
--- a/libblkid/src/save.c
+++ b/libblkid/src/save.c
@@ -21,6 +21,9 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+
+#include "closestream.h"
+
 #include "blkidP.h"
 
 static int save_dev(blkid_dev dev, FILE *file)
@@ -148,7 +151,9 @@ int blkid_flush_cache(blkid_cache cache)
 		ret = 1;
 	}
 
-	fclose(file);
+	if (close_stream(file) != 0)
+		DBG(SAVE, blkid_debug("write failed: %s", filename));
+
 	if (opened != filename) {
 		if (ret < 0) {
 			unlink(opened);