[svn] GnuPG - r4519 - trunk/tools

[svn author marcus]

Author: marcus
Date: 2007-06-18 22:07:33 +0200 (Mon, 18 Jun 2007)
New Revision: 4519

Modified:
   trunk/tools/ChangeLog
   trunk/tools/gpgconf-comp.c
Log:
2007-06-18  Marcus Brinkmann  <marcus at g10code.de>

	* gpgconf-comp.c (retrieve_options_from_file): Close LIST_FILE.
	(copy_file): In error case, save/restore errno.  Close SRC and DST.
	(gc_component_change_options): Catch error from unlink().  Remove
	target backup file before rename().


Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2007-06-18 10:33:12 UTC (rev 4518)
+++ trunk/tools/ChangeLog	2007-06-18 20:07:33 UTC (rev 4519)
@@ -1,3 +1,10 @@
+2007-06-18  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgconf-comp.c (retrieve_options_from_file): Close LIST_FILE.
+	(copy_file): In error case, save/restore errno.  Close SRC and DST.
+	(gc_component_change_options): Catch error from unlink().  Remove
+	target backup file before rename().
+
 2007-06-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgconf-comp.c (copy_file) [HAVE_W32_SYSTEM]: New function.

Modified: trunk/tools/gpgconf-comp.c
===================================================================
--- trunk/tools/gpgconf-comp.c	2007-06-18 10:33:12 UTC (rev 4518)
+++ trunk/tools/gpgconf-comp.c	2007-06-18 20:07:33 UTC (rev 4519)
@@ -1563,6 +1563,8 @@
   list_option->active = 1;
   list_option->value = list;
 
+  if (fclose (list_file) && ferror (list_file))
+    gc_error (1, errno, "error closing %s", list_pathname);
   xfree (line);
 }
 
@@ -1763,14 +1765,24 @@
 
   if (ferror (src) || ferror (dst) || !feof (src))
     {
+      int saved_errno = errno;
+      fclose (src);
+      fclose (dst);
       unlink (dst_name);
+      errno = saved_errno;
       return -1;
     }
 
+  if (fclose (dst) && ferror (dst))
+    gc_error (1, errno, "error closing %s", dst_name);
+  if (fclose (src) && ferror (src))
+    gc_error (1, errno, "error closing %s", src_name);
+
   return 0;
 }
 #endif /* HAVE_W32_SYSTEM */
 
+
 /* Create and verify the new configuration file for the specified
    backend and component.  Returns 0 on success and -1 on error.  */
 static int
@@ -2538,15 +2550,16 @@
 		{
 #ifdef HAVE_W32_SYSTEM
 		  /* There is no atomic update on W32.  */
-		  unlink (dest_pathname[i]);
+		  err = unlink (dest_pathname[i]);
 #endif /* HAVE_W32_SYSTEM */
-		  err = rename (src_pathname[i], dest_pathname[i]);
+		  if (!err)
+		    err = rename (src_pathname[i], dest_pathname[i]);
 		}
 	      else
 		{
 #ifdef HAVE_W32_SYSTEM
-		  /* We skip the unlink if we do not expect the file
-		     to be there.  */
+		  /* We skip the unlink if we expect the file not to
+		     be there.  */
                   err = rename (src_pathname[i], dest_pathname[i]);
 #else /* HAVE_W32_SYSTEM */
 		  /* This is a bit safer than rename() because we
@@ -2554,7 +2567,7 @@
 		     happens to be there, this will fail.  */
 		  err = link (src_pathname[i], dest_pathname[i]);
 		  if (!err)
-		    unlink (src_pathname[i]);
+		    err = unlink (src_pathname[i]);
 #endif /* !HAVE_W32_SYSTEM */
 		}
 	      if (err)
@@ -2617,6 +2630,11 @@
 	assert (dest_pathname[backend]);
 
 	backup_pathname = xasprintf ("%s.gpgconf.bak", dest_pathname[backend]);
+
+#ifdef HAVE_W32_SYSTEM
+	/* There is no atomic update on W32.  */
+	unlink (backup_pathname);
+#endif /* HAVE_W32_SYSTEM */
 	rename (orig_pathname[backend], backup_pathname);
       }