[Pkg-shadow-commits] r3006 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-25 19:51:23 +0000 (Mon, 25 May 2009)
New Revision: 3006

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/vipw.c
Log:
	* src/vipw.c: Make sure opened files are closed.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-05-25 19:41:43 UTC (rev 3005)
+++ upstream/trunk/ChangeLog	2009-05-25 19:51:23 UTC (rev 3006)
@@ -1,5 +1,9 @@
 2009-05-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/vipw.c: Make sure opened files are closed.
+
+2009-05-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/chpasswd.8.xml, man/grpck.8.xml, man/newgrp.1.xml,
 	man/passwd.1.xml, man/sg.1.xml: Avoid a spurious comma.
 

Modified: upstream/trunk/src/vipw.c
===================================================================
--- upstream/trunk/src/vipw.c	2009-05-25 19:41:43 UTC (rev 3005)
+++ upstream/trunk/src/vipw.c	2009-05-25 19:51:23 UTC (rev 3006)
@@ -116,11 +116,15 @@
 		unlink (backup);
 		return -1;
 	}
-	if (   (fsync (fileno (bkfp)) != 0)
-	    || (fclose (bkfp) != 0)) {
+	if (fsync (fileno (bkfp)) != 0) {
+		(void) fclose (bkfp);
 		unlink (backup);
 		return -1;
 	}
+	if (fclose (bkfp) != 0) {
+		unlink (backup);
+		return -1;
+	}
 
 	ub.actime = sb->st_atime;
 	ub.modtime = sb->st_mtime;
@@ -225,6 +229,7 @@
 	if (create_backup_file (f, fileedit, &st1) != 0) {
 		vipwexit (_("Couldn't make backup"), errno, 1);
 	}
+	(void) fclose (f);
 	createedit = true;
 
 	editor = getenv ("VISUAL");