From 5ff5e82f366d036c89cae48182daa9b6ced9a20d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 10 Apr 2007 06:06:42 +0000 Subject: [PATCH] Got rid of some accumulated patch fuzz. --- ODBC-dblog.diff | 58 +++++++++++++++++----------------- links-depth.diff | 20 ++++++------ source-filter_dest-filter.diff | 56 ++++++++++++++++---------------- time-limit.diff | 26 +++++++-------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 68078cb..61d25fa 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -18,11 +18,11 @@ See the newly-created file "instructions" for more info. - util.o main.o checksum.o match.o syscall.o log.o backup.o + util.o main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \ - fileio.o batch.o clientname.o chmod.o + fileio.o batch.o clientname.o chmod.o acls.o xattrs.o OBJS3=progress.o pipe.o --- old/cleanup.c +++ new/cleanup.c -@@ -27,6 +27,7 @@ extern int am_server; +@@ -26,6 +26,7 @@ extern int am_server; extern int am_daemon; extern int io_error; extern int keep_partial; @@ -30,7 +30,7 @@ See the newly-created file "instructions" for more info. extern int log_got_error; extern char *partial_dir; extern char *logfile_name; -@@ -174,8 +175,13 @@ NORETURN void _exit_cleanup(int code, co +@@ -173,8 +174,13 @@ NORETURN void _exit_cleanup(int code, co code = exit_code = RERR_PARTIAL; } @@ -47,7 +47,7 @@ See the newly-created file "instructions" for more info. #include "case_N.h" --- old/clientserver.c +++ new/clientserver.c -@@ -397,6 +397,9 @@ static int rsync_module(int f_in, int f_ +@@ -396,6 +396,9 @@ static int rsync_module(int f_in, int f_ XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); log_init(1); @@ -69,7 +69,7 @@ See the newly-created file "instructions" for more info. am_sender ? "on" : "to", --- old/configure.in +++ new/configure.in -@@ -637,6 +637,12 @@ if test x"$with_included_popt" != x"yes" +@@ -642,6 +642,12 @@ if test x"$with_included_popt" != x"yes" AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) fi @@ -898,7 +898,7 @@ See the newly-created file "instructions" for more info. + automatically generates unique IDs). Defaults to True. --- old/loadparm.c +++ new/loadparm.c -@@ -122,9 +122,16 @@ typedef struct +@@ -121,9 +121,16 @@ typedef struct { char *auth_users; char *comment; @@ -915,7 +915,7 @@ See the newly-created file "instructions" for more info. char *filter; char *gid; char *hosts_allow; -@@ -142,14 +149,20 @@ typedef struct +@@ -141,14 +148,20 @@ typedef struct char *prexfer_exec; char *refuse_options; char *secrets_file; @@ -936,7 +936,7 @@ See the newly-created file "instructions" for more info. BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; -@@ -169,9 +182,16 @@ static service sDefault = +@@ -168,9 +181,16 @@ static service sDefault = { /* auth_users; */ NULL, /* comment; */ NULL, @@ -953,7 +953,7 @@ See the newly-created file "instructions" for more info. /* filter; */ NULL, /* gid; */ NOBODY_GROUP, /* hosts_allow; */ NULL, -@@ -189,14 +209,20 @@ static service sDefault = +@@ -188,14 +208,20 @@ static service sDefault = /* prexfer_exec; */ NULL, /* refuse_options; */ NULL, /* secrets_file; */ NULL, @@ -974,7 +974,7 @@ See the newly-created file "instructions" for more info. /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, -@@ -295,10 +321,19 @@ static struct parm_struct parm_table[] = +@@ -294,10 +320,19 @@ static struct parm_struct parm_table[] = {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL,0}, @@ -994,7 +994,7 @@ See the newly-created file "instructions" for more info. {"gid", P_STRING, P_LOCAL, &sDefault.gid, NULL,0}, {"hosts allow", P_STRING, P_LOCAL, &sDefault.hosts_allow, NULL,0}, {"hosts deny", P_STRING, P_LOCAL, &sDefault.hosts_deny, NULL,0}, -@@ -323,12 +358,16 @@ static struct parm_struct parm_table[] = +@@ -322,12 +357,16 @@ static struct parm_struct parm_table[] = {"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL,0}, {"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options, NULL,0}, {"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file, NULL,0}, @@ -1011,7 +1011,7 @@ See the newly-created file "instructions" for more info. {"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL,0}, {"write only", P_BOOL, P_LOCAL, &sDefault.write_only, NULL,0}, {NULL, P_BOOL, P_NONE, NULL, NULL,0} -@@ -384,9 +423,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global +@@ -383,9 +422,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global FN_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_comment, comment) @@ -1028,7 +1028,7 @@ See the newly-created file "instructions" for more info. FN_LOCAL_STRING(lp_filter, filter) FN_LOCAL_STRING(lp_gid, gid) FN_LOCAL_STRING(lp_hosts_allow, hosts_allow) -@@ -404,14 +450,20 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf +@@ -403,14 +449,20 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec) FN_LOCAL_STRING(lp_refuse_options, refuse_options) FN_LOCAL_STRING(lp_secrets_file, secrets_file) @@ -1051,7 +1051,7 @@ See the newly-created file "instructions" for more info. FN_LOCAL_BOOL(lp_list, list) --- old/log.c +++ new/log.c -@@ -95,7 +95,7 @@ struct { +@@ -94,7 +94,7 @@ struct { /* * Map from rsync error code to name, or return NULL. */ @@ -1062,7 +1062,7 @@ See the newly-created file "instructions" for more info. for (i = 0; rerr_names[i].name; i++) { --- old/receiver.c +++ new/receiver.c -@@ -110,6 +110,10 @@ int get_tmpname(char *fnametmp, char *fn +@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, char *fn if (maxname < 1) { rprintf(FERROR, "temporary filename too long: %s\n", fname); @@ -1073,7 +1073,7 @@ See the newly-created file "instructions" for more info. fnametmp[0] = '\0'; return 0; } -@@ -173,6 +177,10 @@ static int receive_data(int f_in, char * +@@ -174,6 +178,10 @@ static int receive_data(int f_in, char * if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) { rsyserr(FERROR, errno, "lseek of %s returned %.0f, not %.0f", full_fname(fname), (double)j, (double)offset); @@ -1084,7 +1084,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_FILEIO); } } -@@ -230,6 +238,11 @@ static int receive_data(int f_in, char * +@@ -231,6 +239,11 @@ static int receive_data(int f_in, char * "lseek of %s returned %.0f, not %.0f", full_fname(fname), (double)pos, (double)offset); @@ -1096,7 +1096,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_FILEIO); } continue; -@@ -255,6 +268,9 @@ static int receive_data(int f_in, char * +@@ -256,6 +269,9 @@ static int receive_data(int f_in, char * report_write_error: rsyserr(FERROR, errno, "write failed on %s", full_fname(fname)); @@ -1106,7 +1106,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_FILEIO); } -@@ -298,6 +314,12 @@ static void handle_delayed_updates(char +@@ -299,6 +315,12 @@ static void handle_delayed_updates(char rsyserr(FERROR, errno, "rename failed for %s (from %s)", full_fname(fname), partialptr); @@ -1119,7 +1119,7 @@ See the newly-created file "instructions" for more info. } else { if (remove_source_files || (preserve_hard_links && F_IS_HLINKED(file))) -@@ -431,6 +453,9 @@ int recv_files(int f_in, char *local_nam +@@ -447,6 +469,9 @@ int recv_files(int f_in, char *local_nam if (server_filter_list.head && check_filter(&server_filter_list, fname, 0) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); @@ -1129,7 +1129,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_PROTOCOL); } -@@ -487,6 +512,11 @@ int recv_files(int f_in, char *local_nam +@@ -503,6 +528,11 @@ int recv_files(int f_in, char *local_nam rprintf(FERROR, "invalid basis_dir index: %d.\n", fnamecmp_type); @@ -1141,7 +1141,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -@@ -535,6 +565,9 @@ int recv_files(int f_in, char *local_nam +@@ -551,6 +581,9 @@ int recv_files(int f_in, char *local_nam } else if (do_fstat(fd1,&st) != 0) { rsyserr(FERROR, errno, "fstat %s failed", full_fname(fnamecmp)); @@ -1151,7 +1151,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; -@@ -548,6 +581,9 @@ int recv_files(int f_in, char *local_nam +@@ -564,6 +597,9 @@ int recv_files(int f_in, char *local_nam */ rprintf(FERROR,"recv_files: %s is a directory\n", full_fname(fnamecmp)); @@ -1161,7 +1161,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; -@@ -571,6 +607,9 @@ int recv_files(int f_in, char *local_nam +@@ -596,6 +632,9 @@ int recv_files(int f_in, char *local_nam if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); @@ -1171,7 +1171,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -604,6 +643,10 @@ int recv_files(int f_in, char *local_nam +@@ -629,6 +668,10 @@ int recv_files(int f_in, char *local_nam if (fd2 == -1) { rsyserr(FERROR, errno, "mkstemp %s failed", full_fname(fnametmp)); @@ -1182,7 +1182,7 @@ See the newly-created file "instructions" for more info. discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -624,12 +667,19 @@ int recv_files(int f_in, char *local_nam +@@ -649,12 +692,19 @@ int recv_files(int f_in, char *local_nam fname, fd2, F_LENGTH(file)); log_item(log_code, file, &initial_stats, iflags, NULL); @@ -1202,7 +1202,7 @@ See the newly-created file "instructions" for more info. exit_cleanup(RERR_FILEIO); } -@@ -686,6 +736,12 @@ int recv_files(int f_in, char *local_nam +@@ -711,6 +761,12 @@ int recv_files(int f_in, char *local_nam rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", errstr, fname, keptstr, redostr); @@ -1213,11 +1213,11 @@ See the newly-created file "instructions" for more info. + keptstr, redostr); +#endif } - if (!phase || incremental) { + if (!redoing) { send_msg_int(MSG_REDO, ndx); --- old/sender.c +++ new/sender.c -@@ -326,6 +326,9 @@ void send_files(int f_in, int f_out) +@@ -341,6 +341,9 @@ void send_files(int f_in, int f_out) end_progress(st.st_size); log_item(log_code, file, &initial_stats, iflags, NULL); diff --git a/links-depth.diff b/links-depth.diff index eda904d..fda452d 100644 --- a/links-depth.diff +++ b/links-depth.diff @@ -14,15 +14,15 @@ To use this patch, run these commands for a successful build: --- old/flist.c +++ new/flist.c -@@ -43,6 +43,7 @@ extern int one_file_system; - extern int copy_dirlinks; - extern int keep_dirlinks; +@@ -45,6 +45,7 @@ extern int keep_dirlinks; + extern int preserve_acls; + extern int preserve_xattrs; extern int preserve_links; +extern int follow_links_depth; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; -@@ -852,6 +853,30 @@ static struct file_struct *recv_file_ent +@@ -900,6 +901,30 @@ static struct file_struct *recv_file_ent return file; } @@ -53,7 +53,7 @@ To use this patch, run these commands for a successful build: /** * Create a file_struct for a named file by reading its stat() * information and performing extensive checks against global -@@ -994,7 +1019,13 @@ struct file_struct *make_file(const char +@@ -1042,7 +1067,13 @@ struct file_struct *make_file(const char basename_len = strlen(basename) + 1; /* count the '\0' */ #ifdef SUPPORT_LINKS @@ -70,15 +70,15 @@ To use this patch, run these commands for a successful build: #endif --- old/options.c +++ new/options.c -@@ -46,6 +46,7 @@ int keep_dirlinks = 0; +@@ -45,6 +45,7 @@ int keep_dirlinks = 0; int copy_dirlinks = 0; int copy_links = 0; int preserve_links = 0; +int follow_links_depth = 0; int preserve_hard_links = 0; - int preserve_perms = 0; - int preserve_executability = 0; -@@ -293,6 +294,7 @@ void usage(enum logcode F) + int preserve_acls = 0; + int preserve_xattrs = 0; +@@ -303,6 +304,7 @@ void usage(enum logcode F) rprintf(F," --append append data onto shorter files\n"); rprintf(F," -d, --dirs transfer directories without recursing\n"); rprintf(F," -l, --links copy symlinks as symlinks\n"); @@ -86,7 +86,7 @@ To use this patch, run these commands for a successful build: rprintf(F," -L, --copy-links transform symlink into referent file/dir\n"); rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n"); rprintf(F," --safe-links ignore symlinks that point outside the source tree\n"); -@@ -444,6 +446,7 @@ static struct poptOption long_options[] +@@ -470,6 +472,7 @@ static struct poptOption long_options[] {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 }, {"no-links", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, {"no-l", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index b89ebbb..dba7ebd 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -32,7 +32,7 @@ To use this patch, run these commands for a successful build: --- old/generator.c +++ new/generator.c -@@ -61,6 +61,7 @@ extern int append_mode; +@@ -62,6 +62,7 @@ extern int append_mode; extern int make_backups; extern int csum_length; extern int ignore_times; @@ -40,7 +40,7 @@ To use this patch, run these commands for a successful build: extern int size_only; extern OFF_T max_size; extern OFF_T min_size; -@@ -571,7 +572,7 @@ void itemize(struct file_struct *file, i +@@ -618,7 +619,7 @@ void itemize(const char *fnamecmp, struc /* Perform our quick-check heuristic for determining if a file is unchanged. */ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { @@ -51,7 +51,7 @@ To use this patch, run these commands for a successful build: /* if always checksum is set then we use the checksum instead --- old/main.c +++ new/main.c -@@ -128,7 +128,7 @@ pid_t wait_process(pid_t pid, int *statu +@@ -127,7 +127,7 @@ pid_t wait_process(pid_t pid, int *statu } /* Wait for a process to exit, calling io_flush while waiting. */ @@ -62,7 +62,7 @@ To use this patch, run these commands for a successful build: int status; --- old/options.c +++ new/options.c -@@ -99,6 +99,7 @@ int keep_partial = 0; +@@ -101,6 +101,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; int size_only = 0; @@ -70,7 +70,7 @@ To use this patch, run these commands for a successful build: int daemon_bwlimit = 0; int bwlimit = 0; int fuzzy_basis = 0; -@@ -150,6 +151,8 @@ char *logfile_name = NULL; +@@ -152,6 +153,8 @@ char *logfile_name = NULL; char *logfile_format = NULL; char *stdout_format = NULL; char *password_file = NULL; @@ -79,7 +79,7 @@ To use this patch, run these commands for a successful build: char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; char backup_dir_buf[MAXPATHLEN]; -@@ -340,6 +343,7 @@ void usage(enum logcode F) +@@ -356,6 +359,7 @@ void usage(enum logcode F) rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); rprintf(F," --size-only skip files that match in size\n"); @@ -87,7 +87,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); -@@ -377,6 +381,8 @@ void usage(enum logcode F) +@@ -393,6 +397,8 @@ void usage(enum logcode F) rprintf(F," --write-batch=FILE write a batched update to FILE\n"); rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n"); rprintf(F," --read-batch=FILE read a batched update from FILE\n"); @@ -96,7 +96,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --protocol=NUM force an older protocol version to be used\n"); #ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); -@@ -460,6 +466,7 @@ static struct poptOption long_options[] +@@ -486,6 +492,7 @@ static struct poptOption long_options[] {"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, @@ -104,7 +104,7 @@ To use this patch, run these commands for a successful build: {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, -@@ -539,6 +546,8 @@ static struct poptOption long_options[] +@@ -565,6 +572,8 @@ static struct poptOption long_options[] {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, {"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 }, {"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 }, @@ -113,7 +113,7 @@ To use this patch, run these commands for a successful build: {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 }, -@@ -1416,6 +1425,16 @@ int parse_arguments(int *argc, const cha +@@ -1467,6 +1476,16 @@ int parse_arguments(int *argc, const cha } } @@ -130,7 +130,7 @@ To use this patch, run these commands for a successful build: if (files_from) { char *h, *p; int q; -@@ -1692,6 +1711,25 @@ void server_options(char **args,int *arg +@@ -1751,6 +1770,25 @@ void server_options(char **args,int *arg args[ac++] = "--size-only"; } @@ -158,7 +158,7 @@ To use this patch, run these commands for a successful build: goto oom; --- old/pipe.c +++ new/pipe.c -@@ -165,3 +165,77 @@ pid_t local_child(int argc, char **argv, +@@ -164,3 +164,77 @@ pid_t local_child(int argc, char **argv, return pid; } @@ -238,7 +238,7 @@ To use this patch, run these commands for a successful build: +} --- old/receiver.c +++ new/receiver.c -@@ -52,6 +52,7 @@ extern struct stats stats; +@@ -54,6 +54,7 @@ extern struct stats stats; extern char *tmpdir; extern char *partial_dir; extern char *basis_dir[]; @@ -246,16 +246,16 @@ To use this patch, run these commands for a successful build: extern struct file_list *cur_flist, *first_flist; extern struct filter_list_struct server_filter_list; -@@ -349,6 +350,8 @@ int recv_files(int f_in, char *local_nam - enum logcode log_code = log_before_transfer ? FLOG : FINFO; - int max_phase = protocol_version >= 29 ? 2 : 1; +@@ -355,6 +356,8 @@ int recv_files(int f_in, char *local_nam + const char *parent_dirname = ""; + #endif int ndx, recv_ok; + pid_t pid = 0; + char *filter_argv[MAX_FILTER_ARGS + 1]; if (verbose > 2) rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->count); -@@ -358,6 +361,23 @@ int recv_files(int f_in, char *local_nam +@@ -364,6 +367,23 @@ int recv_files(int f_in, char *local_nam updating_basis = inplace; @@ -279,7 +279,7 @@ To use this patch, run these commands for a successful build: while (1) { cleanup_disable(); -@@ -620,6 +640,9 @@ int recv_files(int f_in, char *local_nam +@@ -644,6 +664,9 @@ int recv_files(int f_in, char *local_nam else if (!am_server && verbose && do_progress) rprintf(FINFO, "%s\n", fname); @@ -289,7 +289,7 @@ To use this patch, run these commands for a successful build: /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, F_LENGTH(file)); -@@ -634,6 +657,16 @@ int recv_files(int f_in, char *local_nam +@@ -658,6 +681,16 @@ int recv_files(int f_in, char *local_nam exit_cleanup(RERR_FILEIO); } @@ -308,7 +308,7 @@ To use this patch, run these commands for a successful build: if (partialptr == fname) --- old/rsync.h +++ new/rsync.h -@@ -119,6 +119,7 @@ +@@ -120,6 +120,7 @@ #define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 @@ -318,7 +318,7 @@ To use this patch, run these commands for a successful build: --- old/rsync.yo +++ new/rsync.yo -@@ -361,6 +361,7 @@ to the detailed description below for a +@@ -363,6 +363,7 @@ to the detailed description below for a --timeout=TIME set I/O timeout in seconds -I, --ignore-times don't skip files that match size and time --size-only skip files that match in size @@ -326,7 +326,7 @@ To use this patch, run these commands for a successful build: --modify-window=NUM compare mod-times with reduced accuracy -T, --temp-dir=DIR create temporary files in directory DIR -y, --fuzzy find similar file for basis if no dest file -@@ -398,6 +399,8 @@ to the detailed description below for a +@@ -400,6 +401,8 @@ to the detailed description below for a --write-batch=FILE write a batched update to FILE --only-write-batch=FILE like --write-batch but w/o updating dest --read-batch=FILE read a batched update from FILE @@ -335,7 +335,7 @@ To use this patch, run these commands for a successful build: --protocol=NUM force an older protocol version to be used --checksum-seed=NUM set block/file checksum seed (advanced) -4, --ipv4 prefer IPv4 -@@ -1804,6 +1807,33 @@ file previously generated by bf(--write- +@@ -1823,6 +1826,33 @@ file previously generated by bf(--write- If em(FILE) is bf(-), the batch data will be read from standard input. See the "BATCH MODE" section for details. @@ -371,7 +371,7 @@ To use this patch, run these commands for a successful build: version of rsync. For instance, if rsync 2.6.4 is being used with the --- old/sender.c +++ new/sender.c -@@ -42,6 +42,7 @@ extern int do_progress; +@@ -43,6 +43,7 @@ extern int do_progress; extern int inplace; extern int batch_fd; extern int write_batch; @@ -379,7 +379,7 @@ To use this patch, run these commands for a successful build: extern struct stats stats; extern struct file_list *cur_flist, *first_flist; -@@ -175,6 +176,26 @@ void send_files(int f_in, int f_out) +@@ -181,6 +182,26 @@ void send_files(int f_in, int f_out) enum logcode log_code = log_before_transfer ? FLOG : FINFO; int f_xfer = write_batch < 0 ? batch_fd : f_out; int ndx, j; @@ -406,7 +406,7 @@ To use this patch, run these commands for a successful build: if (verbose > 2) rprintf(FINFO, "send_files starting\n"); -@@ -265,6 +286,7 @@ void send_files(int f_in, int f_out) +@@ -281,6 +302,7 @@ void send_files(int f_in, int f_out) exit_cleanup(RERR_PROTOCOL); } @@ -414,7 +414,7 @@ To use this patch, run these commands for a successful build: fd = do_open(fname, O_RDONLY, 0); if (fd == -1) { if (errno == ENOENT) { -@@ -295,6 +317,33 @@ void send_files(int f_in, int f_out) +@@ -311,6 +333,33 @@ void send_files(int f_in, int f_out) exit_cleanup(RERR_PROTOCOL); } @@ -448,7 +448,7 @@ To use this patch, run these commands for a successful build: if (st.st_size) { int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE); mbuf = map_file(fd, st.st_size, read_size, s->blength); -@@ -336,6 +385,8 @@ void send_files(int f_in, int f_out) +@@ -352,6 +401,8 @@ void send_files(int f_in, int f_out) } } close(fd); diff --git a/time-limit.diff b/time-limit.diff index 9d43c89..55c7086 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -11,7 +11,7 @@ To use this patch, run these commands for a successful build: --- old/io.c +++ new/io.c -@@ -53,6 +53,7 @@ extern int remove_source_files; +@@ -52,6 +52,7 @@ extern int remove_source_files; extern int preserve_hard_links; extern char *filesfrom_host; extern struct stats stats; @@ -19,7 +19,7 @@ To use this patch, run these commands for a successful build: extern struct file_list *cur_flist, *first_flist; const char phase_unknown[] = "unknown"; -@@ -173,16 +174,24 @@ static void check_timeout(void) +@@ -172,16 +173,24 @@ static void check_timeout(void) { time_t t; @@ -49,7 +49,7 @@ To use this patch, run these commands for a successful build: rprintf(FERROR, "io timeout after %d seconds -- exiting\n", --- old/options.c +++ new/options.c -@@ -106,6 +106,7 @@ size_t bwlimit_writemax = 0; +@@ -108,6 +108,7 @@ size_t bwlimit_writemax = 0; int ignore_existing = 0; int ignore_non_existing = 0; int need_messages_from_generator = 0; @@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build: int max_delete = -1; OFF_T max_size = 0; OFF_T min_size = 0; -@@ -374,6 +375,8 @@ void usage(enum logcode F) +@@ -390,6 +391,8 @@ void usage(enum logcode F) rprintf(F," --password-file=FILE read daemon-access password from FILE\n"); rprintf(F," --list-only list the files instead of copying them\n"); rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n"); @@ -66,7 +66,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --write-batch=FILE write a batched update to FILE\n"); rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n"); rprintf(F," --read-batch=FILE read a batched update from FILE\n"); -@@ -395,7 +398,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -411,7 +414,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, @@ -75,7 +75,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -514,6 +517,8 @@ static struct poptOption long_options[] +@@ -540,6 +543,8 @@ static struct poptOption long_options[] {"log-format", 0, POPT_ARG_STRING, &stdout_format, 0, 0, 0 }, /* DEPRECATED */ {"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, @@ -84,9 +84,9 @@ To use this patch, run these commands for a successful build: {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, -@@ -1093,6 +1098,36 @@ int parse_arguments(int *argc, const cha - usage(FINFO); - exit_cleanup(0); +@@ -1148,6 +1153,36 @@ int parse_arguments(int *argc, const cha + return 0; + #endif + case OPT_STOP_AT: + arg = poptGetOptArg(pc); @@ -121,7 +121,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1656,6 +1691,15 @@ void server_options(char **args,int *arg +@@ -1715,6 +1750,15 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build: args[ac++] = backup_dir; --- old/rsync.yo +++ new/rsync.yo -@@ -395,6 +395,8 @@ to the detailed description below for a +@@ -397,6 +397,8 @@ to the detailed description below for a --password-file=FILE read daemon-access password from FILE --list-only list the files instead of copying them --bwlimit=KBPS limit I/O bandwidth; KBytes per second @@ -148,7 +148,7 @@ To use this patch, run these commands for a successful build: --write-batch=FILE write a batched update to FILE --only-write-batch=FILE like --write-batch but w/o updating dest --read-batch=FILE read a batched update from FILE -@@ -1748,6 +1750,19 @@ transfer was too fast, it will wait befo +@@ -1797,6 +1799,19 @@ transfer was too fast, it will wait befo result is an average transfer rate equaling the specified limit. A value of zero specifies no limit. @@ -170,7 +170,7 @@ To use this patch, run these commands for a successful build: section for details, and also the bf(--only-write-batch) option. --- old/util.c +++ new/util.c -@@ -121,6 +121,133 @@ NORETURN void overflow_exit(const char * +@@ -120,6 +120,133 @@ NORETURN void overflow_exit(const char * exit_cleanup(RERR_MALLOC); } -- 2.34.1