Refer to the symlink's contents as "symlink data", not "symlink name".

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index c698174..4b6c11f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -436,7 +436,7 @@ int robust_rename(const char *from, const char *to, const char *partialptr,
                case EXDEV:
                        if (partialptr) {
                                if (!handle_partial_dir(partialptr,PDIR_CREATE))
-                                       return -1;
+                                       return -2;
                                to = partialptr;
                        }
                        if (copy_file(from, to, -1, mode, 0) != 0)
@@ -1111,12 +1111,16 @@ int handle_partial_dir(const char *fname, int create)
                STRUCT_STAT st;
                int statret = do_lstat(dir, &st);
                if (statret == 0 && !S_ISDIR(st.st_mode)) {
-                       if (do_unlink(dir) < 0)
+                       if (do_unlink(dir) < 0) {
+                               *fn = '/';
                                return 0;
+                       }
                        statret = -1;
                }
-               if (statret < 0 && do_mkdir(dir, 0700) < 0)
+               if (statret < 0 && do_mkdir(dir, 0700) < 0) {
+                       *fn = '/';
                        return 0;
+               }
        } else
                do_rmdir(dir);
        *fn = '/';
@@ -1188,49 +1192,6 @@ int unsafe_symlink(const char *dest, const char *src)
        return (depth < 0);
 }
 
-/* Return the int64 number as a string.  If the human_flag arg is non-zero,
- * we may output the number in K, M, or G units.  We can return up to 4
- * buffers at a time. */
-char *big_num(int64 num, int human_flag)
-{
-       static char bufs[4][128]; /* more than enough room */
-       static unsigned int n;
-       char *s;
-
-       n = (n + 1) % (sizeof bufs / sizeof bufs[0]);
-
-       if (human_flag) {
-               char units = '\0';
-               int mult = human_flag == 1 ? 1000 : 1024;
-               double dnum = 0;
-               if (num > mult*mult*mult) {
-                       dnum = (double)num / (mult*mult*mult);
-                       units = 'G';
-               } else if (num > mult*mult) {
-                       dnum = (double)num / (mult*mult);
-                       units = 'M';
-               } else if (num > mult) {
-                       dnum = (double)num / mult;
-                       units = 'K';
-               }
-               if (units) {
-                       snprintf(bufs[n], sizeof bufs[0], "%.2f%c", dnum, units);
-                       return bufs[n];
-               }
-       }
-
-       s = bufs[n] + sizeof bufs[0] - 1;
-       *s = '\0';
-
-       if (!num)
-               *--s = '0';
-       while (num) {
-               *--s = (char)(num % 10) + '0';
-               num /= 10;
-       }
-       return s;
-}
-
 /* Return the double number as a string.  If the --human-readable option was
  * specified, we may output the number in K, M, or G units.  We use a buffer
  * from big_num() to return our result. */