Additional debug features

[geeqie.git] / src / secure_save.c

diff --git a/src/secure_save.c b/src/secure_save.c
index a52651e..85eff68 100644 (file)
--- a/src/secure_save.c
+++ b/src/secure_save.c
@@ -1,19 +1,29 @@
 /*
- * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
- * based on the code developped for ELinks by Laurent Monin
+ * Author: Laurent Monin
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "main.h"
+#include <glib/gprintf.h>
 #include <glib/gstdio.h>
 #include <errno.h>
 #include <utime.h>
 
-#include "main.h"
 #include "secure_save.h"
 
 
@@ -232,7 +242,7 @@ secure_close(SecureSaveInfo *ssi)
         * while closing file releases file descriptor we need to call fsync(). */
 #if defined(HAVE_FFLUSH) || defined(HAVE_FSYNC)
        if (ssi->secure_save) {
-               int fail = 0;
+               gboolean fail = FALSE;
 
 #ifdef HAVE_FFLUSH
                fail = (fflush(ssi->fp) == EOF);
@@ -275,8 +285,8 @@ secure_close(SecureSaveInfo *ssi)
                        /* set the dest file attributes to that of source (ignoring errors) */
                        if (ssi->preserve_perms)
                                {
-                               chown(ssi->tmp_file_name, st.st_uid, st.st_gid);
-                               chmod(ssi->tmp_file_name, st.st_mode);
+                               if (chown(ssi->tmp_file_name, st.st_uid, st.st_gid) != 0) log_printf("chown('%s', %d, %d) failed", ssi->tmp_file_name, st.st_uid, st.st_gid);
+                               if (chmod(ssi->tmp_file_name, st.st_mode) != 0) log_printf("chmod('%s', %o) failed", ssi->tmp_file_name, st.st_mode);
                                }
 
                        if (ssi->preserve_mtime)
@@ -288,7 +298,6 @@ secure_close(SecureSaveInfo *ssi)
                                utime(ssi->tmp_file_name, &tb);
                                }
                        }
-               DEBUG_3("rename %s -> %s", ssi->tmp_file_name, ssi->file_name);
                if (rename(ssi->tmp_file_name, ssi->file_name) == -1) {
                        ret = errno;
                        secsave_errno = SS_ERR_RENAME;
@@ -362,8 +371,7 @@ secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...)
        if (!ssi || !ssi->fp || ssi->err) return -1;
 
        va_start(ap, format);
-       ret = vfprintf(ssi->fp, format, ap);
-       if (ret < 0) ssi->err = errno;
+       ret = g_vfprintf(ssi->fp, format, ap);
        va_end(ap);
 
        return ret;
@@ -373,7 +381,7 @@ secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...)
  * the number of elements to write. If ssi->err is set when called, it immediatly returns 0.
  */
 size_t
-secure_fwrite(const void *ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi)
+secure_fwrite(gconstpointer ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi)
 {
        size_t ret;
 
@@ -415,3 +423,4 @@ secsave_strerror(SecureSaveErrno secsave_error)
                return _("Secure file saving error");
        }
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */