Secure save now unlinks temporary file on error by default.

It will prevent left-behind temporary files, but also prevent
potential data recovery from partially written files (it
should not be a problem here).

diff --git a/src/secure_save.c b/src/secure_save.c
index 470b063..7f73aa4 100644 (file)
--- a/src/secure_save.c
+++ b/src/secure_save.c
@@ -83,6 +83,7 @@ secure_open_umask(const gchar *file_name)
 
        ssi->secure_save = TRUE;
        ssi->preserve_perms = TRUE;
+       ssi->unlink_on_error = TRUE;
 
        ssi->file_name = g_strdup(file_name);
        if (!ssi->file_name) {
@@ -106,7 +107,7 @@ secure_open_umask(const gchar *file_name)
        } else {
                if (!S_ISREG(st.st_mode)) {
                        /* Not a regular file, secure_save is disabled. */
-                       ssi->secure_save = 0;
+                       ssi->secure_save = FALSE;
                } else {
 #ifdef HAVE_ACCESS
                        /* XXX: access() do not work with setuid programs. */
@@ -297,7 +298,11 @@ secure_close(SecureSaveInfo *ssi)
        ret = 0;        /* Success. */
 
 free:
-       if (ssi->tmp_file_name) g_free(ssi->tmp_file_name);
+       if (ssi->tmp_file_name)
+               {
+               if (ret && ssi->unlink_on_error) unlink(ssi->tmp_file_name);
+               g_free(ssi->tmp_file_name);
+               }
        if (ssi->file_name) g_free(ssi->file_name);
        if (ssi) g_free(ssi);
 

diff --git a/src/typedefs.h b/src/typedefs.h
index 4fb9db8..f47bf2e 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -722,9 +722,10 @@ struct _SecureSaveInfo {
        gchar *file_name; /**< final file name */
        gchar *tmp_file_name; /**< temporary file name */
        gint err; /**< set to non-zero value in case of error */
-       gint secure_save; /**< use secure save for this file */
-       gint preserve_perms; /**< whether to preserve perms */
-       gint preserve_mtime; /**< whether to preserve mtime */
+       gint secure_save; /**< use secure save for this file, internal use only */
+       gint preserve_perms; /**< whether to preserve perms, TRUE by default */
+       gint preserve_mtime; /**< whether to preserve mtime, FALSE by default */
+       gint unlink_on_error; /**< whether to remove temporary file on save failure, TRUE by default */
 };