if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c 2005-02-20 00:02:22
+--- orig/clientserver.c 2005-02-27 07:33:41
+++ clientserver.c 2004-07-03 20:22:18
@@ -354,6 +354,9 @@ static int rsync_module(int f_in, int f_
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
} else {
rprintf(FLOG, "rsync %s %s from %s (%s)\n",
am_sender ? "on" : "to",
---- orig/configure.in 2005-02-22 00:53:58
+--- orig/configure.in 2005-02-25 18:44:31
+++ configure.in 2004-07-03 20:22:18
@@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
[ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)],
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_STRING(lp_uid, uid)
---- orig/log.c 2005-02-21 07:28:59
+--- orig/log.c 2005-02-26 05:22:50
+++ log.c 2004-07-03 20:22:18
-@@ -80,7 +80,7 @@ struct {
+@@ -81,7 +81,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
*/
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c 2005-02-23 02:57:26
+--- orig/main.c 2005-02-27 07:33:41
+++ main.c 2004-07-03 20:22:18
@@ -139,6 +139,9 @@ static void report(int f)
if (f == -1 || !am_sender)
return;
}
---- orig/receiver.c 2005-02-20 20:55:51
+--- orig/receiver.c 2005-02-26 19:27:54
+++ receiver.c 2005-02-16 15:40:15
-@@ -626,6 +626,9 @@ int recv_files(int f_in, struct file_lis
+@@ -607,6 +607,9 @@ int recv_files(int f_in, struct file_lis
if (!log_before_transfer)
log_recv(file, &initial_stats, iflags);
if (fd1 != -1)
close(fd1);
---- orig/sender.c 2005-02-23 02:57:27
+--- orig/sender.c 2005-02-26 03:22:59
+++ sender.c 2005-02-16 15:40:44
-@@ -294,6 +294,9 @@ void send_files(struct file_list *flist,
+@@ -301,6 +301,9 @@ void send_files(struct file_list *flist,
match_sums(f_out, s, mbuf, st.st_size);
if (!log_before_transfer)
log_send(file, &initial_stats, iflags);
free(file);
if (verbose > 1) {
---- orig/configure.in 2005-02-22 00:53:58
+--- orig/configure.in 2005-02-25 18:44:31
+++ configure.in 2004-08-19 19:53:27
@@ -467,6 +467,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CHECK_LIB(resolv, strcasecmp)
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2005-02-23 02:57:26
+--- orig/flist.c 2005-02-26 19:27:54
+++ flist.c 2005-02-14 02:45:34
-@@ -979,6 +979,8 @@ void send_file_name(int f, struct file_l
+@@ -971,6 +971,8 @@ void send_file_name(int f, struct file_l
file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (!file)
return;
maybe_emit_filelist_progress(flist);
-@@ -987,6 +989,10 @@ void send_file_name(int f, struct file_l
+@@ -979,6 +981,10 @@ void send_file_name(int f, struct file_l
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
}
if (recursive && S_ISDIR(file->mode)
-@@ -1297,6 +1303,8 @@ struct file_list *recv_file_list(int f)
+@@ -1293,6 +1299,8 @@ struct file_list *recv_file_list(int f)
flags |= read_byte(f) << 8;
file = receive_file_entry(flist, flags, f);
if (S_ISREG(file->mode))
stats.total_size += file->length;
-@@ -1319,6 +1327,8 @@ struct file_list *recv_file_list(int f)
+@@ -1315,6 +1323,8 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
if (f >= 0) {
/* Now send the uid/gid list. This was introduced in
* protocol version 15 */
---- orig/generator.c 2005-02-23 02:57:26
+--- orig/generator.c 2005-02-27 07:50:58
+++ generator.c 2005-02-20 00:02:51
-@@ -491,6 +491,10 @@ static void recv_generator(char *fname,
+@@ -686,6 +686,10 @@ static void recv_generator(char *fname,
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", safe_fname(fname));
+#endif
if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(flist, fname, file);
+ delete_in_dir(flist, fname, file, allowed_lull);
--- orig/lib/sysacls.c 2004-10-20 15:35:58
+++ lib/sysacls.c 2004-10-20 15:35:58
@@ -0,0 +1,3217 @@
next;
}
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2005-02-14 02:46:05
@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
int preserve_uid = 0;
-@@ -177,6 +178,7 @@ static void print_rsync_version(enum log
+@@ -178,6 +179,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -193,6 +195,10 @@ static void print_rsync_version(enum log
+@@ -194,6 +196,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -207,9 +213,9 @@ static void print_rsync_version(enum log
+@@ -208,9 +214,9 @@ static void print_rsync_version(enum log
"Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -279,6 +285,7 @@ void usage(enum logcode F)
+@@ -280,6 +286,7 @@ void usage(enum logcode F)
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -p, --perms preserve permissions\n");
rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
-@@ -401,6 +408,7 @@ static struct poptOption long_options[]
+@@ -402,6 +409,7 @@ static struct poptOption long_options[]
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
{"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
{"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
{"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
-@@ -852,6 +860,24 @@ int parse_arguments(int *argc, const cha
+@@ -854,6 +862,24 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1258,6 +1284,8 @@ void server_options(char **args,int *arg
+@@ -1259,6 +1285,8 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_uid)
argstr[x++] = 'o';
if (preserve_gid)
---- orig/rsync.c 2005-02-21 10:51:52
+--- orig/rsync.c 2005-02-25 18:44:31
+++ rsync.c 2004-07-03 20:11:58
-@@ -137,6 +137,14 @@ int set_perms(char *fname,struct file_st
+@@ -138,6 +138,14 @@ int set_perms(char *fname,struct file_st
}
#endif
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2005-02-23 02:57:27
+--- orig/rsync.yo 2005-02-26 05:22:51
+++ rsync.yo 2004-07-03 20:11:58
@@ -317,6 +317,7 @@ to the detailed description below for a
-H, --hard-links preserve hard links
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- orig/generator.c 2005-02-26 19:27:54
+--- orig/generator.c 2005-02-27 07:50:58
+++ generator.c 2004-11-03 23:02:12
@@ -364,7 +364,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
+ deleting = 0;
+ return ret;
+}
---- orig/generator.c 2005-02-26 19:27:54
+--- orig/generator.c 2005-02-27 07:50:58
+++ generator.c 2005-02-26 19:31:06
@@ -82,16 +82,23 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
[Patched update to have context and apply to latest CVS source.]
---- orig/generator.c 2005-02-23 02:57:26
+--- orig/generator.c 2005-02-27 07:50:58
+++ generator.c 2004-11-11 22:15:27
-@@ -49,6 +49,7 @@ extern int inplace;
+@@ -54,6 +54,7 @@ extern int inplace;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
extern int io_timeout;
-@@ -134,6 +135,8 @@ static void itemize(struct file_struct *
+@@ -346,6 +347,8 @@ static void itemize(struct file_struct *
/* 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)
{
if (st->st_size != file->length)
return 0;
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2005-01-28 19:14:15
-@@ -88,6 +88,7 @@ int keep_partial = 0;
+@@ -89,6 +89,7 @@ int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -312,6 +313,7 @@ void usage(enum logcode F)
+@@ -313,6 +314,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");
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");
-@@ -367,6 +369,7 @@ static struct poptOption long_options[]
+@@ -368,6 +370,7 @@ static struct poptOption long_options[]
{"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
-@@ -1372,6 +1375,9 @@ void server_options(char **args,int *arg
+@@ -1373,6 +1376,9 @@ void server_options(char **args,int *arg
if (size_only)
args[ac++] = "--size-only";
if (modify_window_set) {
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
---- orig/rsync.yo 2005-02-23 02:57:27
+--- orig/rsync.yo 2005-02-26 05:22:51
+++ rsync.yo 2005-02-11 22:49:10
@@ -350,6 +350,7 @@ to the detailed description below for a
--timeout=TIME set I/O timeout in seconds
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2005-02-26 19:27:54
+--- orig/generator.c 2005-02-27 07:50:58
+++ generator.c 2005-02-03 02:07:33
@@ -554,7 +554,13 @@ static int find_fuzzy(struct file_struct
* start sending checksums.
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- orig/main.c 2005-02-26 19:27:54
+--- orig/main.c 2005-02-27 07:33:41
+++ main.c 2004-07-22 00:31:47
-@@ -362,7 +362,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac
whole_file = 1;
ret = local_child(argc, args, f_in, f_out, child_main);
} else
This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2005-01-28 19:30:47
@@ -39,6 +39,7 @@ int make_backups = 0;
**/
int archive_mode = 0;
int keep_dirlinks = 0;
int copy_links = 0;
-@@ -308,6 +309,7 @@ void usage(enum logcode F)
+@@ -309,6 +310,7 @@ void usage(enum logcode F)
rprintf(F," --partial keep partially transferred files\n");
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
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");
-@@ -388,6 +390,7 @@ static struct poptOption long_options[]
+@@ -389,6 +391,7 @@ static struct poptOption long_options[]
{"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
{"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 },
{"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
{"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 },
-@@ -1420,6 +1423,9 @@ void server_options(char **args,int *arg
+@@ -1421,6 +1424,9 @@ void server_options(char **args,int *arg
args[ac++] = tmpdir;
}
if (basis_dir[0] && am_sender) {
/* the server only needs this option if it is not the sender,
* and it may be an older version that doesn't know this
---- orig/receiver.c 2005-02-20 20:55:51
+--- orig/receiver.c 2005-02-26 19:27:54
+++ receiver.c 2005-02-20 00:17:37
-@@ -38,6 +38,7 @@ extern int keep_dirlinks;
+@@ -37,6 +37,7 @@ extern int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
extern int io_error;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-@@ -312,6 +313,12 @@ static int receive_data(int f_in, char *
+@@ -289,6 +290,12 @@ static int receive_data(int f_in, char *
exit_cleanup(RERR_FILEIO);
}
case '?':
/* Match anything but '/'. */
if (*text == '/')
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2004-10-14 17:22:51
-@@ -99,6 +99,7 @@ int max_delete = 0;
+@@ -100,6 +100,7 @@ int max_delete = 0;
OFF_T max_size = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -328,6 +329,7 @@ void usage(enum logcode F)
+@@ -329,6 +330,7 @@ void usage(enum logcode F)
rprintf(F," --include-from=FILE read include patterns from FILE\n");
rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n");
rprintf(F," --version print version number\n");
rprintf(F," --port=PORT specify double-colon alternate port number\n");
rprintf(F," --blocking-io use blocking I/O for the remote shell\n");
-@@ -385,6 +387,7 @@ static struct poptOption long_options[]
+@@ -386,6 +388,7 @@ static struct poptOption long_options[]
{"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
{"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
{"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
{"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
-@@ -1384,6 +1387,9 @@ void server_options(char **args,int *arg
+@@ -1385,6 +1388,9 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
[last-match]
---- orig/exclude.c 2005-02-26 03:22:59
+--- orig/exclude.c 2005-02-27 07:34:13
+++ exclude.c 2005-02-26 03:22:20
@@ -73,6 +73,7 @@ static BOOL parent_dirscan = False;
static struct filter_struct **mergelist_parents;
+}
+
+#endif
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2005-02-14 02:52:09
-@@ -139,6 +139,7 @@ char *log_format = NULL;
+@@ -140,6 +140,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = 0;
int compare_dest = 0;
-@@ -317,6 +318,7 @@ void usage(enum logcode F)
+@@ -318,6 +319,7 @@ void usage(enum logcode F)
rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," -z, --compress compress file data during the transfer\n");
rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n");
rprintf(F," -f, --filter=RULE add a file-filtering RULE\n");
-@@ -356,7 +358,7 @@ void usage(enum logcode F)
+@@ -357,7 +359,7 @@ void usage(enum logcode F)
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -424,6 +426,7 @@ static struct poptOption long_options[]
+@@ -425,6 +427,7 @@ static struct poptOption long_options[]
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
-@@ -852,6 +855,21 @@ int parse_arguments(int *argc, const cha
+@@ -854,6 +857,21 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1432,6 +1450,11 @@ void server_options(char **args,int *arg
+@@ -1433,6 +1451,11 @@ void server_options(char **args,int *arg
}
}
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
---- orig/receiver.c 2005-02-20 20:55:51
+--- orig/receiver.c 2005-02-26 19:27:54
+++ receiver.c 2005-01-15 21:29:13
-@@ -52,6 +52,7 @@ extern int delay_updates;
+@@ -51,6 +51,7 @@ extern int delay_updates;
extern struct stats stats;
extern char *log_format;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -206,12 +207,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -183,12 +184,13 @@ static int get_tmpname(char *fnametmp, c
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -231,6 +233,9 @@ static int receive_data(int f_in, char *
+@@ -208,6 +210,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -247,6 +252,8 @@ static int receive_data(int f_in, char *
+@@ -224,6 +229,8 @@ static int receive_data(int f_in, char *
cleanup_got_literal = 1;
sum_update(data, i);
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
-@@ -273,6 +280,8 @@ static int receive_data(int f_in, char *
+@@ -250,6 +257,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (inplace) {
-@@ -313,6 +322,8 @@ static int receive_data(int f_in, char *
+@@ -290,6 +299,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -358,7 +369,7 @@ static void read_gen_name(int fd, char *
+@@ -335,7 +346,7 @@ static void read_gen_name(int fd, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
-@@ -621,8 +632,12 @@ int recv_files(int f_in, struct file_lis
+@@ -602,8 +613,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
if (!log_before_transfer)
log_recv(file, &initial_stats, iflags);
---- orig/rsync.c 2005-02-21 10:51:52
+--- orig/rsync.c 2005-02-25 18:44:31
+++ rsync.c 2005-02-21 11:04:36
-@@ -38,6 +38,7 @@ extern int recurse;
+@@ -39,6 +39,7 @@ extern int recurse;
extern int keep_dirlinks;
extern int make_backups;
extern struct stats stats;
/*
-@@ -188,7 +189,12 @@ void finish_transfer(char *fname, char *
+@@ -189,7 +190,12 @@ void finish_transfer(char *fname, char *
rprintf(FINFO, "renaming %s to %s\n",
safe_fname(fnametmp), safe_fname(fname));
}
#include "byteorder.h"
#include "lib/mdfour.h"
---- orig/rsync.yo 2005-02-23 02:57:27
+--- orig/rsync.yo 2005-02-26 05:22:51
+++ rsync.yo 2005-02-13 06:58:47
@@ -355,6 +355,7 @@ to the detailed description below for a
-y, --fuzzy find similar file for basis if no dest file
handle relative symlinks properly, and that has not yet been fixed
in this modified version.
---- orig/flist.c 2005-02-23 02:57:26
+--- orig/flist.c 2005-02-26 19:27:54
+++ flist.c 2004-07-16 16:58:04
@@ -47,6 +47,7 @@ extern int filesfrom_fd;
extern int one_file_system;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_devices;
-@@ -738,6 +739,30 @@ static struct file_struct *receive_file_
+@@ -730,6 +731,30 @@ static struct file_struct *receive_file_
}
/**
* Create a file_struct for a named file by reading its stat()
* information and performing extensive checks against global
-@@ -863,7 +888,13 @@ skip_filters:
+@@ -855,7 +880,13 @@ skip_filters:
basename_len = strlen(basename) + 1; /* count the '\0' */
#ifdef SUPPORT_LINKS
#else
linkname_len = 0;
#endif
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2005-01-28 19:33:24
@@ -43,6 +43,7 @@ int archive_mode = 0;
int keep_dirlinks = 0;
int preserve_hard_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
-@@ -273,6 +274,7 @@ void usage(enum logcode F)
+@@ -274,6 +275,7 @@ void usage(enum logcode F)
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
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");
-@@ -395,6 +397,7 @@ static struct poptOption long_options[]
+@@ -396,6 +398,7 @@ static struct poptOption long_options[]
{"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
{"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 },
{"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 },
{"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 },
{"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 },
{"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 },
---- orig/rsync.yo 2005-02-23 02:57:27
+--- orig/rsync.yo 2005-02-26 05:22:51
+++ rsync.yo 2005-01-28 19:33:40
@@ -311,6 +311,7 @@ to the detailed description below for a
--inplace update destination files in-place
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, safe_fname(file), line);
---- orig/clientserver.c 2005-02-20 00:02:22
+--- orig/clientserver.c 2005-02-27 07:33:41
+++ clientserver.c 2004-10-08 20:44:59
@@ -45,6 +45,9 @@ extern int select_timeout;
extern int orig_umask;
if (*line == '#') {
/* it's some sort of command that I don't understand */
io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
---- orig/configure.in 2005-02-22 00:53:58
+--- orig/configure.in 2005-02-25 18:44:31
+++ configure.in 2004-07-03 20:22:28
@@ -271,6 +271,21 @@ yes
AC_SEARCH_LIBS(getaddrinfo, inet6)
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c 2005-02-23 02:57:26
+--- orig/main.c 2005-02-27 07:33:41
+++ main.c 2004-10-08 20:15:28
@@ -56,6 +56,9 @@ extern int write_batch;
extern int batch_fd;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *files_from;
-@@ -838,33 +841,48 @@ static int start_client(int argc, char *
+@@ -857,33 +860,48 @@ static int start_client(int argc, char *
if ((rc = copy_argv(argv)))
return rc;
p = find_colon(argv[0]);
if (p) { /* source is remote */
if (remote_filesfrom_file
-@@ -896,12 +914,26 @@ static int start_client(int argc, char *
+@@ -915,12 +933,26 @@ static int start_client(int argc, char *
argv++;
} else { /* source is local */
am_sender = 1;
p = strchr(host,'/');
if (p) {
*p = '\0';
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2004-11-27 18:31:46
-@@ -154,6 +154,14 @@ int log_format_has_o_or_i = 0;
+@@ -155,6 +155,14 @@ int log_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -179,6 +187,7 @@ static void print_rsync_version(enum log
+@@ -180,6 +188,7 @@ static void print_rsync_version(enum log
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -201,6 +210,10 @@ static void print_rsync_version(enum log
+@@ -202,6 +211,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
-@@ -214,10 +227,10 @@ static void print_rsync_version(enum log
+@@ -215,10 +228,10 @@ static void print_rsync_version(enum log
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
* macros. */
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
-@@ -346,6 +359,13 @@ void usage(enum logcode F)
+@@ -347,6 +360,13 @@ void usage(enum logcode F)
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -356,7 +376,7 @@ void usage(enum logcode F)
+@@ -357,7 +377,7 @@ void usage(enum logcode F)
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -454,6 +474,13 @@ static struct poptOption long_options[]
+@@ -455,6 +475,13 @@ static struct poptOption long_options[]
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
#endif
/* All these options switch us into daemon-mode option-parsing. */
{"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
-@@ -852,6 +879,12 @@ int parse_arguments(int *argc, const cha
+@@ -854,6 +881,12 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1118,6 +1151,17 @@ int parse_arguments(int *argc, const cha
+@@ -1117,6 +1150,17 @@ int parse_arguments(int *argc, const cha
if (delay_updates && !partial_dir)
partial_dir = partialdir_for_delayupdate;
+ preserve_gid = 2;
+ }
}
---- orig/options.c 2005-02-23 02:57:26
+--- orig/options.c 2005-02-25 18:44:31
+++ options.c 2004-09-09 01:59:08
-@@ -401,8 +401,8 @@ static struct poptOption long_options[]
+@@ -402,8 +402,8 @@ static struct poptOption long_options[]
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
{"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
{"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
-@@ -742,6 +742,14 @@ int parse_arguments(int *argc, const cha
+@@ -744,6 +744,14 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
case 'v':
verbose++;
break;
-@@ -947,8 +955,8 @@ int parse_arguments(int *argc, const cha
+@@ -946,8 +954,8 @@ int parse_arguments(int *argc, const cha
#endif
preserve_perms = 1;
preserve_times = 1;
preserve_devices = 1;
}
-@@ -1258,10 +1266,16 @@ void server_options(char **args,int *arg
+@@ -1259,10 +1267,16 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_devices)
argstr[x++] = 'D';
if (preserve_times)
---- orig/rsync.c 2005-02-21 10:51:52
+--- orig/rsync.c 2005-02-25 18:44:31
+++ rsync.c 2005-02-01 10:46:04
@@ -27,7 +27,6 @@ extern int dry_run;
extern int daemon_log_format_has_i;
extern int am_server;
extern int am_sender;
extern int am_generator;
-@@ -81,7 +80,7 @@ int set_perms(char *fname,struct file_st
+@@ -82,7 +81,7 @@ int set_perms(char *fname,struct file_st
updated = 1;
}
Do we need configure support for mktime()?
---- orig/io.c 2005-02-26 03:22:59
+--- orig/io.c 2005-02-27 07:33:41
+++ io.c 2005-02-26 05:28:35
@@ -51,6 +51,7 @@ extern int eol_nulls;
extern int csum_length;
extern char *remote_filesfrom_file;
extern struct stats stats;
-@@ -138,16 +139,24 @@ static void check_timeout(void)
+@@ -137,16 +138,24 @@ static void check_timeout(void)
{
time_t t;