From 21158bc6b52ad39e5fb0e7ff29d463ff8a9ce737 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 3 May 2006 06:38:00 +0000 Subject: [PATCH] Fixed failing hunks. --- acls.diff | 108 ++++++++++++++++++++--------------------- backup-dir-dels.diff | 38 +++++++-------- flags.diff | 10 +--- threaded-receiver.diff | 75 ++++++++++++++++------------ 4 files changed, 118 insertions(+), 113 deletions(-) diff --git a/acls.diff b/acls.diff index d9e1fef..dc1ab65 100644 --- a/acls.diff +++ b/acls.diff @@ -1317,7 +1317,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. --- old/flist.c +++ new/flist.c -@@ -40,6 +40,7 @@ extern int filesfrom_fd; +@@ -41,6 +41,7 @@ extern int curr_dir_depth; extern int one_file_system; extern int copy_dirlinks; extern int keep_dirlinks; @@ -1325,7 +1325,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; -@@ -133,6 +134,8 @@ static void list_file_entry(struct file_ +@@ -134,6 +135,8 @@ static void list_file_entry(struct file_ permstring(permbuf, f->mode); @@ -1334,7 +1334,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { rprintf(FINFO, "%s %11.0f %s %s -> %s\n", -@@ -499,6 +502,9 @@ static struct file_struct *receive_file_ +@@ -492,6 +495,9 @@ static struct file_struct *receive_file_ char thisname[MAXPATHLEN]; unsigned int l1 = 0, l2 = 0; int alloc_len, basename_len, dirname_len, linkname_len, sum_len; @@ -1344,7 +1344,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. OFF_T file_length; char *basename, *dirname, *bp; struct file_struct *file; -@@ -602,13 +608,27 @@ static struct file_struct *receive_file_ +@@ -595,13 +601,27 @@ static struct file_struct *receive_file_ sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0; @@ -1372,7 +1372,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. file->modtime = modtime; file->length = file_length; -@@ -701,6 +721,11 @@ static struct file_struct *receive_file_ +@@ -694,6 +714,11 @@ static struct file_struct *receive_file_ read_buf(f, sum, checksum_len); } @@ -1384,7 +1384,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. return file; } -@@ -950,6 +975,9 @@ static struct file_struct *send_file_nam +@@ -943,6 +968,9 @@ static struct file_struct *send_file_nam unsigned short flags) { struct file_struct *file; @@ -1394,7 +1394,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. file = make_file(fname, flist, stp, flags, f == -2 ? SERVER_FILTERS : ALL_FILTERS); -@@ -959,6 +987,15 @@ static struct file_struct *send_file_nam +@@ -952,6 +980,15 @@ static struct file_struct *send_file_nam if (chmod_modes && !S_ISLNK(file->mode)) file->mode = tweak_mode(file->mode, chmod_modes); @@ -1410,7 +1410,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. maybe_emit_filelist_progress(flist->count + flist_count_offset); flist_expand(flist); -@@ -966,6 +1003,15 @@ static struct file_struct *send_file_nam +@@ -959,6 +996,15 @@ static struct file_struct *send_file_nam if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f); @@ -1436,7 +1436,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern int preserve_links; extern int preserve_devices; extern int preserve_specials; -@@ -87,6 +88,7 @@ extern long block_size; /* "long" becaus +@@ -85,6 +86,7 @@ extern long block_size; /* "long" becaus extern int max_delete; extern int force_delete; extern int one_file_system; @@ -1444,7 +1444,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern struct stats stats; extern dev_t filesystem_dev; extern char *backup_dir; -@@ -319,22 +321,27 @@ static void do_delete_pass(struct file_l +@@ -317,22 +319,27 @@ static void do_delete_pass(struct file_l rprintf(FINFO, " \r"); } @@ -1477,7 +1477,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. int32 iflags, uchar fnamecmp_type, char *xname) { if (statret >= 0) { /* A from-dest-dir statret can == 1! */ -@@ -342,19 +349,23 @@ void itemize(struct file_struct *file, i +@@ -340,19 +347,23 @@ void itemize(struct file_struct *file, i : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode); @@ -1506,7 +1506,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } else iflags |= ITEM_IS_NEW; -@@ -605,7 +616,7 @@ void check_for_finished_hlinks(int itemi +@@ -603,7 +614,7 @@ void check_for_finished_hlinks(int itemi * 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, @@ -1515,7 +1515,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. int maybe_ATTRS_REPORT, enum logcode code) { int save_ignore_times = ignore_times; -@@ -620,7 +631,7 @@ static int try_dests_reg(struct file_str +@@ -618,7 +629,7 @@ static int try_dests_reg(struct file_str do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); @@ -1524,7 +1524,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; switch (match_level) { case 0: -@@ -628,16 +639,20 @@ static int try_dests_reg(struct file_str +@@ -626,16 +637,20 @@ static int try_dests_reg(struct file_str match_level = 1; /* FALL THROUGH */ case 1: @@ -1548,7 +1548,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; best_match = j; match_level = 3; -@@ -655,22 +670,27 @@ static int try_dests_reg(struct file_str +@@ -653,22 +668,27 @@ static int try_dests_reg(struct file_str if (j != best_match) { j = best_match; pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); @@ -1580,7 +1580,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (verbose > 1 && maybe_ATTRS_REPORT) { code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; -@@ -689,8 +709,13 @@ static int try_dests_reg(struct file_str +@@ -687,8 +707,13 @@ static int try_dests_reg(struct file_str } return -1; } @@ -1596,7 +1596,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. set_file_attrs(fname, file, NULL, 0); if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) -@@ -715,13 +740,18 @@ static int try_dests_non(struct file_str +@@ -713,13 +738,18 @@ static int try_dests_non(struct file_str enum logcode code) { char fnamebuf[MAXPATHLEN]; @@ -1618,7 +1618,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; if (S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS -@@ -734,10 +764,10 @@ static int try_dests_non(struct file_str +@@ -732,10 +762,10 @@ static int try_dests_non(struct file_str #endif continue; } else if (IS_SPECIAL(file->mode)) { @@ -1631,7 +1631,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. continue; } else { rprintf(FERROR, -@@ -766,7 +796,15 @@ static int try_dests_non(struct file_str +@@ -764,7 +794,15 @@ static int try_dests_non(struct file_str int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE + (link_dest ? ITEM_XNAME_FOLLOWS : 0); char *lp = link_dest ? "" : NULL; @@ -1648,7 +1648,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (verbose > 1 && maybe_ATTRS_REPORT) { code = daemon_log_format_has_i || dry_run -@@ -780,6 +818,7 @@ static int try_dests_non(struct file_str +@@ -778,6 +816,7 @@ static int try_dests_non(struct file_str } static int phase = 0; @@ -1656,7 +1656,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, * make sure it exists, and has the right permissions/timestamp info. For -@@ -801,7 +840,8 @@ static void recv_generator(char *fname, +@@ -799,7 +838,8 @@ static void recv_generator(char *fname, static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; @@ -1666,7 +1666,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. struct file_struct *back_file = NULL; int statret, real_ret, stat_errno; char *fnamecmp, *partialptr, *backupptr = NULL; -@@ -852,6 +892,9 @@ static void recv_generator(char *fname, +@@ -850,6 +890,9 @@ static void recv_generator(char *fname, dry_run--; missing_below = -1; } @@ -1676,16 +1676,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (dry_run > 1) { statret = -1; stat_errno = ENOENT; -@@ -859,7 +902,7 @@ static void recv_generator(char *fname, +@@ -857,7 +900,7 @@ static void recv_generator(char *fname, 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 -+ && do_stat(dn, &sx.st) < 0 +- && safe_stat(dn, &st) < 0 ++ && safe_stat(dn, &sx.st) < 0 && create_directory_path(fname) < 0) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", -@@ -871,6 +914,10 @@ static void recv_generator(char *fname, +@@ -869,6 +912,10 @@ static void recv_generator(char *fname, } if (fuzzy_basis) need_fuzzy_dirlist = 1; @@ -1696,7 +1696,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } parent_dirname = dn; -@@ -879,7 +926,7 @@ static void recv_generator(char *fname, +@@ -877,7 +924,7 @@ static void recv_generator(char *fname, need_fuzzy_dirlist = 0; } @@ -1705,7 +1705,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. keep_dirlinks && S_ISDIR(file->mode)); stat_errno = errno; } -@@ -897,8 +944,9 @@ static void recv_generator(char *fname, +@@ -895,8 +942,9 @@ static void recv_generator(char *fname, * mode based on the local permissions and some heuristics. */ if (!preserve_perms) { int exists = statret == 0 @@ -1717,7 +1717,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (S_ISDIR(file->mode)) { -@@ -907,8 +955,8 @@ static void recv_generator(char *fname, +@@ -905,8 +953,8 @@ static void recv_generator(char *fname, * file of that name and it is *not* a directory, then * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ @@ -1728,7 +1728,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. return; statret = -1; } -@@ -917,7 +965,11 @@ static void recv_generator(char *fname, +@@ -915,7 +963,11 @@ static void recv_generator(char *fname, dry_run++; } if (itemizing && f_out != -1) { @@ -1741,7 +1741,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { -@@ -929,19 +981,19 @@ static void recv_generator(char *fname, +@@ -927,19 +979,19 @@ static void recv_generator(char *fname, full_fname(fname)); } } @@ -1766,7 +1766,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (preserve_links && S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS -@@ -963,7 +1015,7 @@ static void recv_generator(char *fname, +@@ -957,7 +1009,7 @@ static void recv_generator(char *fname, char lnk[MAXPATHLEN]; int len; @@ -1775,7 +1775,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) { lnk[len] = 0; /* A link already pointing to the -@@ -971,10 +1023,10 @@ static void recv_generator(char *fname, +@@ -965,10 +1017,10 @@ static void recv_generator(char *fname, * required. */ if (strcmp(lnk, file->u.link) == 0) { if (itemizing) { @@ -1788,7 +1788,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) { -@@ -987,9 +1039,9 @@ static void recv_generator(char *fname, +@@ -981,9 +1033,9 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -1800,7 +1800,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret = -1; } else if (basis_dir[0] != NULL) { if (try_dests_non(file, fname, ndx, itemizing, -@@ -1005,7 +1057,7 @@ static void recv_generator(char *fname, +@@ -999,7 +1051,7 @@ static void recv_generator(char *fname, } } if (preserve_hard_links && file->link_u.links @@ -1809,7 +1809,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. itemizing, code, HL_SKIP)) return; if (do_symlink(file->u.link,fname) != 0) { -@@ -1014,7 +1066,7 @@ static void recv_generator(char *fname, +@@ -1008,7 +1060,7 @@ static void recv_generator(char *fname, } else { set_file_attrs(fname, file, NULL, 0); if (itemizing) { @@ -1818,7 +1818,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) { -@@ -1048,18 +1100,22 @@ static void recv_generator(char *fname, +@@ -1042,18 +1094,22 @@ static void recv_generator(char *fname, itemizing = code = 0; } } @@ -1849,7 +1849,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret = -1; if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", -@@ -1072,7 +1128,7 @@ static void recv_generator(char *fname, +@@ -1066,7 +1122,7 @@ static void recv_generator(char *fname, } else { set_file_attrs(fname, file, NULL, 0); if (itemizing) { @@ -1858,7 +1858,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) -@@ -1084,12 +1140,12 @@ static void recv_generator(char *fname, +@@ -1078,12 +1134,12 @@ static void recv_generator(char *fname, } } else { if (itemizing) @@ -1874,7 +1874,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (!S_ISREG(file->mode)) { -@@ -1123,7 +1179,7 @@ static void recv_generator(char *fname, +@@ -1117,7 +1173,7 @@ static void recv_generator(char *fname, } if (update_only && statret == 0 @@ -1883,7 +1883,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (verbose > 1) rprintf(FINFO, "%s is newer\n", fname); return; -@@ -1132,18 +1188,18 @@ static void recv_generator(char *fname, +@@ -1126,18 +1182,18 @@ static void recv_generator(char *fname, fnamecmp = fname; fnamecmp_type = FNAMECMP_FNAME; @@ -1906,7 +1906,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (j != -1) { fnamecmp = fnamecmpbuf; fnamecmp_type = j; -@@ -1152,7 +1208,7 @@ static void recv_generator(char *fname, +@@ -1146,7 +1202,7 @@ static void recv_generator(char *fname, } real_ret = statret; @@ -1915,7 +1915,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL && link_stat(partialptr, &partial_st, 0) == 0 -@@ -1171,7 +1227,7 @@ static void recv_generator(char *fname, +@@ -1165,7 +1221,7 @@ static void recv_generator(char *fname, rprintf(FINFO, "fuzzy basis selected for %s: %s\n", fname, fnamecmpbuf); } @@ -1924,7 +1924,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. statret = 0; fnamecmp = fnamecmpbuf; fnamecmp_type = FNAMECMP_FUZZY; -@@ -1180,7 +1236,7 @@ static void recv_generator(char *fname, +@@ -1174,7 +1230,7 @@ static void recv_generator(char *fname, if (statret != 0) { if (preserve_hard_links && file->link_u.links @@ -1933,7 +1933,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. itemizing, code, HL_SKIP)) return; if (stat_errno == ENOENT) -@@ -1190,31 +1246,44 @@ static void recv_generator(char *fname, +@@ -1184,31 +1240,44 @@ static void recv_generator(char *fname, return; } @@ -1984,7 +1984,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. fnamecmp = partialptr; fnamecmp_type = FNAMECMP_PARTIAL_DIR; statret = 0; -@@ -1238,17 +1307,21 @@ static void recv_generator(char *fname, +@@ -1232,17 +1301,21 @@ static void recv_generator(char *fname, pretend_missing: /* pretend the file didn't exist */ if (preserve_hard_links && file->link_u.links @@ -2009,7 +2009,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) { close(fd); -@@ -1259,7 +1332,7 @@ static void recv_generator(char *fname, +@@ -1253,7 +1326,7 @@ static void recv_generator(char *fname, full_fname(backupptr)); free(back_file); close(fd); @@ -2018,7 +2018,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { -@@ -1267,14 +1340,14 @@ static void recv_generator(char *fname, +@@ -1261,14 +1334,14 @@ static void recv_generator(char *fname, full_fname(backupptr)); free(back_file); close(fd); @@ -2035,7 +2035,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (verbose > 2) -@@ -1292,24 +1365,32 @@ static void recv_generator(char *fname, +@@ -1286,24 +1359,32 @@ static void recv_generator(char *fname, iflags |= ITEM_BASIS_TYPE_FOLLOWS; if (fnamecmp_type == FNAMECMP_FUZZY) iflags |= ITEM_XNAME_FOLLOWS; @@ -2073,7 +2073,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. if (f_copy >= 0) { close(f_copy); -@@ -1322,6 +1403,13 @@ static void recv_generator(char *fname, +@@ -1316,6 +1397,13 @@ static void recv_generator(char *fname, } close(fd); @@ -2087,7 +2087,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } void generate_files(int f_out, struct file_list *flist, char *local_name) -@@ -1381,6 +1469,8 @@ void generate_files(int f_out, struct fi +@@ -1375,6 +1463,8 @@ void generate_files(int f_out, struct fi * notice that and let us know via the redo pipe (or its closing). */ ignore_timeout = 1; @@ -5510,7 +5510,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); --- old/log.c +++ new/log.c -@@ -603,8 +603,10 @@ static void log_formatted(enum logcode c +@@ -600,8 +600,10 @@ static void log_formatted(enum logcode c n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; @@ -6262,7 +6262,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. +#endif /* _SMB_ACLS_H */ --- old/t_stub.c +++ new/t_stub.c -@@ -78,3 +78,7 @@ struct filter_list_struct server_filter_ +@@ -79,3 +79,7 @@ struct filter_list_struct server_filter_ return NULL; } @@ -6706,7 +6706,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. for (i = 0; i < flist->count; i++) --- old/util.c +++ new/util.c -@@ -1446,3 +1446,31 @@ int bitbag_next_bit(struct bitbag *bb, i +@@ -1515,3 +1515,31 @@ int bitbag_next_bit(struct bitbag *bb, i return -1; } diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 842fe6b..927f872 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -15,7 +15,7 @@ Marc St-Onge --- old/backup.c +++ new/backup.c -@@ -22,10 +22,15 @@ +@@ -23,10 +23,15 @@ extern int verbose; extern int backup_dir_len; @@ -31,7 +31,7 @@ Marc St-Onge extern int am_root; extern int preserve_devices; -@@ -33,6 +38,8 @@ extern int preserve_specials; +@@ -34,6 +39,8 @@ extern int preserve_specials; extern int preserve_links; extern int safe_symlinks; @@ -40,7 +40,7 @@ Marc St-Onge /* make a complete pathname for backup file */ char *get_backup_name(char *fname) { -@@ -50,11 +57,28 @@ char *get_backup_name(char *fname) +@@ -51,11 +58,28 @@ char *get_backup_name(char *fname) return NULL; } @@ -70,7 +70,7 @@ Marc St-Onge if (!fnamebak) return 0; -@@ -94,7 +118,8 @@ path +@@ -95,7 +119,8 @@ path static int make_bak_dir(char *fullpath) { STRUCT_STAT st; @@ -80,7 +80,7 @@ Marc St-Onge char *end = rel + strlen(rel); char *p = end; -@@ -182,7 +207,8 @@ static int keep_backup(char *fname) +@@ -183,7 +208,8 @@ static int keep_backup(char *fname) if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) return 1; /* the file could have disappeared */ @@ -90,7 +90,7 @@ Marc St-Onge return 0; /* Check to see if this is a device file, or link */ -@@ -277,3 +303,13 @@ int make_backup(char *fname) +@@ -278,3 +304,13 @@ int make_backup(char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -116,7 +116,7 @@ Marc St-Onge extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; -@@ -102,10 +105,14 @@ static int can_link_devices = 1; +@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t #define DEL_TERSE (1<<3) @@ -132,7 +132,7 @@ Marc St-Onge } -@@ -126,8 +133,8 @@ static int delete_item(char *fname, int +@@ -124,8 +131,8 @@ static int delete_item(char *fname, int if (!S_ISDIR(mode)) { if (max_delete && ++deletion_count > max_delete) return 0; @@ -143,7 +143,7 @@ Marc St-Onge else ok = robust_unlink(fname) == 0; if (ok) { -@@ -149,9 +156,9 @@ static int delete_item(char *fname, int +@@ -147,9 +154,9 @@ static int delete_item(char *fname, int || (dry_run && zap_dir)) { ok = 0; errno = ENOTEMPTY; @@ -191,7 +191,7 @@ Marc St-Onge rprintf(F," -u, --update skip files that are newer on the receiver\n"); rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); rprintf(F," --append append data onto shorter files\n"); -@@ -497,7 +505,9 @@ static struct poptOption long_options[] +@@ -499,7 +507,9 @@ static struct poptOption long_options[] {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, @@ -201,16 +201,16 @@ Marc St-Onge {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 }, {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 }, {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 }, -@@ -1212,6 +1222,8 @@ int parse_arguments(int *argc, const cha - partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); +@@ -1215,6 +1225,8 @@ int parse_arguments(int *argc, const cha + partial_dir = sanitize_path(NULL, partial_dir, NULL, 0, NULL); if (backup_dir) - backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); + backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL); + if (backup_dir_dels) -+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0); ++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL); } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; -@@ -1246,6 +1258,14 @@ int parse_arguments(int *argc, const cha +@@ -1241,6 +1253,14 @@ int parse_arguments(int *argc, const cha return 0; } } @@ -225,7 +225,7 @@ Marc St-Onge } if (!backup_suffix) -@@ -1257,6 +1277,16 @@ int parse_arguments(int *argc, const cha +@@ -1252,6 +1272,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -242,7 +242,7 @@ Marc St-Onge if (backup_dir) { backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf); backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len; -@@ -1280,6 +1310,31 @@ int parse_arguments(int *argc, const cha +@@ -1275,6 +1305,31 @@ int parse_arguments(int *argc, const cha "P *%s", backup_suffix); parse_rule(&filter_list, backup_dir_buf, 0, 0); } @@ -274,7 +274,7 @@ Marc St-Onge if (make_backups && !backup_dir) omit_dir_times = 1; -@@ -1624,6 +1679,10 @@ void server_options(char **args,int *arg +@@ -1619,6 +1674,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -285,7 +285,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1632,7 +1691,13 @@ void server_options(char **args,int *arg +@@ -1627,7 +1686,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } diff --git a/flags.diff b/flags.diff index 60b48c9..5e5f419 100644 --- a/flags.diff +++ b/flags.diff @@ -259,7 +259,7 @@ Modified from a patch that was written by Rolf Grossmann: if (inplace) { if (verbose > 2) rprintf(FINFO, "finishing %s\n", fname); -@@ -305,3 +323,27 @@ const char *who_am_i(void) +@@ -305,3 +323,21 @@ const char *who_am_i(void) return am_server ? "server" : "client"; return am_sender ? "sender" : am_generator ? "generator" : "receiver"; } @@ -270,18 +270,12 @@ Modified from a patch that was written by Rolf Grossmann: +{ +#define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | UF_NOUNLINK | SF_IMMUTABLE | SF_APPEND | SF_NOUNLINK) + STRUCT_STAT stb; -+ int failed; + + if (dry_run) + return; + + /* XXX get rid of this extra stat() */ -+#ifdef SUPPORT_LINKS -+ failed = do_lstat(fname, &stb); -+#else -+ failed = do_stat(fname, &stb); -+#endif -+ if (failed) ++ if (do_lstat(fname, &stb) < 0) + return; + if (stb.st_flags & NOCHANGEBITS) + do_chflags(fname, stb.st_flags & ~NOCHANGEBITS); diff --git a/threaded-receiver.diff b/threaded-receiver.diff index f219a94..9b355d2 100644 --- a/threaded-receiver.diff +++ b/threaded-receiver.diff @@ -137,7 +137,7 @@ After applying this patch, run these commands for a successful build: continue; } -@@ -1175,7 +1179,7 @@ static void recv_generator(char *fname, +@@ -1184,7 +1188,7 @@ static void recv_generator(char *fname, return; } @@ -146,7 +146,7 @@ After applying this patch, run these commands for a successful build: return; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) -@@ -1230,7 +1234,7 @@ static void recv_generator(char *fname, +@@ -1239,7 +1243,7 @@ static void recv_generator(char *fname, goto notify_others; } @@ -155,7 +155,7 @@ After applying this patch, run these commands for a successful build: if (!(backupptr = get_backup_name(fname))) { close(fd); return; -@@ -1321,9 +1325,12 @@ void generate_files(int f_out, struct fi +@@ -1330,9 +1334,12 @@ void generate_files(int f_out, struct fi int save_ignore_existing = ignore_existing; int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; @@ -169,7 +169,7 @@ After applying this patch, run these commands for a successful build: if (protocol_version >= 29) { itemizing = 1; maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT; -@@ -1351,7 +1358,7 @@ void generate_files(int f_out, struct fi +@@ -1360,7 +1367,7 @@ void generate_files(int f_out, struct fi do_delete_pass(flist); do_progress = 0; @@ -178,7 +178,7 @@ After applying this patch, run these commands for a successful build: whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1360,12 +1367,6 @@ void generate_files(int f_out, struct fi +@@ -1369,12 +1376,6 @@ void generate_files(int f_out, struct fi : "enabled"); } @@ -191,7 +191,7 @@ After applying this patch, run these commands for a successful build: for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; -@@ -1409,23 +1410,34 @@ void generate_files(int f_out, struct fi +@@ -1418,23 +1419,34 @@ void generate_files(int f_out, struct fi delete_in_dir(NULL, NULL, NULL, NULL); phase++; @@ -232,7 +232,7 @@ After applying this patch, run these commands for a successful build: if (local_name) strlcpy(fbuf, local_name, sizeof fbuf); else -@@ -1437,27 +1449,43 @@ void generate_files(int f_out, struct fi +@@ -1446,27 +1458,43 @@ void generate_files(int f_out, struct fi phase++; ignore_non_existing = save_ignore_non_existing; ignore_existing = save_ignore_existing; @@ -460,7 +460,7 @@ After applying this patch, run these commands for a successful build: static void read_msg_fd(void) { char buf[2048]; -@@ -244,57 +242,6 @@ static void read_msg_fd(void) +@@ -244,58 +242,6 @@ static void read_msg_fd(void) tag = (tag >> 24) - MPLEX_BASE; switch (tag) { @@ -514,15 +514,17 @@ After applying this patch, run these commands for a successful build: - exit_cleanup(RERR_STREAMIO); - } - close_multiplexing_out(); +- defer_forwarding_messages = 0; - /* FALL THROUGH */ case MSG_INFO: case MSG_ERROR: case MSG_LOG: -@@ -303,10 +250,7 @@ static void read_msg_fd(void) +@@ -304,11 +250,7 @@ static void read_msg_fd(void) if (n >= sizeof buf) n = sizeof buf - 1; read_loop(fd, buf, n); -- if (am_generator && am_server && defer_forwarding_messages) +- if (am_generator && am_server +- && defer_forwarding_messages && tag != MSG_LOG) - msg_list_add(&msg2sndr, tag, buf, n); - else - rwrite((enum logcode)tag, buf, n); @@ -530,7 +532,7 @@ After applying this patch, run these commands for a successful build: len -= n; } break; -@@ -341,70 +285,76 @@ void decrement_active_files(int ndx) +@@ -343,70 +285,76 @@ void decrement_active_files(int ndx) active_bytecnt -= the_file_list->files[ndx]->length; } @@ -651,7 +653,7 @@ After applying this patch, run these commands for a successful build: return flist_ndx_pop(&hlink_list); } -@@ -484,11 +434,6 @@ static int read_timeout(int fd, char *bu +@@ -486,11 +434,6 @@ static int read_timeout(int fd, char *bu FD_ZERO(&r_fds); FD_ZERO(&w_fds); FD_SET(fd, &r_fds); @@ -663,7 +665,7 @@ After applying this patch, run these commands for a successful build: if (io_filesfrom_f_out >= 0) { int new_fd; if (io_filesfrom_buflen == 0) { -@@ -521,9 +466,6 @@ static int read_timeout(int fd, char *bu +@@ -523,9 +466,6 @@ static int read_timeout(int fd, char *bu continue; } @@ -673,7 +675,7 @@ After applying this patch, run these commands for a successful build: if (io_filesfrom_f_out >= 0) { if (io_filesfrom_buflen) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { -@@ -845,6 +787,8 @@ static void readfd(int fd, char *buffer, +@@ -847,6 +787,8 @@ static void readfd(int fd, char *buffer, } if (fd == write_batch_monitor_in) { @@ -682,7 +684,7 @@ After applying this patch, run these commands for a successful build: if ((size_t)write(batch_fd, buffer, total) != total) exit_cleanup(RERR_FILEIO); } -@@ -1106,7 +1050,6 @@ static void writefd_unbuffered(int fd,ch +@@ -1108,7 +1050,6 @@ static void writefd_unbuffered(int fd,ch * to grab any messages they sent before they died. */ while (fd == sock_f_out && io_multiplexing_in) { set_io_timeout(30); @@ -690,7 +692,7 @@ After applying this patch, run these commands for a successful build: readfd_unbuffered(sock_f_in, io_filesfrom_buf, sizeof io_filesfrom_buf); } -@@ -1117,7 +1060,7 @@ static void writefd_unbuffered(int fd,ch +@@ -1119,7 +1060,7 @@ static void writefd_unbuffered(int fd,ch defer_forwarding_messages = 1; if (fd == sock_f_out) { @@ -699,7 +701,7 @@ After applying this patch, run these commands for a successful build: last_io_out = time(NULL); sleep_for_bwlimit(cnt); } -@@ -1127,23 +1070,6 @@ static void writefd_unbuffered(int fd,ch +@@ -1129,32 +1070,6 @@ static void writefd_unbuffered(int fd,ch no_flush--; } @@ -710,11 +712,20 @@ After applying this patch, run these commands for a successful build: - - while (msg2sndr.head && io_multiplexing_out) { - struct msg_list_item *m = msg2sndr.head; +- int tag = *((uchar*)m->buf+3) - MPLEX_BASE; - if (!(msg2sndr.head = m->next)) - msg2sndr.tail = NULL; -- stats.total_written += m->len; - defer_forwarding_messages = 1; -- writefd_unbuffered(sock_f_out, m->buf, m->len); +- switch (tag) { +- case MSG_INFO: +- case MSG_ERROR: +- rwrite((enum logcode)tag, m->buf + 4, m->len - 4); +- break; +- default: +- stats.total_written += m->len; +- writefd_unbuffered(sock_f_out, m->buf, m->len); +- break; +- } - defer_forwarding_messages = 0; - free(m); - } @@ -723,7 +734,7 @@ After applying this patch, run these commands for a successful build: /** * Write an message to a multiplexed stream. If this fails then rsync * exits. -@@ -1169,14 +1095,15 @@ static void mplex_write(enum msgcode cod +@@ -1180,14 +1095,15 @@ static void mplex_write(enum msgcode cod defer_forwarding_messages = 1; writefd_unbuffered(sock_f_out, buf, len); defer_forwarding_messages = 0; @@ -742,7 +753,7 @@ After applying this patch, run these commands for a successful build: if (!iobuf_out_cnt || no_flush) return; -@@ -1190,11 +1117,6 @@ void io_flush(int flush_it_all) +@@ -1201,11 +1117,6 @@ void io_flush(int flush_it_all) static void writefd(int fd,char *buf,size_t len) { @@ -754,7 +765,7 @@ After applying this patch, run these commands for a successful build: if (fd == sock_f_out) stats.total_written += len; -@@ -1400,9 +1322,3 @@ void start_write_batch(int fd) +@@ -1411,9 +1322,3 @@ void start_write_batch(int fd) else write_batch_monitor_in = fd; } @@ -782,7 +793,7 @@ After applying this patch, run these commands for a successful build: { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, { RERR_WAITCHILD , "waitpid() failed" }, { RERR_MALLOC , "error allocating core memory buffers" }, -@@ -227,8 +225,8 @@ void rwrite(enum logcode code, char *buf +@@ -224,8 +222,8 @@ void rwrite(enum logcode code, char *buf if (quiet && code == FINFO) return; @@ -803,7 +814,7 @@ After applying this patch, run these commands for a successful build: extern int am_daemon; extern int blocking_io; extern int remove_sent_files; -@@ -87,9 +86,20 @@ struct pid_status { +@@ -91,9 +90,20 @@ struct pid_status { static time_t starttime, endtime; static int64 total_read, total_written; @@ -824,7 +835,7 @@ After applying this patch, run these commands for a successful build: /* Works like waitpid(), but if we already harvested the child pid in our * remember_children(), we succeed instead of returning an error. */ pid_t wait_process(pid_t pid, int *status_ptr, int flags) -@@ -166,7 +176,7 @@ static void handle_stats(int f) +@@ -170,7 +180,7 @@ static void handle_stats(int f) show_flist_stats(); } @@ -833,7 +844,7 @@ After applying this patch, run these commands for a successful build: return; if (am_daemon) { -@@ -630,12 +640,30 @@ static void do_server_sender(int f_in, i +@@ -634,12 +644,30 @@ static void do_server_sender(int f_in, i exit_cleanup(0); } @@ -867,7 +878,7 @@ After applying this patch, run these commands for a successful build: /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ -@@ -644,70 +672,16 @@ static int do_recv(int f_in,int f_out,st +@@ -648,70 +676,16 @@ static int do_recv(int f_in,int f_out,st if (preserve_hard_links) init_hard_links(); @@ -943,7 +954,7 @@ After applying this patch, run these commands for a successful build: generate_files(f_out, flist, local_name); handle_stats(-1); -@@ -718,10 +692,13 @@ static int do_recv(int f_in,int f_out,st +@@ -722,10 +696,13 @@ static int do_recv(int f_in,int f_out,st } io_flush(FULL_FLUSH); @@ -961,7 +972,7 @@ After applying this patch, run these commands for a successful build: } -@@ -1091,22 +1068,6 @@ static int start_client(int argc, char * +@@ -1103,22 +1080,6 @@ static int start_client(int argc, char * return ret; } @@ -984,7 +995,7 @@ After applying this patch, run these commands for a successful build: RETSIGTYPE remember_children(UNUSED(int val)) { #ifdef WNOHANG -@@ -1198,8 +1159,6 @@ int main(int argc,char *argv[]) +@@ -1210,8 +1171,6 @@ int main(int argc,char *argv[]) # endif sigact.sa_flags = SA_NOCLDSTOP; #endif @@ -1049,7 +1060,7 @@ After applying this patch, run these commands for a successful build: int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; -@@ -1300,6 +1300,7 @@ int parse_arguments(int *argc, const cha +@@ -1294,6 +1294,7 @@ int parse_arguments(int *argc, const cha if (do_progress && !verbose && !log_before_transfer && !am_server) verbose = 1; @@ -1237,7 +1248,7 @@ After applying this patch, run these commands for a successful build: --- old/util.c +++ new/util.c -@@ -410,49 +410,6 @@ int robust_rename(char *from, char *to, +@@ -415,49 +415,6 @@ int robust_rename(char *from, char *to, return -1; } -- 2.34.1