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;
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)
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 = '/';
return (depth < 0);
}
-/* 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. */
-char *human_dnum(double dnum, int decimal_digits)
-{
- char *buf = big_num(dnum, human_readable);
- 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)
{
new_ptr = _realloc_array(lp->items, item_size, new_size);
if (DEBUG_GTE(FLIST, 3)) {
rprintf(FINFO, "[%s] expand %s to %s bytes, did%s move\n",
- who_am_i(), desc, big_num(new_size * item_size, 0),
+ who_am_i(), desc, big_num(new_size * item_size),
new_ptr == lp->items ? " not" : "");
}
if (!new_ptr)