X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/289a32167ca34a448496f8927faf33148290a445..00b9618460c40131a8925047853f73ccbe9fc20b:/generator.c diff --git a/generator.c b/generator.c index 3a7dda3b..56065557 100644 --- a/generator.c +++ b/generator.c @@ -59,8 +59,8 @@ extern int csum_length; extern int ignore_times; extern int size_only; extern OFF_T max_size; -extern int io_timeout; extern int io_error; +extern int allowed_lull; extern int sock_f_out; extern int ignore_timeout; extern int protocol_version; @@ -89,8 +89,6 @@ extern int backup_suffix_len; extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; -int allowed_lull = 0; - static int deletion_count = 0; /* used to implement --max-delete */ @@ -152,7 +150,7 @@ static int delete_item(char *fname, int mode, int flags) deletion_count--; return 0; } - if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) { + if (!zap_dir) { rsyserr(FERROR, errno, "delete_file: rmdir %s failed", full_fname(fname)); return -1; @@ -171,10 +169,7 @@ static int delete_item(char *fname, int mode, int flags) continue; f_name_to(fp, buf); - if (delete_item(buf, fp->mode, flags & ~DEL_TERSE) != 0) { - flist_free(dirlist); - return -1; - } + delete_item(buf, fp->mode, flags & ~DEL_TERSE); } flist_free(dirlist); @@ -186,7 +181,7 @@ static int delete_item(char *fname, int mode, int flags) if (do_rmdir(fname) == 0) { if (!(flags & DEL_TERSE)) log_delete(fname, mode); - } else if (errno != ENOTEMPTY && errno != ENOENT) { + } else if (errno != ENOTEMPTY && errno != EEXIST && errno != ENOENT) { rsyserr(FERROR, errno, "delete_file: rmdir %s failed", full_fname(fname)); return -1; @@ -262,13 +257,12 @@ 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) + if (!fp->basename || fp->flags & FLAG_MOUNT_POINT) continue; if (flist_find(flist, fp) < 0) { int mode = fp->mode; f_name_to(fp, delbuf); - if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0) - break; + delete_item(delbuf, mode, DEL_FORCE_RECURSE); } } @@ -282,7 +276,8 @@ static void do_delete_pass(struct file_list *flist) char fbuf[MAXPATHLEN]; int j; - if (dry_run > 1) /* destination doesn't exist yet */ + if (dry_run > 1 /* destination doesn't exist yet */ + || list_only) return; for (j = 0; j < flist->count; j++) { @@ -328,10 +323,12 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode); - if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time) - || (keep_time && file->modtime != st->st_mtime)) + 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 != st->st_mode) + 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; @@ -533,7 +530,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) name = fp->basename; if (fp->length == file->length - && fp->modtime == file->modtime) { + && cmp_modtime(fp->modtime, file->modtime) == 0) { if (verbose > 4) { rprintf(FINFO, "fuzzy size/modtime match for %s\n", @@ -708,10 +705,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(file, ndx, statret, &st, statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } - if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { + if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT || create_directory_path(fname, orig_umask) < 0 - || do_mkdir(fname, file->mode) < 0) { + || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); @@ -802,7 +799,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, safe_fname(fname), (int)file->mode, (int)file->u.rdev); } - if (do_mknod(fname,file->mode,file->u.rdev) != 0) { + if (do_mknod(fname,file->mode,file->u.rdev) < 0) { rsyserr(FERROR, errno, "mknod %s failed", full_fname(fname)); } else { @@ -1144,10 +1141,11 @@ notify_others: void generate_files(int f_out, struct file_list *flist, char *local_name) { - int i, lull_mod; + int i; char fbuf[MAXPATHLEN]; int itemizing, maybe_PERMS_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; @@ -1155,9 +1153,6 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) int save_do_progress = do_progress; int save_make_backups = make_backups; - allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2; - lull_mod = allowed_lull * 5; - if (protocol_version >= 29) { itemizing = 1; maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; @@ -1213,17 +1208,19 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) /* 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 */ char *fname = local_name ? local_name : fbuf; - if (do_chmod(fname, mode & CHMOD_BITS) < 0) { + if (do_chmod(fname, mode) < 0) { rsyserr(FERROR, errno, "failed to modify permissions on %s", full_fname(fname)); } need_retouch_dir_perms = 1; } +#endif if (preserve_hard_links) check_for_finished_hlinks(itemizing, code);