security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

Fix

Browse Source
This commit is contained in:
Werner Koch 2010-08-23 16:27:10 +00:00
parent 299cb641e6
commit 1803af7a1c
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,6 +1,8 @@
Noteworthy changes in version 2.0.17 (unreleased) Noteworthy changes in version 2.0.17 (unreleased)
------------------------------------------------- -------------------------------------------------
* Fixed output of "gpgconf --check-options".
Noteworthy changes in version 2.0.16 (2010-07-19) Noteworthy changes in version 2.0.16 (2010-07-19)
------------------------------------------------- -------------------------------------------------

2
README
View File

@ -12,7 +12,7 @@ INTRODUCTION
GnuPG is GNU's tool for secure communication and data storage. It can 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 be used to encrypt data and to create digital signatures. It includes
an advanced key management facility and is compliant with the proposed 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. standard as described by several RFCs.
GnuPG is distributed under the terms of the GNU General Public GnuPG is distributed under the terms of the GNU General Public

7
tools/ChangeLog
View File

@ -1,3 +1,10 @@
2010-08-23 Werner Koch <wk@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@g10code.com> 2010-08-19 Werner Koch <wk@g10code.com>
* gpgconf.c (main): Fix --check-options. * gpgconf.c (main): Fix --check-options.

10
tools/gpgconf-comp.c
View File

@ -1903,7 +1903,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
} }
if (length < 0 || ferror (config)) if (length < 0 || ferror (config))
gc_error (1, errno, "error reading from %s",pgmname); 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); gc_error (1, errno, "error closing %s", pgmname);
err = gnupg_wait_process (pgmname, pid, &exitcode); err = gnupg_wait_process (pgmname, pid, &exitcode);
@ -2004,7 +2004,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
if (length < 0 || ferror (config)) if (length < 0 || ferror (config))
gc_error (1, errno, "error reading from %s", config_filename); 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); gc_error (1, errno, "error closing %s", config_filename);
} }
@ -2084,7 +2084,7 @@ retrieve_options_from_file (gc_component_t component, gc_backend_t backend)
if (config_option->flags & GC_OPT_FLAG_NO_CHANGE) if (config_option->flags & GC_OPT_FLAG_NO_CHANGE)
list_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); gc_error (1, errno, "error closing %s", list_filename);
xfree (line); xfree (line);
} }
@ -2305,9 +2305,9 @@ copy_file (const char *src_name, const char *dst_name)
return -1; return -1;
} }
if (fclose (dst) && ferror (dst)) if (fclose (dst))
gc_error (1, errno, "error closing %s", dst_name); 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); gc_error (1, errno, "error closing %s", src_name);
return 0; return 0;