Trim trailing white spaces.

[geeqie.git] / src / ui_fileops.c

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index 11bf4c0..f7ee88b 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -1,7 +1,7 @@
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -49,25 +49,6 @@ void print_term(const gchar *text_utf8)
        g_free(text_l);
 }
 
-static void encoding_dialog(const gchar *path);
-
-static gboolean encoding_dialog_idle(gpointer data)
-{
-       gchar *path = data;
-
-       encoding_dialog(path);
-       g_free(path);
-
-       return FALSE;
-}
-
-static gint encoding_dialog_delay(gpointer data)
-{
-       g_idle_add(encoding_dialog_idle, data);
-
-       return 0;
-}
-
 static void encoding_dialog(const gchar *path)
 {
        static gboolean warned_user = FALSE;
@@ -76,14 +57,6 @@ static void encoding_dialog(const gchar *path)
        const gchar *lc;
        const gchar *bf;
 
-       /* check that gtk is initialized (loop is level > 0) */
-       if (gtk_main_level() == 0)
-               {
-               /* gtk not initialized */
-               gtk_init_add(encoding_dialog_delay, g_strdup(path));
-               return;
-               }
-
        if (warned_user) return;
        warned_user = TRUE;
 
@@ -490,8 +463,14 @@ gboolean copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint m
 
                /* set the dest file attributes to that of source (ignoring errors) */
 
-               if (perms && chown(tl, st.st_uid, st.st_gid) < 0) ret = FALSE;
-               if (perms && chmod(tl, st.st_mode) < 0) ret = FALSE;
+               if (perms)
+                       {
+                       ret = chown(tl, st.st_uid, st.st_gid);
+                       /* Ignores chown errors, while still doing chown
+                          (so root still can copy files preserving ownership) */
+                       ret = TRUE;
+                       if (chmod(tl, st.st_mode) < 0) ret = FALSE;
+                       }
 
                tb.actime = st.st_atime;
                tb.modtime = st.st_mtime;
@@ -520,52 +499,66 @@ gboolean copy_file(const gchar *s, const gchar *t)
 {
        FILE *fi = NULL;
        FILE *fo = NULL;
-       gchar *sl, *tl;
-       gchar buf[4096];
+       gchar *sl = NULL;
+       gchar *tl = NULL;
+       gchar *randname = NULL;
+       gchar buf[16384];
        size_t b;
+       gint ret = FALSE;
+       gint fd = -1;
 
        sl = path_from_utf8(s);
        tl = path_from_utf8(t);
 
        if (hard_linked(sl, tl))
                {
-               g_free(sl);
-               g_free(tl);
-               return TRUE;
+               ret = TRUE;
+               goto end;
                }
 
        fi = fopen(sl, "rb");
-       if (fi)
-               {
-               fo = fopen(tl, "wb");
-               if (!fo)
-                       {
-                       fclose(fi);
-                       fi = NULL;
-                       }
-               }
-
-       g_free(sl);
-       g_free(tl);
-
-       if (!fi || !fo) return FALSE;
+       if (!fi) goto end;
+       
+       /* First we write to a temporary file, then we rename it on success,
+          and attributes from original file are copied */
+       randname = g_strconcat(tl, ".tmp_XXXXXX", NULL);
+       if (!randname) goto end;
+       
+       fd = g_mkstemp(randname);
+       if (fd == -1) goto end;
+       
+       fo = fdopen(fd, "wb");
+       if (!fo) {
+               close(fd);
+               goto end;
+       }
 
        while ((b = fread(buf, sizeof(gchar), sizeof(buf), fi)) && b != 0)
                {
                if (fwrite(buf, sizeof(gchar), b, fo) != b)
                        {
-                       fclose(fi);
-                       fclose(fo);
-                       return FALSE;
+                       unlink(randname);
+                       goto end;
                        }
                }
 
-       fclose(fi);
-       fclose(fo);
+       fclose(fi); fi = NULL;
+       fclose(fo); fo = NULL;
 
-       copy_file_attributes(s, t, TRUE, TRUE);
+       if (rename(randname, tl) < 0) {
+               unlink(randname);
+               goto end;
+       }
 
-       return TRUE;
+       ret = copy_file_attributes(s, t, TRUE, TRUE);
+
+end:
+       if (fi) fclose(fi);
+       if (fo) fclose(fo);
+       if (sl) g_free(sl);
+       if (tl) g_free(tl);
+       if (randname) g_free(randname);
+       return ret;
 }
 
 gboolean move_file(const gchar *s, const gchar *t)