X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/273a7ed59f03b1f50348cca57cfc6877f8634900..82ad07c4182f744c07b96a15df4572e559ed7dc8:/generator.c diff --git a/generator.c b/generator.c index f131c1a3..536302f1 100644 --- a/generator.c +++ b/generator.c @@ -1,58 +1,61 @@ -/* -*- c-file-style: "linux" -*- - - rsync -- fast file replication program - - Copyright (C) 1996-2000 by Andrew Tridgell - Copyright (C) Paul Mackerras 1996 - Copyright (C) 2002 by Martin Pool - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* + * Routines that are exclusive to the generator process. + * + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2003, 2004, 2005, 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" extern int verbose; extern int dry_run; extern int do_xfers; -extern int log_format_has_i; -extern int log_format_has_o_or_i; -extern int daemon_log_format_has_i; +extern int stdout_format_has_i; +extern int logfile_format_has_i; extern int am_root; extern int am_server; extern int am_daemon; extern int do_progress; -extern int recurse; extern int relative_paths; +extern int implied_dirs; extern int keep_dirlinks; extern int preserve_links; extern int preserve_devices; +extern int preserve_specials; extern int preserve_hard_links; extern int preserve_perms; extern int preserve_uid; extern int preserve_gid; extern int preserve_times; extern int omit_dir_times; +extern int delete_mode; extern int delete_before; extern int delete_during; extern int delete_after; extern int module_id; extern int ignore_errors; -extern int remove_sent_files; +extern int flist_extra_ndx; +extern int remove_source_files; extern int delay_updates; extern int update_only; -extern int opt_ignore_existing; +extern int ignore_existing; +extern int ignore_non_existing; extern int inplace; extern int append_mode; extern int make_backups; @@ -60,6 +63,7 @@ extern int csum_length; extern int ignore_times; extern int size_only; extern OFF_T max_size; +extern OFF_T min_size; extern int io_error; extern int allowed_lull; extern int sock_f_out; @@ -67,6 +71,7 @@ extern int ignore_timeout; extern int protocol_version; extern int fuzzy_basis; extern int always_checksum; +extern int checksum_len; extern char *partial_dir; extern char *basis_dir[]; extern int compare_dest; @@ -74,14 +79,14 @@ extern int copy_dest; extern int link_dest; extern int whole_file; extern int list_only; +extern int new_root_dir; extern int read_batch; -extern int only_existing; -extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ extern int max_delete; extern int force_delete; extern int one_file_system; +extern int file_struct_len; extern struct stats stats; extern dev_t filesystem_dev; extern char *backup_dir; @@ -90,7 +95,26 @@ extern int backup_suffix_len; extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; +int ignore_perishable = 0; +int non_perishable_cnt = 0; + static int deletion_count = 0; /* used to implement --max-delete */ +static FILE *delete_delay_fp = NULL; + +/* For calling delete_item() and delete_dir_contents(). */ +#define DEL_RECURSE (1<<1) /* recurse */ +#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ + +enum nonregtype { + TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK +}; + +enum delret { + DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY +}; + +/* Forward declaration for delete_item(). */ +static enum delret delete_dir_contents(char *fname, int flags); static int is_backup_file(char *fn) @@ -99,98 +123,213 @@ static int is_backup_file(char *fn) return k > 0 && strcmp(fn+k, backup_suffix) == 0; } - -/* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if - * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE - * is not set in the flags. */ -static int delete_item(char *fname, int mode, int flags) +/* 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, int mode, char *replace, int flags) { - struct file_list *dirlist; - char buf[MAXPATHLEN]; - int j, dlen, zap_dir, ok; - void *save_filters; + enum delret ret; + char *what; + int ok; - if (!S_ISDIR(mode)) { - if (max_delete && ++deletion_count > max_delete) - return 0; - if (make_backups && (backup_dir || !is_backup_file(fname))) - ok = make_backup(fname); - else - ok = robust_unlink(fname) == 0; - if (ok) { - if (!(flags & DEL_TERSE)) - log_delete(fname, mode); - return 0; - } - if (errno == ENOENT) { + if (verbose > 2) { + rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", + fbuf, mode, flags); + } + + if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { + ignore_perishable = 1; + /* If DEL_RECURSE is not set, this just reports emptiness. */ + ret = delete_dir_contents(fbuf, flags); + ignore_perishable = 0; + if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT) + goto check_ret; + /* OK: try to delete the directory. */ + } + + if (!replace && 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 && (backup_dir || !is_backup_file(fbuf))) { + what = "make_backup"; + ok = make_backup(fbuf); + } else { + what = "unlink"; + ok = robust_unlink(fbuf) == 0; + } + + if (ok) { + if (!replace) + 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--; - return 0; + ret = DR_SUCCESS; } - rsyserr(FERROR, errno, "delete_file: unlink %s failed", - full_fname(fname)); - return -1; } - zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse)) - && !(flags & DEL_NO_RECURSE); - if ((max_delete && ++deletion_count > max_delete) - || (dry_run && zap_dir)) { - ok = 0; - errno = ENOTEMPTY; - } else if (make_backups && !backup_dir && !is_backup_file(fname) - && !(flags & DEL_FORCE_RECURSE)) - ok = make_backup(fname); - else - ok = do_rmdir(fname) == 0; - if (ok) { - if (!(flags & DEL_TERSE)) - log_delete(fname, mode); - return 0; + check_ret: + if (replace && ret != DR_SUCCESS) { + rprintf(FERROR, "could not make way for new %s: %s\n", + replace, fbuf); } - if (errno == ENOENT) { - deletion_count--; - return 0; + 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, int flags) +{ + struct file_list *dirlist; + enum delret ret; + unsigned remainder; + void *save_filters; + int j, dlen; + char *p; + + if (verbose > 3) { + rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n", + fname, flags); } - if (!zap_dir) { - rsyserr(FERROR, errno, "delete_file: rmdir %s failed", - full_fname(fname)); - return -1; + + 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->count) + goto done; + + if (!(flags & DEL_RECURSE)) { + ret = DR_NOT_EMPTY; + goto done; } - flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */ - deletion_count--; - dlen = strlcpy(buf, fname, MAXPATHLEN); - save_filters = push_local_filters(buf, dlen); + 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_DIR_IS_EMPTY; - dirlist = get_dirlist(buf, dlen, 0); for (j = dirlist->count; j--; ) { struct file_struct *fp = dirlist->files[j]; - if (fp->flags & FLAG_MOUNT_POINT) + if (fp->flags & FLAG_MOUNT_DIR) { + if (verbose > 1) { + rprintf(FINFO, + "mount point, %s, pins parent directory\n", + f_name(fp, NULL)); + } + ret = DR_NOT_EMPTY; continue; + } - f_name_to(fp, buf); - delete_item(buf, fp->mode, flags & ~DEL_TERSE); + strlcpy(p, fp->basename, remainder); + /* Save stack by recursing to ourself directly. */ + if (S_ISDIR(fp->mode) + && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) + ret = DR_NOT_EMPTY; + if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) + ret = DR_NOT_EMPTY; } - flist_free(dirlist); + fname[dlen] = '\0'; + + done: + flist_free(dirlist); pop_local_filters(save_filters); - if (max_delete && ++deletion_count > max_delete) - return 0; + if (ret == DR_NOT_EMPTY) { + rprintf(FINFO, "cannot delete non-empty directory: %s\n", + fname); + } + return ret; +} - if (do_rmdir(fname) == 0) { - if (!(flags & DEL_TERSE)) - log_delete(fname, mode); - } else if (errno != ENOTEMPTY && errno != EEXIST && errno != ENOENT) { - rsyserr(FERROR, errno, "delete_file: rmdir %s failed", - full_fname(fname)); +static void start_delete_temp(void) +{ + char fnametmp[MAXPATHLEN]; + int fd, save_dry_run = dry_run; + + dry_run = 0; + if (!get_tmpname(fnametmp, "deldelay") + || (fd = do_mkstemp(fnametmp, 0600)) < 0 + || !(delete_delay_fp = fdopen(fd, "w+"))) { + rprintf(FERROR, "Unable to create delete-delay temp file.\n"); + exit_cleanup(RERR_FILEIO); + } + dry_run = save_dry_run; + unlink(fnametmp); +} + +static int read_delay_line(FILE *fp, char *buf, int bsize) +{ + int ch, mode = 0; + + if ((ch = fgetc(fp)) == EOF) return -1; + + while (1) { + if (ch == ' ') + break; + if (ch > '7' || ch < '0') { + rprintf(FERROR, "invalid data in delete-delay file.\n"); + exit_cleanup(RERR_FILEIO); + } + mode = mode*8 + ch - '0'; + if ((ch = fgetc(fp)) == EOF) { + unexpected_eof: + rprintf(FERROR, "unexpected EOF in delete-delay file.\n"); + exit_cleanup(RERR_FILEIO); + } + } + + while (1) { + if ((ch = fgetc(fp)) == EOF) + goto unexpected_eof; + if (bsize-- <= 0) { + rprintf(FERROR, "filename too long in delete-delay file.\n"); + exit_cleanup(RERR_FILEIO); + } + *buf++ = (char)ch; + if (ch == '\0') + break; } - return 0; + return mode; } +static void delayed_deletions(char *delbuf) +{ + int mode; + + fseek(delete_delay_fp, 0, 0); + while ((mode = read_delay_line(delete_delay_fp, delbuf, MAXPATHLEN)) >= 0) + delete_item(delbuf, mode, NULL, DEL_RECURSE); + fclose(delete_delay_fp); +} /* This function is used to implement per-directory deletion, and is used by * all the --delete-WHEN options. Note that the fbuf pointer must point to a @@ -198,14 +337,13 @@ static int delete_item(char *fname, int mode, int flags) * call will append names onto the end, but the old dir value will be restored * on exit). */ static void delete_in_dir(struct file_list *flist, char *fbuf, - struct file_struct *file) + struct file_struct *file, STRUCT_STAT *stp) { static int min_depth = MAXPATHLEN, cur_depth = -1; static void *filt_array[MAXPATHLEN/2+1]; static int already_warned = 0; struct file_list *dirlist; char delbuf[MAXPATHLEN]; - STRUCT_STAT st; int dlen, i; if (!flist) { @@ -217,7 +355,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, } if (verbose > 2) - rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf)); + rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); if (allowed_lull) maybe_send_keepalive(); @@ -242,13 +380,10 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, dlen = strlen(fbuf); filt_array[cur_depth] = push_local_filters(fbuf, dlen); - if (link_stat(fbuf, &st, keep_dirlinks) < 0) - return; - if (one_file_system) { if (file->flags & FLAG_TOP_DIR) - filesystem_dev = st.st_dev; - else if (filesystem_dev != st.st_dev) + filesystem_dev = stp->st_dev; + else if (filesystem_dev != stp->st_dev) return; } @@ -258,12 +393,20 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, * from the filesystem. */ for (i = dirlist->count; i--; ) { struct file_struct *fp = dirlist->files[i]; - if (!fp->basename || fp->flags & FLAG_MOUNT_POINT) + if (!fp->basename) + continue; + if (fp->flags & FLAG_MOUNT_DIR) { + if (verbose > 1) + rprintf(FINFO, "cannot delete mount point: %s\n", + f_name(fp, NULL)); continue; + } if (flist_find(flist, fp) < 0) { - int mode = fp->mode; - f_name_to(fp, delbuf); - delete_item(delbuf, mode, DEL_FORCE_RECURSE); + f_name(fp, delbuf); + if (delete_delay_fp) + fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0'); + else + delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); } } @@ -275,74 +418,78 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, static void do_delete_pass(struct file_list *flist) { char fbuf[MAXPATHLEN]; + STRUCT_STAT st; int j; - if (dry_run > 1 /* destination doesn't exist yet */ - || list_only) + /* dry_run is incremented when the destination doesn't exist yet. */ + if (dry_run > 1 || list_only) return; for (j = 0; j < flist->count; j++) { struct file_struct *file = flist->files[j]; - if (!(file->flags & FLAG_DEL_HERE)) + if (!(file->flags & FLAG_XFER_DIR)) continue; - f_name_to(file, fbuf); + f_name(file, fbuf); if (verbose > 1 && file->flags & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); + rprintf(FINFO, "deleting in %s\n", fbuf); + + if (link_stat(fbuf, &st, keep_dirlinks) < 0 + || !S_ISDIR(st.st_mode)) + continue; - delete_in_dir(flist, fbuf, file); + delete_in_dir(flist, fbuf, file, &st); } + delete_in_dir(NULL, NULL, NULL, NULL); + if (do_progress && !am_server) rprintf(FINFO, " \r"); } -static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) +int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) { if (preserve_perms && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) return 0; - if (am_root && preserve_uid && st->st_uid != file->uid) + if (am_root && preserve_uid && st->st_uid != F_UID(file)) return 0; - if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid) + if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file)) return 0; return 1; } - void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, - int32 iflags, uchar fnamecmp_type, char *xname) + int32 iflags, uchar fnamecmp_type, const char *xname) { - if (statret == 0) { + if (statret >= 0) { /* A from-dest-dir statret can == 1! */ + int keep_time = !preserve_times ? 0 + : S_ISDIR(file->mode) ? !omit_dir_times + : !S_ISLNK(file->mode); + if (S_ISREG(file->mode) && file->length != st->st_size) iflags |= ITEM_REPORT_SIZE; - if (!(iflags & ITEM_NO_DEST_AND_NO_UPDATE)) { - int keep_time = !preserve_times ? 0 - : S_ISDIR(file->mode) ? !omit_dir_times - : !S_ISLNK(file->mode); - - if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time - && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) - iflags |= ITEM_REPORT_TIME; - if (preserve_perms - && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) - iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && file->uid != st->st_uid) - iflags |= ITEM_REPORT_OWNER; - if (preserve_gid && file->gid != GID_NONE - && st->st_gid != file->gid) - iflags |= ITEM_REPORT_GROUP; - } + if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time + && !(iflags & ITEM_MATCHED) + && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) + || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) + iflags |= ITEM_REPORT_TIME; + if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) + iflags |= ITEM_REPORT_PERMS; + if (preserve_uid && am_root && F_UID(file) != st->st_uid) + iflags |= ITEM_REPORT_OWNER; + if (preserve_gid && F_GID(file) != GID_NONE + && st->st_gid != F_GID(file)) + iflags |= ITEM_REPORT_GROUP; } else iflags |= ITEM_IS_NEW; iflags &= 0xffff; if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1 - || (xname && *xname)) && !read_batch) { + || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) { if (protocol_version >= 29) { if (ndx >= 0) write_int(sock_f_out, ndx); @@ -351,14 +498,16 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, write_byte(sock_f_out, fnamecmp_type); if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(sock_f_out, xname, strlen(xname)); - } else if (ndx >= 0) - log_item(file, &stats, iflags, xname); + } else if (ndx >= 0) { + enum logcode code = logfile_format_has_i ? FINFO : FCLIENT; + log_item(code, file, &stats, iflags, xname); + } } } /* Perform our quick-check heuristic for determining if a file is unchanged. */ -static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) +int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { if (st->st_size != file->length) return 0; @@ -368,8 +517,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) if (always_checksum && S_ISREG(st->st_mode)) { char sum[MD4_SUM_LENGTH]; file_checksum(fn, sum, st->st_size); - return memcmp(sum, file->u.sum, protocol_version < 21 ? 2 - : MD4_SUM_LENGTH) == 0; + return memcmp(sum, F_SUM(file), checksum_len) == 0; } if (size_only) @@ -378,7 +526,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) if (ignore_times) return 0; - return cmp_modtime(st->st_mtime, file->modtime) == 0; + return cmp_time(st->st_mtime, file->modtime) == 0; } @@ -436,7 +584,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) int64 l; int b = BLOCKSUM_BIAS; for (l = len; l >>= 1; b += 2) {} - for (c = blength; c >>= 1 && b; b--) {} + for (c = blength; (c >>= 1) && b; b--) {} /* add a bit, subtract rollsum, round up. */ s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */ s2length = MAX(s2length, csum_length); @@ -446,8 +594,8 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) sum->flength = len; sum->blength = blength; sum->s2length = s2length; - sum->count = (len + (blength - 1)) / blength; - sum->remainder = (len % blength); + sum->remainder = (int32)(len % blength); + sum->count = (int32)(len / blength) + (sum->remainder != 0); if (sum->count && verbose > 2) { rprintf(FINFO, @@ -531,14 +679,13 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) int len, suf_len; uint32 dist; - if (!S_ISREG(fp->mode) || !fp->length - || fp->flags & FLAG_NO_FUZZY) + if (!S_ISREG(fp->mode) || !fp->length || fp->flags & FLAG_SENT) continue; name = fp->basename; if (fp->length == file->length - && cmp_modtime(fp->modtime, file->modtime) == 0) { + && cmp_time(fp->modtime, file->modtime) == 0) { if (verbose > 4) { rprintf(FINFO, "fuzzy size/modtime match for %s\n", @@ -577,11 +724,246 @@ void check_for_finished_hlinks(int itemizing, enum logcode code) continue; file = the_file_list->files[ndx]; - if (!file->link_u.links) + if (!IS_HLINKED(file)) + continue; + + hard_link_cluster(file, ndx, itemizing, code, -1); + } +} + +/* This is only called for regular files. We return -2 if we've finished + * handling the file, -1 if no dest-linking occurred, or a non-negative + * value if we found an alternate basis file. */ +static int try_dests_reg(struct file_struct *file, char *fname, int ndx, + char *cmpbuf, STRUCT_STAT *stp, int itemizing, + int maybe_ATTRS_REPORT, enum logcode code) +{ + int best_match = -1; + int match_level = 0; + int j = 0; + + do { + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode)) continue; + switch (match_level) { + case 0: + best_match = j; + match_level = 1; + /* FALL THROUGH */ + case 1: + if (!unchanged_file(cmpbuf, file, stp)) + continue; + best_match = j; + match_level = 2; + /* FALL THROUGH */ + case 2: + if (!unchanged_attrs(file, stp)) + continue; + if (always_checksum && preserve_times + && cmp_time(stp->st_mtime, file->modtime)) + continue; + best_match = j; + match_level = 3; + break; + } + break; + } while (basis_dir[++j] != NULL); - hard_link_cluster(file, ndx, itemizing, code); + if (!match_level) + return -1; + + if (j != best_match) { + j = best_match; + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0) + return -1; + } + + if (match_level == 3 && !copy_dest) { +#ifdef SUPPORT_HARD_LINKS + if (link_dest) { + int i = itemizing && (verbose > 1 || stdout_format_has_i > 1); + if (hard_link_one(file, ndx, fname, 0, stp, + cmpbuf, 1, i, code) < 0) + goto try_a_copy; + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, j); + } else +#endif + if (itemizing) + itemize(file, ndx, 0, stp, 0, 0, NULL); + if (verbose > 1 && maybe_ATTRS_REPORT) { + rprintf(FCLIENT, "%s is uptodate\n", fname); + } + return -2; } + + if (match_level >= 2) { + try_a_copy: /* Copy the file locally. */ + if (copy_file(cmpbuf, fname, file->mode) < 0) { + if (verbose) { + rsyserr(FINFO, errno, "copy_file %s => %s", + full_fname(cmpbuf), fname); + } + return -1; + } + if (itemizing) + itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL); + set_file_attrs(fname, file, NULL, 0); + if (maybe_ATTRS_REPORT + && ((!itemizing && verbose && match_level == 2) + || (verbose > 1 && match_level == 3))) { + code = match_level == 3 ? FCLIENT : FINFO; + rprintf(code, "%s%s\n", fname, + match_level == 3 ? " is uptodate" : ""); + } + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, j); + return -2; + } + + return FNAMECMP_BASIS_DIR_LOW + j; +} + +/* This is only called for non-regular files. We return -2 if we've finished + * handling the file, or -1 if no dest-linking occurred, or a non-negative + * value if we found an alternate basis file. */ +static int try_dests_non(struct file_struct *file, char *fname, int ndx, + char *cmpbuf, STRUCT_STAT *stp, int itemizing, + int maybe_ATTRS_REPORT, enum logcode code) +{ + char lnk[MAXPATHLEN]; + int best_match = -1; + int match_level = 0; + enum nonregtype type; + int len, j = 0; + +#ifndef SUPPORT_LINKS + if (S_ISLNK(file->mode)) + return -1; +#endif + if (S_ISDIR(file->mode)) { + type = TYPE_DIR; + } else if (IS_SPECIAL(file->mode)) + type = TYPE_SPECIAL; + else if (IS_DEVICE(file->mode)) + type = TYPE_DEVICE; +#ifdef SUPPORT_LINKS + else if (S_ISLNK(file->mode)) + type = TYPE_SYMLINK; +#endif + else { + rprintf(FERROR, + "internal: try_dests_non() called with invalid mode (%o)\n", + (int)file->mode); + exit_cleanup(RERR_UNSUPPORTED); + } + + do { + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0) + continue; + switch (type) { + case TYPE_DIR: + if (!S_ISDIR(stp->st_mode)) + continue; + break; + case TYPE_SPECIAL: + if (!IS_SPECIAL(stp->st_mode)) + continue; + break; + case TYPE_DEVICE: + if (!IS_DEVICE(stp->st_mode)) + continue; + break; +#ifdef SUPPORT_LINKS + case TYPE_SYMLINK: + if (!S_ISLNK(stp->st_mode)) + continue; + break; +#endif + } + if (match_level < 1) { + match_level = 1; + best_match = j; + } + switch (type) { + case TYPE_DIR: + break; + case TYPE_SPECIAL: + case TYPE_DEVICE: + if (stp->st_rdev != MAKEDEV(F_DMAJOR(file), F_DMINOR(file))) + continue; + break; +#ifdef SUPPORT_LINKS + case TYPE_SYMLINK: + if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0) + continue; + lnk[len] = '\0'; + if (strcmp(lnk, F_SYMLINK(file)) != 0) + continue; + break; +#endif + } + if (match_level < 2) { + match_level = 2; + best_match = j; + } + if (unchanged_attrs(file, stp)) { + match_level = 3; + best_match = j; + break; + } + } while (basis_dir[++j] != NULL); + + if (!match_level) + return -1; + + if (j != best_match) { + j = best_match; + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0) + return -1; + } + + if (match_level == 3) { +#ifdef SUPPORT_HARD_LINKS + if (link_dest +#ifndef CAN_HARDLINK_SYMLINK + && !S_ISLNK(file->mode) +#endif +#ifndef CAN_HARDLINK_SPECIAL + && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode) +#endif + && !S_ISDIR(file->mode)) { + if (do_link(cmpbuf, fname) < 0) { + rsyserr(FERROR, errno, + "failed to hard-link %s with %s", + cmpbuf, fname); + return j; + } + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); + } else +#endif + match_level = 2; + if (itemizing && stdout_format_has_i + && (verbose > 1 || stdout_format_has_i > 1)) { + int chg = compare_dest && type != TYPE_DIR ? 0 + : ITEM_LOCAL_CHANGE + + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0); + char *lp = match_level == 3 ? "" : NULL; + itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp); + } + if (verbose > 1 && maybe_ATTRS_REPORT) { + rprintf(FCLIENT, "%s%s is uptodate\n", + fname, type == TYPE_DIR ? "/" : ""); + } + return -2; + } + + return j; } static int phase = 0; @@ -592,15 +974,18 @@ static int phase = 0; * regular files that have changed, we try to find a basis file and then * start sending checksums. * + * When fname is non-null, it must point to a MAXPATHLEN buffer! + * * Note that f_out is set to -1 when doing final directory-permission and * modification-time repair. */ static void recv_generator(char *fname, struct file_struct *file, int ndx, - int itemizing, int maybe_PERMS_REPORT, + int itemizing, int maybe_ATTRS_REPORT, enum logcode code, int f_out) { static int missing_below = -1, excluded_below = -1; - static char *fuzzy_dirname = ""; + static const char *parent_dirname = ""; static struct file_list *fuzzy_dirlist = NULL; + static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; STRUCT_STAT st, real_st, partial_st; @@ -609,6 +994,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; + int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0; if (list_only) return; @@ -617,19 +1003,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - fuzzy_dirname = ""; } if (missing_below >= 0) { - dry_run--; + if (dry_run) + dry_run--; missing_below = -1; } + parent_dirname = ""; return; } - if (verbose > 2) { - rprintf(FINFO, "recv_generator(%s,%d)\n", - safe_fname(fname), ndx); - } + if (verbose > 2) + rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); if (server_filter_list.head) { if (excluded_below >= 0) { @@ -641,33 +1026,50 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, S_ISDIR(file->mode)) < 0) { if (S_ISDIR(file->mode)) excluded_below = file->dir.depth; - skipping: + skipping: if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", - safe_fname(fname)); + fname); } return; } } - if (missing_below >= 0 && file->dir.depth <= missing_below) { - dry_run--; - missing_below = -1; + if (missing_below >= 0) { + if (file->dir.depth <= missing_below) { + if (dry_run) + dry_run--; + missing_below = -1; + } else if (!dry_run) + return; } if (dry_run > 1) { statret = -1; stat_errno = ENOENT; } else { - if (fuzzy_basis && S_ISREG(file->mode)) { - char *dn = file->dirname ? file->dirname : "."; - if (fuzzy_dirname != dn - && strcmp(fuzzy_dirname, dn) != 0) { - if (fuzzy_dirlist) - flist_free(fuzzy_dirlist); - fuzzy_dirlist = get_dirlist(dn, -1, 1); + const char *dn = file->dirname ? file->dirname : "."; + if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) { + if (relative_paths && !implied_dirs + && do_stat(dn, &st) < 0 + && create_directory_path(fname) < 0) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); + } + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; } - fuzzy_dirname = dn; + if (fuzzy_basis) + need_fuzzy_dirlist = 1; + } + parent_dirname = dn; + + if (need_fuzzy_dirlist && S_ISREG(file->mode)) { + strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf); + fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1); + need_fuzzy_dirlist = 0; } statret = link_stat(fname, &st, @@ -675,23 +1077,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, stat_errno = errno; } - if (only_existing && statret == -1 && stat_errno == ENOENT) { - /* we only want to update existing files */ + if (ignore_non_existing && statret == -1 && stat_errno == ENOENT) { if (verbose > 1) { rprintf(FINFO, "not creating new %s \"%s\"\n", S_ISDIR(file->mode) ? "directory" : "file", - safe_fname(fname)); + fname); } return; } - if (statret == 0 && !preserve_perms - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) { - /* if the file exists already and we aren't perserving - * permissions then act as though the remote end sent - * us the file permissions we already have */ - file->mode = (file->mode & ~CHMOD_BITS) - | (st.st_mode & CHMOD_BITS); + /* If we're not preserving permissions, change the file-list's + * mode based on the local permissions and some heuristics. */ + if (!preserve_perms) { + int exists = statret == 0 + && S_ISDIR(st.st_mode) == S_ISDIR(file->mode); + file->mode = dest_mode(file->mode, st.st_mode, exists); } if (S_ISDIR(file->mode)) { @@ -701,7 +1101,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + if (delete_item(fname, st.st_mode, "directory", del_opts) != 0) return; statret = -1; } @@ -709,43 +1109,69 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, missing_below = file->dir.depth; dry_run++; } + real_ret = statret; + real_st = st; + if (new_root_dir) { + if (*fname == '.' && fname[1] == '\0') + statret = -1; + new_root_dir = 0; + } + if (statret != 0 && basis_dir[0] != NULL) { + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, + itemizing, maybe_ATTRS_REPORT, code); + if (j == -2) { + itemizing = 0; + code = FNONE; + } else if (j >= 0) + statret = 1; + } if (itemizing && f_out != -1) { itemize(file, ndx, statret, &st, statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } - if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { + if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT - || create_directory_path(fname, orig_umask) < 0 + || create_directory_path(fname) < 0 || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); + file->flags |= FLAG_MISSING_DIR; + if (ndx+1 < the_file_list->count + && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) { + rprintf(FERROR, + "*** Skipping everything below this failed directory ***\n"); + missing_below = file->dir.depth; + } + return; } } - if (set_perms(fname, file, statret ? NULL : &st, 0) - && verbose && code && f_out != -1) - rprintf(code, "%s/\n", safe_fname(fname)); + if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0) + && verbose && code != FNONE && f_out != -1) + rprintf(code, "%s/\n", fname); + if (real_ret != 0 && one_file_system) + real_st.st_dev = filesystem_dev; if (delete_during && f_out != -1 && !phase && dry_run < 2 - && (file->flags & FLAG_DEL_HERE)) - delete_in_dir(the_file_list, fname, file); + && (file->flags & FLAG_XFER_DIR)) + delete_in_dir(the_file_list, fname, file, &real_st); return; } - if (preserve_hard_links && file->link_u.links + if (preserve_hard_links && IS_HLINKED(file) && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_CHECK_MASTER)) return; if (preserve_links && S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS - if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { + const char *sl = F_SYMLINK(file); + if (safe_symlinks && unsafe_symlink(sl, fname)) { if (verbose) { if (the_file_list->count == 1) - fname = f_name(file); + fname = f_name(file, NULL); rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", - full_fname(fname), - safe_fname(file->u.link)); + full_fname(fname), sl); } return; } @@ -753,137 +1179,173 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, char lnk[MAXPATHLEN]; int len; - if (!S_ISDIR(st.st_mode) - && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) { - lnk[len] = 0; - /* A link already pointing to the - * right place -- no further action - * required. */ - if (strcmp(lnk, file->u.link) == 0) { - if (itemizing) { - itemize(file, ndx, 0, &st, 0, - 0, NULL); - } - set_perms(fname, file, &st, - maybe_PERMS_REPORT); - if (preserve_hard_links - && file->link_u.links) { - hard_link_cluster(file, ndx, - itemizing, - code); - } - return; - } + if (!S_ISLNK(st.st_mode)) + statret = -1; + else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0 + && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') { + /* The link is pointing to the right place. */ + if (itemizing) + itemize(file, ndx, 0, &st, 0, 0, NULL); + set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); + if (remove_source_files == 1) + goto return_with_success; + return; } /* Not the right symlink (or not a symlink), so * delete it. */ - if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0) return; - if (!S_ISLNK(st.st_mode)) - statret = -1; + } else if (basis_dir[0] != NULL) { + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, + itemizing, maybe_ATTRS_REPORT, code); + if (j == -2) { +#ifndef CAN_HARDLINK_SYMLINK + if (link_dest) { + /* Resort to --copy-dest behavior. */ + } else +#endif + if (!copy_dest) + return; + itemizing = 0; + code = FNONE; + } else if (j >= 0) + statret = 1; } - if (preserve_hard_links && file->link_u.links + if (preserve_hard_links && IS_HLINKED(file) && hard_link_check(file, ndx, fname, -1, &st, itemizing, code, HL_SKIP)) return; - if (do_symlink(file->u.link,fname) != 0) { + if (do_symlink(sl, fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", - full_fname(fname), safe_fname(file->u.link)); + full_fname(fname), sl); } else { - set_perms(fname,file,NULL,0); + set_file_attrs(fname, file, NULL, 0); if (itemizing) { itemize(file, ndx, statret, &st, ITEM_LOCAL_CHANGE, 0, NULL); } - if (code && verbose) { - rprintf(code, "%s -> %s\n", safe_fname(fname), - safe_fname(file->u.link)); - } - if (remove_sent_files && !dry_run) { - char numbuf[4]; - SIVAL(numbuf, 0, ndx); - send_msg(MSG_SUCCESS, numbuf, 4); - } - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); + if (code != FNONE && verbose) + rprintf(code, "%s -> %s\n", fname, sl); + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); + /* This does not check remove_source_files == 1 + * because this is one of the items that the old + * --remove-sent-files option would remove. */ + if (remove_source_files) + goto return_with_success; } #endif return; } - if (am_root && preserve_devices && IS_DEVICE(file->mode)) { - if (statret != 0 || - st.st_mode != file->mode || - st.st_rdev != file->u.rdev) { - if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) - return; - if (preserve_hard_links && file->link_u.links - && hard_link_check(file, ndx, fname, -1, &st, - itemizing, code, HL_SKIP)) - return; - if (!IS_DEVICE(st.st_mode)) - statret = -1; - if (verbose > 2) { - rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", - safe_fname(fname), - (int)file->mode, (int)file->u.rdev); - } - if (do_mknod(fname,file->mode,file->u.rdev) < 0) { - rsyserr(FERROR, errno, "mknod %s failed", - full_fname(fname)); + if ((am_root && preserve_devices && IS_DEVICE(file->mode)) + || (preserve_specials && IS_SPECIAL(file->mode))) { + dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file)); + if (statret == 0) { + char *t; + if (IS_DEVICE(file->mode)) { + if (!IS_DEVICE(st.st_mode)) + statret = -1; + t = "device file"; } else { - set_perms(fname,file,NULL,0); - if (itemizing) { - itemize(file, ndx, statret, &st, - ITEM_LOCAL_CHANGE, 0, NULL); - } - if (code && verbose) { - rprintf(code, "%s\n", - safe_fname(fname)); - } - if (preserve_hard_links && file->link_u.links) { - hard_link_cluster(file, ndx, - itemizing, code); - } + if (!IS_SPECIAL(st.st_mode)) + statret = -1; + t = "special file"; + } + if (statret == 0 + && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS) + && st.st_rdev == rdev) { + /* The device or special file is identical. */ + if (itemizing) + itemize(file, ndx, 0, &st, 0, 0, NULL); + set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); + if (remove_source_files == 1) + goto return_with_success; + return; } + if (delete_item(fname, st.st_mode, t, del_opts) != 0) + return; + } else if (basis_dir[0] != NULL) { + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, + itemizing, maybe_ATTRS_REPORT, code); + if (j == -2) { +#ifndef CAN_HARDLINK_SPECIAL + if (link_dest) { + /* Resort to --copy-dest behavior. */ + } else +#endif + if (!copy_dest) + return; + itemizing = 0; + code = FNONE; + } else if (j >= 0) + statret = 1; + } + if (preserve_hard_links && IS_HLINKED(file) + && hard_link_check(file, ndx, fname, -1, &st, + itemizing, code, HL_SKIP)) + return; + if (verbose > 2) { + rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", + fname, (int)file->mode, (int)rdev); + } + if (do_mknod(fname, file->mode, rdev) < 0) { + rsyserr(FERROR, errno, "mknod %s failed", + full_fname(fname)); } else { - if (itemizing) - itemize(file, ndx, statret, &st, 0, 0, NULL); - set_perms(fname, file, &st, maybe_PERMS_REPORT); - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); + set_file_attrs(fname, file, NULL, 0); + if (itemizing) { + itemize(file, ndx, statret, &st, + ITEM_LOCAL_CHANGE, 0, NULL); + } + if (code != FNONE && verbose) + rprintf(code, "%s\n", fname); + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); + if (remove_source_files == 1) + goto return_with_success; } return; } if (!S_ISREG(file->mode)) { if (the_file_list->count == 1) - fname = f_name(file); - rprintf(FINFO, "skipping non-regular file \"%s\"\n", - safe_fname(fname)); + fname = f_name(file, NULL); + rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname); return; } if (max_size && file->length > max_size) { if (verbose > 1) { if (the_file_list->count == 1) - fname = f_name(file); - rprintf(FINFO, "%s is over max-size\n", - safe_fname(fname)); + fname = f_name(file, NULL); + rprintf(FINFO, "%s is over max-size\n", fname); + } + return; + } + if (min_size && file->length < min_size) { + if (verbose > 1) { + if (the_file_list->count == 1) + fname = f_name(file, NULL); + rprintf(FINFO, "%s is under min-size\n", fname); } return; } - if (opt_ignore_existing && statret == 0) { + if (ignore_existing && statret == 0) { if (verbose > 1) - rprintf(FINFO, "%s exists\n", safe_fname(fname)); + rprintf(FINFO, "%s exists\n", fname); return; } if (update_only && statret == 0 - && cmp_modtime(st.st_mtime, file->modtime) > 0) { + && cmp_time(st.st_mtime, file->modtime) > 0) { if (verbose > 1) - rprintf(FINFO, "%s is newer\n", safe_fname(fname)); + rprintf(FINFO, "%s is newer\n", fname); return; } @@ -891,107 +1353,24 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(st.st_mode)) { - if (delete_item(fname, st.st_mode, DEL_TERSE) != 0) + if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0) return; statret = -1; stat_errno = ENOENT; } if (statret != 0 && basis_dir[0] != NULL) { - int best_match = -1; - int match_level = 0; - int i = 0; - do { - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[i], fname); - if (link_stat(fnamecmpbuf, &st, 0) < 0 - || !S_ISREG(st.st_mode)) - continue; - switch (match_level) { - case 0: - best_match = i; - match_level = 1; - /* FALL THROUGH */ - case 1: - if (!unchanged_file(fnamecmpbuf, file, &st)) - continue; - best_match = i; - match_level = 2; - if (copy_dest) - break; - /* FALL THROUGH */ - case 2: - if (!unchanged_attrs(file, &st)) - continue; - best_match = i; - match_level = 3; - break; - } - break; - } while (basis_dir[++i] != NULL); - if (match_level) { + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st, + itemizing, maybe_ATTRS_REPORT, code); + if (j == -2) { + if (remove_source_files == 1) + goto return_with_success; + return; + } + if (j >= 0) { + fnamecmp = fnamecmpbuf; + fnamecmp_type = j; statret = 0; - if (i != best_match) { - i = best_match; - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[i], fname); - if (link_stat(fnamecmpbuf, &st, 0) < 0) { - match_level = 0; - statret = -1; - stat_errno = errno; - } - } -#ifdef HAVE_LINK - if (link_dest && match_level == 3) { - if (hard_link_one(file, ndx, fname, -1, &st, - fnamecmpbuf, 1, - itemizing && verbose > 1, - code) == 0) { - if (preserve_hard_links - && file->link_u.links) { - hard_link_cluster(file, ndx, - itemizing, - code); - } - return; - } - match_level = 2; - } -#endif - if (match_level == 2) { - /* Copy the file locally. */ - if (copy_file(fnamecmpbuf, fname, file->mode) < 0) { - if (verbose) { - rsyserr(FINFO, errno, - "copy_file %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); - } - match_level = 0; - statret = -1; - } else { - if (itemizing) { - itemize(file, ndx, 0, &st, - ITEM_LOCAL_CHANGE, 0, - NULL); - } else if (verbose && code) { - rprintf(code, "%s\n", - safe_fname(fname)); - } - set_perms(fname, file, NULL, - maybe_PERMS_REPORT); - if (preserve_hard_links - && file->link_u.links) { - hard_link_cluster(file, ndx, - itemizing, - code); - } - return; - } - } else if (compare_dest || match_level == 1) { - fnamecmp = fnamecmpbuf; - fnamecmp_type = i; - } } } @@ -1006,14 +1385,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else partialptr = NULL; - if (statret != 0 && fuzzy_basis && dry_run <= 1) { + if (statret != 0 && fuzzy_dirlist && dry_run <= 1) { int j = find_fuzzy(file, fuzzy_dirlist); if (j >= 0) { fuzzy_file = fuzzy_dirlist->files[j]; - f_name_to(fuzzy_file, fnamecmpbuf); + f_name(fuzzy_file, fnamecmpbuf); if (verbose > 2) { rprintf(FINFO, "fuzzy basis selected for %s: %s\n", - safe_fname(fname), safe_fname(fnamecmpbuf)); + fname, fnamecmpbuf); } st.st_size = fuzzy_file->length; statret = 0; @@ -1023,45 +1402,48 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0) { - if (preserve_hard_links && file->link_u.links + if (preserve_hard_links && IS_HLINKED(file) && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_SKIP)) return; if (stat_errno == ENOENT) goto notify_others; - if (verbose > 1) { - rsyserr(FERROR, stat_errno, - "recv_generator: failed to stat %s", - full_fname(fname)); - } + rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", + full_fname(fname)); return; } if (append_mode && st.st_size > file->length) return; - if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) + if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; else if (unchanged_file(fnamecmp, file, &st)) { - if (fnamecmp_type == FNAMECMP_FNAME) { - if (itemizing) { - itemize(file, ndx, real_ret, &real_st, - 0, 0, NULL); - } - set_perms(fname, file, &st, maybe_PERMS_REPORT); - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); + if (partialptr) { + do_unlink(partialptr); + handle_partial_dir(partialptr, PDIR_DELETE); + } + if (itemizing) { + itemize(file, ndx, real_ret, &real_st, + 0, 0, NULL); + } + set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); + if (remove_source_files != 1) return; + return_with_success: + if (!dry_run) { + char numbuf[4]; + SIVAL(numbuf, 0, ndx); + send_msg(MSG_SUCCESS, numbuf, 4); } - /* Only --compare-dest gets here. */ - itemize(file, ndx, real_ret, &real_st, - ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL); return; } -prepare_to_open: + prepare_to_open: if (partialptr) { st = partial_st; fnamecmp = partialptr; @@ -1072,10 +1454,10 @@ prepare_to_open: if (!do_xfers || read_batch || whole_file) goto notify_others; - if (fuzzy_basis) { + if (fuzzy_dirlist) { int j = flist_find(fuzzy_dirlist, file); if (j >= 0) /* don't use changing file as future fuzzy basis */ - fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY; + fuzzy_dirlist->files[j]->flags |= FLAG_SENT; } /* open the file */ @@ -1084,9 +1466,9 @@ prepare_to_open: if (fd == -1) { rsyserr(FERROR, errno, "failed to open %s, continuing", full_fname(fnamecmp)); - pretend_missing: + pretend_missing: /* pretend the file didn't exist */ - if (preserve_hard_links && file->link_u.links + if (preserve_hard_links && IS_HLINKED(file) && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_SKIP)) return; @@ -1099,14 +1481,14 @@ prepare_to_open: close(fd); return; } - if (!(back_file = make_file(fname, NULL, NO_FILTERS))) { + if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) { close(fd); goto pretend_missing; } if (robust_unlink(backupptr) && errno != ENOENT) { rsyserr(FERROR, errno, "unlink %s", full_fname(backupptr)); - free(back_file); + unmake_file(back_file); close(fd); return; } @@ -1114,7 +1496,7 @@ prepare_to_open: O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { rsyserr(FERROR, errno, "open %s", full_fname(backupptr)); - free(back_file); + unmake_file(back_file); close(fd); return; } @@ -1123,13 +1505,15 @@ prepare_to_open: if (verbose > 3) { rprintf(FINFO, "gen mapped %s of size %.0f\n", - safe_fname(fnamecmp), (double)st.st_size); + fnamecmp, (double)st.st_size); } if (verbose > 2) rprintf(FINFO, "generating and sending sums for %d\n", ndx); -notify_others: + notify_others: + if (remove_source_files && !delay_updates && !phase) + increment_active_files(ndx, itemizing, code); write_int(f_out, ndx); if (itemizing) { int iflags = ITEM_TRANSFER; @@ -1144,8 +1528,8 @@ notify_others: } if (!do_xfers) { - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); + if (preserve_hard_links && IS_HLINKED(file)) + hard_link_cluster(file, ndx, itemizing, code, -1); return; } if (read_batch) @@ -1160,47 +1544,47 @@ notify_others: if (f_copy >= 0) { close(f_copy); - set_perms(backupptr, back_file, NULL, 0); + set_file_attrs(backupptr, back_file, NULL, 0); if (verbose > 1) { rprintf(FINFO, "backed up %s to %s\n", - safe_fname(fname), safe_fname(backupptr)); + fname, backupptr); } - free(back_file); + unmake_file(back_file); } close(fd); } - void generate_files(int f_out, struct file_list *flist, char *local_name) { int i; char fbuf[MAXPATHLEN]; - int itemizing, maybe_PERMS_REPORT; + int itemizing, maybe_ATTRS_REPORT; enum logcode code; int lull_mod = allowed_lull * 5; int need_retouch_dir_times = preserve_times && !omit_dir_times; int need_retouch_dir_perms = 0; - int save_only_existing = only_existing; - int save_opt_ignore_existing = opt_ignore_existing; + int save_ignore_existing = ignore_existing; + int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; int save_make_backups = make_backups; + int dir_tweaking = !(list_only || local_name || dry_run); if (protocol_version >= 29) { itemizing = 1; - maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; - code = daemon_log_format_has_i ? 0 : FLOG; + maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT; + code = logfile_format_has_i ? FNONE : FLOG; } else if (am_daemon) { - itemizing = daemon_log_format_has_i && do_xfers; - maybe_PERMS_REPORT = PERMS_REPORT; + itemizing = logfile_format_has_i && do_xfers; + maybe_ATTRS_REPORT = ATTRS_REPORT; code = itemizing || !do_xfers ? FCLIENT : FINFO; } else if (!am_server) { - itemizing = log_format_has_i; - maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; - code = itemizing ? 0 : FINFO; + itemizing = stdout_format_has_i; + maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT; + code = itemizing ? FNONE : FINFO; } else { itemizing = 0; - maybe_PERMS_REPORT = PERMS_REPORT; + maybe_ATTRS_REPORT = ATTRS_REPORT; code = FINFO; } @@ -1211,6 +1595,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (delete_before && !local_name && flist->count > 0) do_delete_pass(flist); + if (delete_during == 2) + start_delete_temp(); do_progress = 0; if (append_mode || whole_file < 0) @@ -1234,17 +1620,20 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (!file->basename) continue; - recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, itemizing, maybe_PERMS_REPORT, code, - f_out); + if (local_name) + strlcpy(fbuf, local_name, sizeof fbuf); + else + f_name(file, fbuf); + recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT, + code, f_out); /* We need to ensure that any dirs we create have writeable * permissions during the time we are putting files within * them. This is then fixed after the transfer is done. */ #ifdef HAVE_CHMOD if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR) - && !list_only) { - int mode = file->mode | S_IWUSR; /* user write */ + && dir_tweaking) { + mode_t mode = file->mode | S_IWUSR; /* user write */ char *fname = local_name ? local_name : fbuf; if (do_chmod(fname, mode) < 0) { rsyserr(FERROR, errno, @@ -1265,11 +1654,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) } recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during) - delete_in_dir(NULL, NULL, NULL); + delete_in_dir(NULL, NULL, NULL, NULL); phase++; csum_length = SUM_LENGTH; - only_existing = max_size = opt_ignore_existing = 0; + max_size = min_size = ignore_existing = ignore_non_existing = 0; update_only = always_checksum = size_only = 0; ignore_times = 1; if (append_mode) /* resend w/o append mode */ @@ -1279,29 +1668,32 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); - write_int(f_out, -1); + write_int(f_out, NDX_DONE); /* files can cycle through the system more than once * to catch initial checksum errors */ while ((i = get_redo_num(itemizing, code)) != -1) { struct file_struct *file = flist->files[i]; - recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, itemizing, maybe_PERMS_REPORT, code, - f_out); + if (local_name) + strlcpy(fbuf, local_name, sizeof fbuf); + else + f_name(file, fbuf); + recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT, + code, f_out); } phase++; - only_existing = save_only_existing; - opt_ignore_existing = save_opt_ignore_existing; + ignore_non_existing = save_ignore_non_existing; + ignore_existing = save_ignore_existing; make_backups = save_make_backups; if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); - write_int(f_out, -1); + write_int(f_out, NDX_DONE); /* Reduce round-trip lag-time for a useless delay-updates phase. */ if (protocol_version >= 29 && !delay_updates) - write_int(f_out, -1); + write_int(f_out, NDX_DONE); /* Read MSG_DONE for the redo phase (and any prior messages). */ get_redo_num(itemizing, code); @@ -1311,29 +1703,41 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (verbose > 2) rprintf(FINFO, "generate_files phase=%d\n", phase); if (delay_updates) - write_int(f_out, -1); + write_int(f_out, NDX_DONE); /* Read MSG_DONE for delay-updates phase & prior messages. */ get_redo_num(itemizing, code); } do_progress = save_do_progress; + if (delete_delay_fp) + delayed_deletions(fbuf); if (delete_after && !local_name && flist->count > 0) do_delete_pass(flist); - if ((need_retouch_dir_perms || need_retouch_dir_times) - && !list_only && !local_name && !dry_run) { + if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) { int j = 0; /* Now we need to fix any directory permissions that were * modified during the transfer and/or re-set any tweaked * modified-time values. */ for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; + if (!file->basename || !S_ISDIR(file->mode)) continue; if (!need_retouch_dir_times && file->mode & S_IWUSR) continue; - recv_generator(f_name(file), file, i, itemizing, - maybe_PERMS_REPORT, code, -1); + if (file->flags & FLAG_MISSING_DIR) { + int missing = file->dir.depth; + while (++i < flist->count) { + file = flist->files[i]; + if (file->dir.depth <= missing) + break; + } + i--; + continue; + } + recv_generator(f_name(file, NULL), file, i, itemizing, + maybe_ATTRS_REPORT, code, -1); if (allowed_lull && !(++j % lull_mod)) maybe_send_keepalive(); else if (!(j % 200)) @@ -1342,7 +1746,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) } recv_generator(NULL, NULL, 0, 0, 0, code, -1); - if (max_delete > 0 && deletion_count > max_delete) { + if (max_delete >= 0 && deletion_count > max_delete) { rprintf(FINFO, "Deletions stopped due to --max-delete limit (%d skipped)\n", deletion_count - max_delete);