--- old/clientserver.c
+++ new/clientserver.c
-@@ -927,6 +927,13 @@ int daemon_main(void)
+@@ -952,6 +952,13 @@ int daemon_main(void)
* address too. In fact, why not just do inet_ntop on the
* local address??? */
}
--- old/configure.in
+++ new/configure.in
-@@ -641,6 +641,29 @@ if test $rsync_cv_can_hardlink_special =
+@@ -625,6 +625,29 @@ if test $rsync_cv_can_hardlink_special =
AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
fi
FN_LOCAL_STRING(lp_comment, comment)
--- old/main.c
+++ new/main.c
-@@ -1125,6 +1125,18 @@ static int start_client(int argc, char *
+@@ -1139,6 +1139,18 @@ static int start_client(int argc, char *
if (!read_batch) { /* for read_batch, NO source is specified */
char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
--- old/rsync.h
+++ new/rsync.h
-@@ -182,6 +182,9 @@
+@@ -183,6 +183,10 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
+/* this is the minimum we'll use, irrespective of config setting */
+/* definately don't set to less than about 30 seconds */
+#define SLP_MIN_TIMEOUT 120
-
- /* Log-message categories. Only FERROR and FINFO get sent over the socket,
- * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
++
+ #define CFN_KEEP_LEADING_DOT_DIR (1<<0)
+ #define CFN_KEEP_TRAILING_SLASH (1<<1)
+ #define CFN_DROP_TRAILING_DOT_DIR (1<<2)
--- old/rsync.yo
+++ new/rsync.yo
-@@ -145,7 +145,12 @@ particular rsync daemon by leaving off t
+@@ -144,7 +144,12 @@ particular rsync daemon by leaving off t
quote(tt(rsync somehost.mydomain.com::))
+
--- old/rsyncd.conf.yo
+++ new/rsyncd.conf.yo
-@@ -103,6 +103,15 @@ details on some of the options you may b
+@@ -104,6 +104,15 @@ details on some of the options you may b
special socket options are set. These settings are superseded by the
bf(--sockopts) command-line option.
enddit()
-@@ -565,6 +574,7 @@ use chroot = no
+@@ -566,6 +575,7 @@ use chroot = no
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -619,7 +620,7 @@ void itemize(const char *fnamecmp, struc
+@@ -624,7 +625,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)
{
/* if always checksum is set then we use the checksum instead
--- old/main.c
+++ new/main.c
-@@ -133,7 +133,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -134,7 +134,7 @@ pid_t wait_process(pid_t pid, int *statu
}
/* Wait for a process to exit, calling io_flush while waiting. */
{"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 },
-@@ -1577,6 +1586,16 @@ int parse_arguments(int *argc_p, const c
+@@ -1576,6 +1585,16 @@ int parse_arguments(int *argc_p, const c
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1897,6 +1916,25 @@ void server_options(char **args, int *ar
+@@ -1893,6 +1912,25 @@ void server_options(char **args, int *ar
}
}
goto oom;
--- old/pipe.c
+++ new/pipe.c
-@@ -164,3 +164,77 @@ pid_t local_child(int argc, char **argv,
+@@ -167,3 +167,77 @@ pid_t local_child(int argc, char **argv,
return pid;
}
extern char *partial_dir;
extern char *basis_dir[];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -357,6 +358,8 @@ int recv_files(int f_in, char *local_nam
+@@ -394,6 +395,8 @@ int recv_files(int f_in, char *local_nam
const char *parent_dirname = "";
#endif
int ndx, recv_ok;
if (verbose > 2)
rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -366,6 +369,23 @@ int recv_files(int f_in, char *local_nam
-
- updating_basis = inplace;
+@@ -401,6 +404,23 @@ int recv_files(int f_in, char *local_nam
+ if (delay_updates)
+ delayed_bits = bitbag_create(cur_flist->used + 1);
+ if (dest_filter) {
+ char *p;
while (1) {
cleanup_disable();
-@@ -663,6 +683,9 @@ int recv_files(int f_in, char *local_nam
+@@ -665,6 +685,9 @@ int recv_files(int f_in, char *local_nam
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, F_LENGTH(file));
-@@ -677,6 +700,16 @@ int recv_files(int f_in, char *local_nam
+@@ -679,6 +702,16 @@ int recv_files(int f_in, char *local_nam
exit_cleanup(RERR_FILEIO);
}
if (partialptr == fname)
--- old/rsync.h
+++ new/rsync.h
-@@ -128,6 +128,7 @@
+@@ -129,6 +129,7 @@
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
--- old/rsync.yo
+++ new/rsync.yo
-@@ -386,6 +386,7 @@ to the detailed description below for a
+@@ -381,6 +381,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
--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
-@@ -425,6 +426,8 @@ to the detailed description below for a
+@@ -420,6 +421,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
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filesnames
--checksum-seed=NUM set block/file checksum seed (advanced)
-@@ -1959,6 +1962,33 @@ file previously generated by bf(--write-
+@@ -1986,6 +1989,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.
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff