[svn] GnuPG - r5402 - in branches/STABLE-BRANCH-2-0: . tools

[svn author wk]

Author: wk
Date: 2010-08-23 18:27:10 +0200 (Mon, 23 Aug 2010)
New Revision: 5402

Modified:
   branches/STABLE-BRANCH-2-0/NEWS
   branches/STABLE-BRANCH-2-0/README
   branches/STABLE-BRANCH-2-0/tools/ChangeLog
   branches/STABLE-BRANCH-2-0/tools/gpgconf-comp.c
Log:
Fix


Modified: branches/STABLE-BRANCH-2-0/tools/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/tools/ChangeLog	2010-08-20 12:18:38 UTC (rev 5401)
+++ branches/STABLE-BRANCH-2-0/tools/ChangeLog	2010-08-23 16:27:10 UTC (rev 5402)
@@ -1,3 +1,10 @@
+2010-08-23  Werner Koch  <wk at g10code.com>
+
+	* gpgconf-comp.c (retrieve_options_from_program)
+	(retrieve_options_from_file, copy_file): Do not use ferror after a
+	failed fclose.  Note that the stream is in any case invalid after
+	calling fclose and that fclose does set ERRNO.
+
 2010-08-19  Werner Koch  <wk at g10code.com>
 
 	* gpgconf.c (main): Fix --check-options.

Modified: branches/STABLE-BRANCH-2-0/NEWS
===================================================================
--- branches/STABLE-BRANCH-2-0/NEWS	2010-08-20 12:18:38 UTC (rev 5401)
+++ branches/STABLE-BRANCH-2-0/NEWS	2010-08-23 16:27:10 UTC (rev 5402)
@@ -1,7 +1,9 @@
 Noteworthy changes in version 2.0.17 (unreleased)
 -------------------------------------------------
 
+ * Fixed output of "gpgconf --check-options".
 
+
 Noteworthy changes in version 2.0.16 (2010-07-19)
 -------------------------------------------------
 

Modified: branches/STABLE-BRANCH-2-0/README
===================================================================
--- branches/STABLE-BRANCH-2-0/README	2010-08-20 12:18:38 UTC (rev 5401)
+++ branches/STABLE-BRANCH-2-0/README	2010-08-23 16:27:10 UTC (rev 5402)
@@ -12,7 +12,7 @@
 GnuPG is GNU's tool for secure communication and data storage.  It can
 be used to encrypt data and to create digital signatures.  It includes
 an advanced key management facility and is compliant with the proposed
-OpenPGP Internet standard as described in RFC2440 and the S/MIME
+OpenPGP Internet standard as described in RFC4880 and the S/MIME
 standard as described by several RFCs.
 
 GnuPG is distributed under the terms of the GNU General Public

Modified: branches/STABLE-BRANCH-2-0/tools/gpgconf-comp.c
===================================================================
--- branches/STABLE-BRANCH-2-0/tools/gpgconf-comp.c	2010-08-20 12:18:38 UTC (rev 5401)
+++ branches/STABLE-BRANCH-2-0/tools/gpgconf-comp.c	2010-08-23 16:27:10 UTC (rev 5402)
@@ -1903,7 +1903,7 @@
     }
   if (length < 0 || ferror (config))
     gc_error (1, errno, "error reading from %s",pgmname);
-  if (fclose (config) && ferror (config))
+  if (fclose (config))
     gc_error (1, errno, "error closing %s", pgmname);
 
   err = gnupg_wait_process (pgmname, pid, &exitcode);
@@ -2004,7 +2004,7 @@
 
       if (length < 0 || ferror (config))
 	gc_error (1, errno, "error reading from %s", config_filename);
-      if (fclose (config) && ferror (config))
+      if (fclose (config))
 	gc_error (1, errno, "error closing %s", config_filename);
     }
 
@@ -2084,7 +2084,7 @@
   if (config_option->flags & GC_OPT_FLAG_NO_CHANGE)
     list_option->flags |= GC_OPT_FLAG_NO_CHANGE;
 
-  if (list_file && fclose (list_file) && ferror (list_file))
+  if (list_file && fclose (list_file))
     gc_error (1, errno, "error closing %s", list_filename);
   xfree (line);
 }
@@ -2305,9 +2305,9 @@
       return -1;
     }
 
-  if (fclose (dst) && ferror (dst))
+  if (fclose (dst))
     gc_error (1, errno, "error closing %s", dst_name);
-  if (fclose (src) && ferror (src))
+  if (fclose (src))
     gc_error (1, errno, "error closing %s", src_name);
 
   return 0;