Split up the ifuncs.h file into 3 .h files.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 0b3dc38..7569981 100644 (file)
--- a/util.c
+++ b/util.c
@@ -22,12 +22,13 @@
 
 #include "rsync.h"
 #include "ifuncs.h"
+#include "itypes.h"
+#include "inums.h"
 
 extern int dry_run;
 extern int module_id;
 extern int modify_window;
 extern int relative_paths;
-extern int human_readable;
 extern int preserve_xattrs;
 extern char *module_dir;
 extern unsigned int module_dirlen;
@@ -436,7 +437,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 +1112,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,64 +1193,6 @@ int unsafe_symlink(const char *dest, const char *src)
        return (depth < 0);
 }
 
-/* Return the int64 number as a string.  If the --human-readable option was
- * specified, we may output the number in K, M, or G units.  We can return
- * up to 4 buffers at a time. */
-char *human_num(int64 num)
-{
-       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_readable) {
-               char units = '\0';
-               int mult = human_readable == 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 human_num() to return our result. */
-char *human_dnum(double dnum, int decimal_digits)
-{
-       char *buf = human_num(dnum);
-       int len = strlen(buf);
-       if (isDigit(buf + len - 1)) {
-               /* There's extra room in buf prior to the start of the num. */
-               buf -= decimal_digits + 1;
-               snprintf(buf, len + decimal_digits + 2, "%.*f", decimal_digits, dnum);
-       }
-       return buf;
-}
-
 /* Return the date and time as a string.  Some callers tweak returned buf. */
 char *timestring(time_t t)
 {
@@ -1583,8 +1530,8 @@ void *expand_item_list(item_list *lp, size_t item_size,
                /* Using _realloc_array() lets us pass the size, not a type. */
                new_ptr = _realloc_array(lp->items, item_size, new_size);
                if (DEBUG_GTE(FLIST, 3)) {
-                       rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
-                               who_am_i(), desc, (double)new_size * item_size,
+                       rprintf(FINFO, "[%s] expand %s to %s bytes, did%s move\n",
+                               who_am_i(), desc, big_num(new_size * item_size),
                                new_ptr == lp->items ? " not" : "");
                }
                if (!new_ptr)