security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

2007-06-18 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* 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().
This commit is contained in:
Marcus Brinkmann 2007-06-18 20:07:33 +00:00
parent ad4a6067ca
commit b1b471dcc8
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-18 Marcus Brinkmann <marcus@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@g10code.de> 2007-06-15 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c (copy_file) [HAVE_W32_SYSTEM]: New function. * gpgconf-comp.c (copy_file) [HAVE_W32_SYSTEM]: New function.

26
tools/gpgconf-comp.c
View File

@ -1563,6 +1563,8 @@ retrieve_options_from_file (gc_component_t component, gc_backend_t backend)
list_option->active = 1; list_option->active = 1;
list_option->value = list; list_option->value = list;
if (fclose (list_file) && ferror (list_file))
gc_error (1, errno, "error closing %s", list_pathname);
xfree (line); xfree (line);
} }
@ -1763,14 +1765,24 @@ copy_file (const char *src_name, const char *dst_name)
if (ferror (src) || ferror (dst) || !feof (src)) if (ferror (src) || ferror (dst) || !feof (src))
{ {
int saved_errno = errno;
fclose (src);
fclose (dst);
unlink (dst_name); unlink (dst_name);
errno = saved_errno;
return -1; 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; return 0;
} }
#endif /* HAVE_W32_SYSTEM */ #endif /* HAVE_W32_SYSTEM */
/* Create and verify the new configuration file for the specified /* Create and verify the new configuration file for the specified
backend and component. Returns 0 on success and -1 on error. */ backend and component. Returns 0 on success and -1 on error. */
static int static int
@ -2538,15 +2550,16 @@ gc_component_change_options (int component, FILE *in)
{ {
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
/* There is no atomic update on W32. */ /* There is no atomic update on W32. */
unlink (dest_pathname[i]); err = unlink (dest_pathname[i]);
#endif /* HAVE_W32_SYSTEM */ #endif /* HAVE_W32_SYSTEM */
if (!err)
err = rename (src_pathname[i], dest_pathname[i]); err = rename (src_pathname[i], dest_pathname[i]);
} }
else else
{ {
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
/* We skip the unlink if we do not expect the file /* We skip the unlink if we expect the file not to
to be there. */ be there. */
err = rename (src_pathname[i], dest_pathname[i]); err = rename (src_pathname[i], dest_pathname[i]);
#else /* HAVE_W32_SYSTEM */ #else /* HAVE_W32_SYSTEM */
/* This is a bit safer than rename() because we /* This is a bit safer than rename() because we
@ -2554,7 +2567,7 @@ gc_component_change_options (int component, FILE *in)
happens to be there, this will fail. */ happens to be there, this will fail. */
err = link (src_pathname[i], dest_pathname[i]); err = link (src_pathname[i], dest_pathname[i]);
if (!err) if (!err)
unlink (src_pathname[i]); err = unlink (src_pathname[i]);
#endif /* !HAVE_W32_SYSTEM */ #endif /* !HAVE_W32_SYSTEM */
} }
if (err) if (err)
@ -2617,6 +2630,11 @@ gc_component_change_options (int component, FILE *in)
assert (dest_pathname[backend]); assert (dest_pathname[backend]);
backup_pathname = xasprintf ("%s.gpgconf.bak", 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); rename (orig_pathname[backend], backup_pathname);
} }