X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/79daa5961899c1110b862b0d3b85276122503c69..abd32c9585158286d5b1800e5476477da18c48dc:/generator.c diff --git a/generator.c b/generator.c index 5c3653f3..06279565 100644 --- a/generator.c +++ b/generator.c @@ -4,7 +4,7 @@ * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2002 Martin Pool - * Copyright (C) 2003-2008 Wayne Davison + * Copyright (C) 2003-2009 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,8 @@ */ #include "rsync.h" +#include "inums.h" +#include "ifuncs.h" extern int dry_run; extern int do_xfers; @@ -53,6 +55,7 @@ extern int ignore_errors; extern int remove_source_files; extern int delay_updates; extern int update_only; +extern int human_readable; extern int ignore_existing; extern int ignore_non_existing; extern int inplace; @@ -86,24 +89,18 @@ extern int unsort_ndx; extern int max_delete; extern int force_delete; extern int one_file_system; -extern int check_for_io_err; +extern int skipped_deletes; extern struct stats stats; extern dev_t filesystem_dev; extern mode_t orig_umask; extern uid_t our_uid; -extern char *backup_dir; -extern char *backup_suffix; -extern int backup_suffix_len; extern char *basis_dir[MAX_BASIS_DIRS+1]; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct daemon_filter_list; -int ignore_perishable = 0; -int non_perishable_cnt = 0; int maybe_ATTRS_REPORT = 0; static dev_t dev_zero; -static int deletion_count = 0; /* used to implement --max-delete */ static int deldelay_size = 0, deldelay_cnt = 0; static char *deldelay_buf = NULL; static int deldelay_fd = -1; @@ -114,209 +111,16 @@ static int need_retouch_dir_times; static int need_retouch_dir_perms; static const char *solo_file = NULL; -/* For calling delete_item() and delete_dir_contents(). */ -#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */ -#define DEL_RECURSE (1<<1) /* if dir, delete all contents */ -#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ -#define DEL_FOR_FILE (1<<3) /* making room for a replacement file */ -#define DEL_FOR_DIR (1<<4) /* making room for a replacement dir */ -#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */ -#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */ -#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */ - -#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL) - enum nonregtype { TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK }; -enum delret { - DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY -}; - /* Forward declarations. */ -static enum delret delete_dir_contents(char *fname, uint16 flags); #ifdef SUPPORT_HARD_LINKS static void handle_skipped_hlink(struct file_struct *file, int itemizing, enum logcode code, int f_out); #endif -static int is_backup_file(char *fn) -{ - int k = strlen(fn) - backup_suffix_len; - return k > 0 && strcmp(fn+k, backup_suffix) == 0; -} - -/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will - * delete recursively. - * - * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's - * a directory! (The buffer is used for recursion, but returned unchanged.) - */ -static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) -{ - enum delret ret; - char *what; - int ok; - - if (DEBUG_GTE(DEL, 2)) { - rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", - fbuf, (int)mode, (int)flags); - } - - if (flags & DEL_NO_UID_WRITE) - do_chmod(fbuf, mode | S_IWUSR); - - if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { - int save_uid_ndx = uid_ndx; - /* This only happens on the first call to delete_item() since - * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */ - if (!uid_ndx) - uid_ndx = ++file_extra_cnt; - ignore_perishable = 1; - /* If DEL_RECURSE is not set, this just reports emptiness. */ - ret = delete_dir_contents(fbuf, flags); - ignore_perishable = 0; - if (!save_uid_ndx) { - --file_extra_cnt; - uid_ndx = 0; - } - if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT) - goto check_ret; - /* OK: try to delete the directory. */ - } - - if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete) - return DR_AT_LIMIT; - - if (S_ISDIR(mode)) { - what = "rmdir"; - ok = do_rmdir(fbuf) == 0; - } else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) { - what = "make_backup"; - ok = make_backup(fbuf); - } else { - what = "unlink"; - ok = robust_unlink(fbuf) == 0; - } - - if (ok) { - if (!(flags & DEL_MAKE_ROOM)) - log_delete(fbuf, mode); - ret = DR_SUCCESS; - } else { - if (S_ISDIR(mode) && errno == ENOTEMPTY) { - rprintf(FINFO, "cannot delete non-empty directory: %s\n", - fbuf); - ret = DR_NOT_EMPTY; - } else if (errno != ENOENT) { - rsyserr(FERROR, errno, "delete_file: %s(%s) failed", - what, fbuf); - ret = DR_FAILURE; - } else { - deletion_count--; - ret = DR_SUCCESS; - } - } - - check_ret: - if (ret != DR_SUCCESS && flags & DEL_MAKE_ROOM) { - const char *desc; - switch (flags & DEL_MAKE_ROOM) { - case DEL_FOR_FILE: desc = "regular file"; break; - case DEL_FOR_DIR: desc = "directory"; break; - case DEL_FOR_SYMLINK: desc = "symlink"; break; - case DEL_FOR_DEVICE: desc = "device file"; break; - case DEL_FOR_SPECIAL: desc = "special file"; break; - default: exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE */ - } - rprintf(FERROR_XFER, "could not make way for new %s: %s\n", - desc, fbuf); - } - return ret; -} - -/* The directory is about to be deleted: if DEL_RECURSE is given, delete all - * its contents, otherwise just checks for content. Returns DR_SUCCESS or - * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The - * buffer is used for recursion, but returned unchanged.) - */ -static enum delret delete_dir_contents(char *fname, uint16 flags) -{ - struct file_list *dirlist; - enum delret ret; - unsigned remainder; - void *save_filters; - int j, dlen; - char *p; - - if (DEBUG_GTE(DEL, 3)) { - rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n", - fname, flags); - } - - dlen = strlen(fname); - save_filters = push_local_filters(fname, dlen); - - non_perishable_cnt = 0; - dirlist = get_dirlist(fname, dlen, 0); - ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; - - if (!dirlist->used) - goto done; - - if (!(flags & DEL_RECURSE)) { - ret = DR_NOT_EMPTY; - goto done; - } - - p = fname + dlen; - if (dlen != 1 || *fname != '/') - *p++ = '/'; - remainder = MAXPATHLEN - (p - fname); - - /* We do our own recursion, so make delete_item() non-recursive. */ - flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM|DEL_NO_UID_WRITE)) - | DEL_DIR_IS_EMPTY; - - for (j = dirlist->used; j--; ) { - struct file_struct *fp = dirlist->files[j]; - - if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) { - if (DEBUG_GTE(DEL, 1)) { - rprintf(FINFO, - "mount point, %s, pins parent directory\n", - f_name(fp, NULL)); - } - ret = DR_NOT_EMPTY; - continue; - } - - strlcpy(p, fp->basename, remainder); - if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) - do_chmod(fname, fp->mode | S_IWUSR); - /* Save stack by recursing to ourself directly. */ - if (S_ISDIR(fp->mode)) { - if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) - ret = DR_NOT_EMPTY; - } - if (delete_item(fname, fp->mode, flags) != DR_SUCCESS) - ret = DR_NOT_EMPTY; - } - - fname[dlen] = '\0'; - - done: - flist_free(dirlist); - pop_local_filters(save_filters); - - if (ret == DR_NOT_EMPTY) { - rprintf(FINFO, "cannot delete non-empty directory: %s\n", - fname); - } - return ret; -} - static int start_delete_delay_temp(void) { char fnametmp[MAXPATHLEN]; @@ -520,7 +324,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) f_name(fp, NULL)); continue; } - if (flist_find(cur_flist, fp) < 0) { + /* Here we want to match regardless of file type. Replacement + * of a file with one of another type is handled separately by + * a delete_item call with a DEL_MAKE_ROOM flag. */ + if (flist_find_ignore_dirness(cur_flist, fp) < 0) { int flags = DEL_RECURSE; if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) flags |= DEL_NO_UID_WRITE; @@ -807,8 +614,8 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) if (sum->count && DEBUG_GTE(DELTASUM, 2)) { rprintf(FINFO, "count=%s rem=%ld blength=%ld s2length=%d flength=%s\n", - big_num(sum->count, 0), (long)sum->remainder, (long)sum->blength, - sum->s2length, big_num(sum->flength, 0)); + big_num(sum->count), (long)sum->remainder, (long)sum->blength, + sum->s2length, big_num(sum->flength)); } } @@ -859,7 +666,7 @@ static int generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) if (DEBUG_GTE(DELTASUM, 3)) { rprintf(FINFO, "chunk[%s] offset=%s len=%ld sum1=%08lx\n", - big_num(i, 0), big_num(offset - n1, 0), (long)n1, + big_num(i), big_num(offset - n1), (long)n1, (unsigned long)sum1); } write_int(f_out, sum1); @@ -1200,6 +1007,7 @@ static void list_file_entry(struct file_struct *f) { char permbuf[PERMSTRING_SIZE]; int64 len; + int colwidth = human_readable ? 14 : 11; if (!F_IS_ACTIVE(f)) { /* this can happen if duplicate names were removed */ @@ -1213,15 +1021,16 @@ static void list_file_entry(struct file_struct *f) #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { - rprintf(FINFO, "%s %11s %s %s -> %s\n", - permbuf, big_num(len, 0), timestring(f->modtime), - f_name(f, NULL), F_SYMLINK(f)); + rprintf(FINFO, "%s %*s %s %s -> %s\n", + permbuf, colwidth, comma_num(len), + timestring(f->modtime), f_name(f, NULL), + F_SYMLINK(f)); } else #endif { - rprintf(FINFO, "%s %11s %s %s\n", - permbuf, big_num(len, 0), timestring(f->modtime), - f_name(f, NULL)); + rprintf(FINFO, "%s %*s %s %s\n", + permbuf, colwidth, comma_num(len), + timestring(f->modtime), f_name(f, NULL)); } } @@ -1313,12 +1122,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } } -#ifdef SUPPORT_ACLS - sx.acc_acl = sx.def_acl = NULL; -#endif -#ifdef SUPPORT_XATTRS - sx.xattr = NULL; -#endif + init_stat_x(&sx); if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) { parent_is_dry_missing: if (fuzzy_dirlist) { @@ -1906,7 +1710,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (DEBUG_GTE(DELTASUM, 3)) { rprintf(FINFO, "gen mapped %s of size %s\n", - fnamecmp, big_num(sx.st.st_size, 0)); + fnamecmp, big_num(sx.st.st_size)); } if (DEBUG_GTE(DELTASUM, 2)) @@ -2236,10 +2040,6 @@ void generate_files(int f_out, const char *local_name) dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); } else dirdev = MAKEDEV(0, 0); - /* We must be sure we've had a chance to receive an I/O - * error for this directory before we delete in it. */ - while (check_for_io_err && !cur_flist->next && !flist_eof) - wait_for_receiver(); delete_in_dir(fbuf, fp, &dirdev); } else change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp)); @@ -2286,6 +2086,9 @@ void generate_files(int f_out, const char *local_name) } } while ((cur_flist = cur_flist->next) != NULL); + if (read_batch && inc_recurse) + write_ndx(f_out, NDX_DONE); + if (delete_during) delete_in_dir(NULL, NULL, &dev_zero); phase++; @@ -2304,6 +2107,8 @@ void generate_files(int f_out, const char *local_name) rprintf(FINFO, "generate_files phase=%d\n", phase); write_ndx(f_out, NDX_DONE); + write_del_stats(f_out); + /* Reduce round-trip lag-time for a useless delay-updates phase. */ if (protocol_version >= 29 && !delay_updates) write_ndx(f_out, NDX_DONE); @@ -2339,10 +2144,10 @@ void generate_files(int f_out, const char *local_name) && dir_tweaking && (!inc_recurse || delete_during == 2)) touch_up_dirs(dir_flist, -1); - if (max_delete >= 0 && deletion_count > max_delete) { + if (max_delete >= 0 && skipped_deletes) { rprintf(FWARNING, "Deletions stopped due to --max-delete limit (%d skipped)\n", - deletion_count - max_delete); + skipped_deletes); io_error |= IOERR_DEL_LIMIT; }