The robust_rename() function now takes a "partialptr" arg that, if

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index a574315..d37ab61 100644 (file)
--- a/util.c
+++ b/util.c
@@ -260,7 +260,7 @@ static int safe_read(int desc, char *ptr, size_t len)
  *
  * This is used in conjunction with the --temp-dir, --backup, and
  * --copy-dest options. */
-int copy_file(char *source, char *dest, mode_t mode)
+int copy_file(const char *source, const char *dest, mode_t mode)
 {
        int ifd;
        int ofd;
@@ -329,7 +329,7 @@ int copy_file(char *source, char *dest, mode_t mode)
  * --delete trying to remove old .rsyncNNN files, hence it renames it
  * each time.
  **/
-int robust_unlink(char *fname)
+int robust_unlink(const char *fname)
 {
 #ifndef ETXTBSY
        return do_unlink(fname);
@@ -377,8 +377,11 @@ int robust_unlink(char *fname)
 }
 
 /* Returns 0 on successful rename, 1 if we successfully copied the file
- * across filesystems, -2 if copy_file() failed, and -1 on other errors. */
-int robust_rename(char *from, char *to, int mode)
+ * across filesystems, -2 if copy_file() failed, and -1 on other errors.
+ * If partialptr is not NULL and we need to do a copy, copy the file into
+ * the active partial-dir instead of over the destination file. */
+int robust_rename(char *from, char *to, char *partialptr,
+                 int mode)
 {
        int tries = 4;
 
@@ -394,6 +397,11 @@ int robust_rename(char *from, char *to, int mode)
                        break;
 #endif
                case EXDEV:
+                       if (partialptr) {
+                               if (!handle_partial_dir(partialptr,PDIR_CREATE))
+                                       return -1;
+                               to = partialptr;
+                       }
                        if (copy_file(from, to, mode) != 0)
                                return -2;
                        do_unlink(from);
@@ -1001,22 +1009,6 @@ int handle_partial_dir(const char *fname, int create)
        return 1;
 }
 
-/** We need to supply our own strcmp function for file list comparisons
-   to ensure that signed/unsigned usage is consistent between machines. */
-int u_strcmp(const char *cs1, const char *cs2)
-{
-       const uchar *s1 = (const uchar *)cs1;
-       const uchar *s2 = (const uchar *)cs2;
-
-       while (*s1 && *s2 && (*s1 == *s2)) {
-               s1++; s2++;
-       }
-
-       return (int)*s1 - (int)*s2;
-}
-
-
-
 /**
  * Determine if a symlink points outside the current directory tree.
  * This is considered "unsafe" because e.g. when mirroring somebody