+}
+
+#endif /* SUPPORT_ACLS */
---- orig/backup.c 2004-10-06 00:12:15
+--- orig/backup.c 2005-01-19 20:11:10
+++ backup.c 2004-10-06 00:13:09
@@ -119,6 +119,7 @@ static int make_bak_dir(char *fullpath)
} else {
}
}
*p = '/';
-@@ -176,6 +177,8 @@ static int keep_backup(char *fname)
+@@ -171,6 +172,8 @@ static int keep_backup(char *fname)
if (!(buf = get_backup_name(fname)))
return 0;
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
-@@ -249,6 +252,7 @@ static int keep_backup(char *fname)
+@@ -244,6 +247,7 @@ static int keep_backup(char *fname)
}
}
set_perms(buf, file, NULL, 0);
free(file);
if (verbose > 1)
---- orig/configure.in 2004-10-06 00:12:16
+--- orig/configure.in 2005-01-10 00:21:12
+++ configure.in 2004-08-19 19:53:27
@@ -443,6 +443,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CHECK_LIB(resolv, strcasecmp)
dnl At the moment we don't test for a broken memcmp(), because all we
dnl need to do is test for equality, not comparison, and it seems that
dnl every platform has a memcmp that can do at least that.
-@@ -693,6 +698,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -718,6 +723,77 @@ AC_SUBST(OBJ_RESTORE)
AC_SUBST(CC_SHOBJ_FLAG)
AC_SUBST(BUILD_POPT)
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2004-09-21 09:40:27
+--- orig/flist.c 2005-01-24 00:18:21
+++ flist.c 2004-07-03 20:11:58
-@@ -966,6 +966,8 @@ void send_file_name(int f, struct file_l
+@@ -971,6 +971,8 @@ void send_file_name(int f, struct file_l
if (!file)
return;
maybe_emit_filelist_progress(flist);
-@@ -974,6 +976,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)
-@@ -1291,6 +1297,8 @@ struct file_list *recv_file_list(int f)
+@@ -1302,6 +1308,8 @@ struct file_list *recv_file_list(int f)
flags |= read_byte(f) << 8;
receive_file_entry(&flist->files[i], flags, flist, f);
if (S_ISREG(flist->files[i]->mode))
stats.total_size += flist->files[i]->length;
-@@ -1313,6 +1321,8 @@ struct file_list *recv_file_list(int f)
+@@ -1324,6 +1332,8 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
if (f != -1) {
/* Now send the uid/gid list. This was introduced in
* protocol version 15 */
---- orig/generator.c 2004-11-27 17:53:24
+--- orig/generator.c 2005-01-20 23:05:34
+++ generator.c 2004-07-03 20:11:58
-@@ -342,6 +342,10 @@ static void recv_generator(char *fname,
+@@ -311,6 +311,10 @@ static void recv_generator(char *fname,
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
next;
}
---- orig/options.c 2004-11-27 18:27:35
+--- orig/options.c 2005-01-24 00:18:21
+++ options.c 2004-08-19 17:38:57
@@ -43,6 +43,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
int preserve_uid = 0;
-@@ -159,6 +160,7 @@ static void print_rsync_version(enum log
+@@ -161,6 +162,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;
-@@ -175,6 +177,10 @@ static void print_rsync_version(enum log
+@@ -177,6 +179,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
#if SUPPORT_LINKS
links = "";
#endif
-@@ -189,9 +195,9 @@ static void print_rsync_version(enum log
+@@ -191,9 +197,9 @@ static void print_rsync_version(enum log
"Copyright (C) 1996-2004 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
-@@ -256,6 +262,7 @@ void usage(enum logcode F)
- rprintf(F," --safe-links ignore \"unsafe\" symlinks\n");
+@@ -259,6 +265,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," -A, --acls preserve ACLs (implies --perms)\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");
-@@ -361,6 +368,7 @@ static struct poptOption long_options[]
+@@ -366,6 +373,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 },
-@@ -749,6 +757,24 @@ int parse_arguments(int *argc, const cha
+@@ -747,6 +755,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 (opt-BASE is its index). */
-@@ -1072,6 +1098,8 @@ void server_options(char **args,int *arg
+@@ -1074,6 +1100,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 2004-09-07 21:45:30
+--- orig/rsync.c 2005-01-20 23:52:09
+++ rsync.c 2004-07-03 20:11:58
-@@ -207,6 +207,14 @@ int set_perms(char *fname,struct file_st
+@@ -234,6 +234,14 @@ int set_perms(char *fname,struct file_st
}
#endif
if (verbose > 1 && flags & PERMS_REPORT) {
if (updated)
rprintf(FINFO,"%s\n",fname);
---- orig/rsync.h 2004-11-27 17:53:24
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2004-07-03 20:11:58
-@@ -552,6 +552,40 @@ static inline int flist_up(struct file_l
+@@ -549,6 +549,40 @@ static inline int flist_up(struct file_l
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2004-11-27 17:53:24
+--- orig/rsync.yo 2005-01-24 00:18:21
+++ rsync.yo 2004-07-03 20:11:58
-@@ -326,6 +326,7 @@ verb(
- --safe-links ignore "unsafe" symlinks
+@@ -327,6 +327,7 @@ verb(
-H, --hard-links preserve hard links
+ -K, --keep-dirlinks treat symlinked dir on receiver as dir
-p, --perms preserve permissions
+ -A, --acls preserve ACLs (implies -p) [local option]
-o, --owner preserve owner (root only)
-g, --group preserve group
-D, --devices preserve devices (root only)
-@@ -594,6 +595,11 @@ source file's permissions and the umask
+@@ -613,6 +614,11 @@ source file's permissions and the umask
other files (including updated files) retain their existing permissions
(which is the same behavior as other file-copy utilities, such as cp).
- XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
+ add_exclude(&exclude_list, getenv("CVSIGNORE"), cvs_flags);
}
---- orig/flist.c 2005-01-22 22:48:52
+--- orig/flist.c 2005-01-24 00:18:21
+++ flist.c 2004-08-12 18:59:28
@@ -40,11 +40,10 @@ extern int module_id;
extern int ignore_errors;
-extern int cvs_exclude;
-
extern int recurse;
- extern int keep_dirs;
+ extern int xfer_dirs;
extern char curr_dir[MAXPATHLEN];
+extern unsigned int curr_dir_len;
extern int filesfrom_fd;
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
FN_LOCAL_STRING(lp_include, include)
---- orig/options.c 2005-01-23 01:45:43
+--- orig/options.c 2005-01-24 00:18:21
+++ options.c 2005-01-23 07:33:55
@@ -146,6 +146,7 @@ int list_only = 0;
char *batch_name = NULL;
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n");
rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n");
-@@ -323,7 +327,7 @@ void usage(enum logcode F)
+@@ -324,7 +328,7 @@ void usage(enum logcode F)
}
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
-@@ -345,6 +349,7 @@ static struct poptOption long_options[]
+@@ -346,6 +350,7 @@ static struct poptOption long_options[]
{"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
{"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
{"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
-@@ -397,6 +402,7 @@ static struct poptOption long_options[]
+@@ -398,6 +403,7 @@ static struct poptOption long_options[]
{"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 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 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
{"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
{"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
-@@ -618,10 +624,15 @@ int parse_arguments(int *argc, const cha
+@@ -619,10 +625,15 @@ int parse_arguments(int *argc, const cha
modify_window_set = 1;
break;
case OPT_INCLUDE:
add_exclude(&exclude_list, poptGetOptArg(pc),
XFLG_DEF_INCLUDE);
-@@ -639,8 +650,8 @@ int parse_arguments(int *argc, const cha
+@@ -640,8 +651,8 @@ int parse_arguments(int *argc, const cha
goto options_rejected;
}
add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS
break;
case 'h':
-@@ -664,6 +675,19 @@ int parse_arguments(int *argc, const cha
+@@ -665,6 +676,19 @@ int parse_arguments(int *argc, const cha
am_sender = 1;
break;
case 'P':
do_progress = 1;
keep_partial = 1;
-@@ -970,7 +994,7 @@ int parse_arguments(int *argc, const cha
+@@ -971,7 +995,7 @@ int parse_arguments(int *argc, const cha
partial_dir = NULL;
else if (*partial_dir != '/') {
add_exclude(&exclude_list, partial_dir,
};
struct exclude_list_struct {
---- orig/rsync.yo 2005-01-22 22:48:52
+--- orig/rsync.yo 2005-01-24 00:18:21
+++ rsync.yo 2005-01-21 19:56:38
-@@ -361,6 +361,9 @@ verb(
+@@ -362,6 +362,9 @@ verb(
-P equivalent to --partial --progress
-z, --compress compress file data
-C, --cvs-exclude auto ignore files in the same way CVS does
--exclude=PATTERN exclude files matching PATTERN
--exclude-from=FILE exclude patterns listed in FILE
--include=PATTERN don't exclude files matching PATTERN
-@@ -756,14 +759,41 @@ Finally, any file is ignored if it is in
+@@ -764,14 +767,41 @@ Finally, any file is ignored if it is in
.cvsignore file and matches one of the patterns listed therein.
See the bf(cvs(1)) manual for more information.
dit(bf(--exclude-from=FILE)) This option is similar to the --exclude
option, but instead it adds all exclude patterns listed in the file
-@@ -771,11 +801,11 @@ FILE to the exclude list. Blank lines i
+@@ -779,11 +809,11 @@ FILE to the exclude list. Blank lines i
';' or '#' are ignored.
If em(FILE) is bf(-) the list will be read from standard input.
dit(bf(--include-from=FILE)) This specifies a list of include patterns
from a file.
-@@ -820,7 +850,8 @@ was located on the remote "src" host.
+@@ -828,7 +858,8 @@ was located on the remote "src" host.
dit(bf(-0, --from0)) This tells rsync that the filenames it reads from a
file are terminated by a null ('\0') character, not a NL, CR, or CR+LF.
It does not affect --cvs-exclude (since all names read from a .cvsignore
file are split on whitespace).
-@@ -959,8 +990,8 @@ If the partial-dir value is not an absol
+@@ -967,8 +998,8 @@ If the partial-dir value is not an absol
will prevent partial-dir files from being transferred and also prevent the
untimely deletion of partial-dir items on the receiving side. An example:
the above --partial-dir option would add an "--exclude=.rsync-partial/"
rule for this directory exclusion somewhere higher up in the list so that
it has a high enough priority to be effective (e.g., if your rules specify
a trailing --exclude=* rule, the auto-added rule will be ineffective).
-@@ -1110,30 +1141,322 @@ page describing the options available fo
+@@ -1125,30 +1156,322 @@ page describing the options available fo
enddit()
Let's say that we want to match two source files, one with an absolute
path of "/home/me/foo/bar", and one with a path of "/home/you/bar/baz".
-@@ -1165,115 +1488,59 @@ verb(
+@@ -1180,115 +1503,59 @@ verb(
Target file: /dest/you/bar/baz
)
)
manpagesection(BATCH MODE)
-@@ -1442,7 +1709,7 @@ it. The most common cause is incorrectly
+@@ -1457,7 +1724,7 @@ it. The most common cause is incorrectly
scripts (such as .cshrc or .profile) that contain output statements
for non-interactive logins.
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2005-01-21 00:35:26
+--- orig/flist.c 2005-01-24 00:18:21
+++ flist.c 2005-01-21 19:10:03
@@ -64,6 +64,7 @@ extern int sanitize_paths;
extern int delete_excluded;
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1084,6 +1091,9 @@ struct file_list *send_file_list(int f,
+@@ -1087,6 +1094,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
+ init_fname_convert();
+
flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
- "send_file_list");
+ "send_file_list");
-@@ -1252,6 +1262,9 @@ struct file_list *send_file_list(int f,
+@@ -1262,6 +1272,9 @@ struct file_list *send_file_list(int f,
stats.num_files = flist->count;
}
if (verbose > 3)
output_flist(flist, f < 0 ? "delete" : who_am_i());
-@@ -1273,6 +1286,9 @@ struct file_list *recv_file_list(int f)
+@@ -1283,6 +1296,9 @@ struct file_list *recv_file_list(int f)
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
received_flist = flist;
-@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
+@@ -1336,6 +1352,9 @@ struct file_list *recv_file_list(int f)
io_error |= read_int(f);
}
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- orig/main.c 2005-01-17 23:11:45
+--- orig/main.c 2005-01-23 07:27:24
+++ main.c 2004-07-22 00:31:47
-@@ -334,7 +334,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -335,7 +335,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
if (dir)
free(dir);
---- orig/options.c 2005-01-20 23:05:34
+--- orig/options.c 2005-01-24 00:18:21
+++ options.c 2005-01-15 21:28:07
-@@ -126,6 +126,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -127,6 +127,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
char *config_file = NULL;
char *shell_cmd = NULL;
char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -290,6 +291,7 @@ void usage(enum logcode F)
+@@ -292,6 +293,7 @@ void usage(enum logcode F)
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n");
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
-@@ -385,6 +387,7 @@ static struct poptOption long_options[]
+@@ -389,6 +391,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
Be sure to run "make proto" before "make".
---- orig/generator.c 2005-01-18 23:14:23
+--- orig/generator.c 2005-01-23 07:55:40
+++ generator.c 2005-01-19 18:39:15
-@@ -46,6 +46,7 @@ extern int size_only;
+@@ -45,6 +45,7 @@ extern int size_only;
extern OFF_T max_size;
extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -226,6 +227,88 @@ static void generate_and_send_sums(int f
+@@ -225,6 +226,88 @@ static void generate_and_send_sums(int f
unmap_file(mapbuf);
}
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -478,6 +561,15 @@ static void recv_generator(char *fname,
+@@ -479,6 +562,15 @@ static void recv_generator(char *fname,
} else
partialptr = NULL;
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -506,6 +598,8 @@ static void recv_generator(char *fname,
+@@ -507,6 +599,8 @@ static void recv_generator(char *fname,
if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME)
set_perms(fname, file, &st, PERMS_REPORT);
-@@ -580,8 +674,24 @@ notify_others:
+@@ -581,8 +675,24 @@ notify_others:
write_int(f_out, i);
if (protocol_version >= 29 && inplace && !read_batch)
write_byte(f_out, fnamecmp_type);
if (dry_run || read_batch)
return;
---- orig/main.c 2005-01-18 21:56:05
+--- orig/main.c 2005-01-23 01:48:52
+++ main.c 2005-01-14 18:33:15
@@ -49,6 +49,7 @@ extern int keep_dirlinks;
extern int preserve_hard_links;
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
---- orig/options.c 2005-01-19 01:07:34
+--- orig/options.c 2005-01-23 01:53:35
+++ options.c 2005-01-15 21:08:13
-@@ -89,6 +89,7 @@ int copy_unsafe_links = 0;
+@@ -90,6 +90,7 @@ int copy_unsafe_links = 0;
int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
+int fuzzy_basis = 0;
size_t bwlimit_writemax = 0;
- int delete_after = 0;
int only_existing = 0;
-@@ -292,6 +293,7 @@ void usage(enum logcode F)
+ int opt_ignore_existing = 0;
+@@ -293,6 +294,7 @@ void usage(enum logcode F)
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n");
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
-@@ -390,6 +392,7 @@ static struct poptOption long_options[]
+@@ -393,6 +395,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
-@@ -1247,6 +1250,9 @@ void server_options(char **args,int *arg
+@@ -1251,6 +1254,9 @@ void server_options(char **args,int *arg
if (!implied_dirs && !am_sender)
args[ac++] = "--no-implied-dirs";
*argc = ac;
return;
---- orig/receiver.c 2005-01-18 22:47:38
+--- orig/receiver.c 2005-01-23 07:55:58
+++ receiver.c 2005-01-15 21:21:02
-@@ -234,6 +234,27 @@ static int receive_data(int f_in, char *
+@@ -251,6 +251,27 @@ static int receive_data(int f_in, char *
}
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -364,6 +385,10 @@ int recv_files(int f_in, struct file_lis
+@@ -381,6 +402,10 @@ int recv_files(int f_in, struct file_lis
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
default:
if (j >= basis_dir_cnt) {
rprintf(FERROR,
---- orig/rsync.h 2005-01-19 20:11:10
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2005-01-19 18:36:47
@@ -128,6 +128,7 @@
#define FNAMECMP_FNAME 0x80
+#define FNAMECMP_FUZZY 0x83
/* For calling delete_file() */
- #define DEL_DIR (1<<0)
---- orig/rsync.yo 2005-01-19 01:05:05
+ #define DEL_DIR (1<<0)
+--- orig/rsync.yo 2005-01-23 02:57:49
+++ rsync.yo 2005-01-15 21:48:52
-@@ -359,6 +359,7 @@ verb(
+@@ -360,6 +360,7 @@ verb(
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-P equivalent to --partial --progress
-z, --compress compress file data
-C, --cvs-exclude auto ignore files in the same way CVS does
-@@ -888,6 +889,14 @@ Note that rsync versions prior to 2.6.1
+@@ -896,6 +897,14 @@ Note that rsync versions prior to 2.6.1
(or implied by -a). You can work-around this bug by avoiding the -o option
when sending to an old rsync.
dit(bf(-z, --compress)) With this option, rsync compresses any data from
the files that it sends to the destination machine. This
option is useful on slow connections. The compression method used is the
---- orig/util.c 2005-01-19 20:11:10
+--- orig/util.c 2005-01-20 23:05:34
+++ util.c 2005-01-19 17:30:51
@@ -1213,3 +1213,108 @@ void *_realloc_array(void *ptr, unsigned
return malloc(size * num);
handle relative symlinks properly, and that has not yet been fixed
in this modified version.
---- orig/flist.c 2005-01-01 21:11:00
+--- orig/flist.c 2005-01-24 00:18:21
+++ flist.c 2004-07-16 16:58:04
@@ -50,6 +50,7 @@ extern int filesfrom_fd;
extern int one_file_system;
#else
linkname_len = 0;
#endif
---- orig/options.c 2005-01-17 23:11:45
+--- orig/options.c 2005-01-24 00:18:21
+++ options.c 2004-07-16 16:12:29
@@ -42,6 +42,7 @@ int archive_mode = 0;
int keep_dirlinks = 0;
int preserve_hard_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
-@@ -251,6 +252,7 @@ void usage(enum logcode F)
+@@ -253,6 +254,7 @@ void usage(enum logcode F)
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
- rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
+ rprintf(F," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
+ rprintf(F," --links-depth=NUM follow symlinks up to NUM depth\n");
rprintf(F," -L, --copy-links copy the referent of all symlinks\n");
rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n");
rprintf(F," --safe-links ignore \"unsafe\" symlinks\n");
-@@ -357,6 +359,7 @@ static struct poptOption long_options[]
+@@ -360,6 +362,7 @@ static struct poptOption long_options[]
{"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
- {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 },
+ {"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 },
{"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 },
+ {"links-depth", 0, POPT_ARG_INT, &follow_links_depth , 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 },
- {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
---- orig/clientserver.c 2005-01-01 21:11:00
+--- orig/clientserver.c 2005-01-22 22:48:52
+++ clientserver.c 2004-10-08 20:44:59
@@ -47,6 +47,9 @@ extern int select_timeout;
extern int orig_umask;
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
-@@ -154,6 +167,33 @@ int start_inband_exchange(char *user, ch
- if (protocol_version > remote_protocol)
- protocol_version = remote_protocol;
+@@ -160,6 +173,33 @@ int start_inband_exchange(char *user, ch
+ if (verbose > 1)
+ print_child_argv(sargs);
+#ifdef HAVE_OPENSSL
+ if (use_ssl) {
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -182,6 +222,10 @@ int start_inband_exchange(char *user, ch
+@@ -188,6 +228,10 @@ int start_inband_exchange(char *user, ch
* server to terminate the listing of modules.
* We don't want to go on and transfer
* anything; just exit. */
exit(0);
}
-@@ -189,6 +233,10 @@ int start_inband_exchange(char *user, ch
+@@ -195,6 +239,10 @@ int start_inband_exchange(char *user, ch
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
return RERR_STARTCLIENT;
} else {
rprintf(FINFO,"%s\n", line);
-@@ -504,6 +552,7 @@ static void send_listing(int fd)
+@@ -510,6 +558,7 @@ static void send_listing(int fd)
io_printf(fd,"@RSYNCD: EXIT\n");
}
/* this is called when a connection is established to a client
and we want to start talking. The setup of the system is done from
here */
-@@ -553,6 +602,9 @@ int start_daemon(int f_in, int f_out)
+@@ -559,6 +608,9 @@ int start_daemon(int f_in, int f_out)
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
line[0] = 0;
if (!read_line(f_in, line, sizeof line - 1))
return -1;
-@@ -562,6 +614,20 @@ int start_daemon(int f_in, int f_out)
+@@ -568,6 +620,20 @@ int start_daemon(int f_in, int f_out)
return -1;
}
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c 2005-01-17 23:11:45
+--- orig/main.c 2005-01-23 07:27:24
+++ main.c 2004-10-08 20:15:28
-@@ -56,6 +56,9 @@ extern int write_batch;
+@@ -57,6 +57,9 @@ extern int write_batch;
extern int batch_fd;
extern int batch_gen_fd;
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -805,33 +808,48 @@ static int start_client(int argc, char *
+@@ -806,33 +809,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
-@@ -863,12 +881,26 @@ static int start_client(int argc, char *
+@@ -864,12 +882,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-01-20 23:05:34
+--- orig/options.c 2005-01-24 00:18:21
+++ options.c 2004-11-27 18:31:46
-@@ -141,6 +141,14 @@ int quiet = 0;
+@@ -142,6 +142,14 @@ int quiet = 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;
-@@ -162,6 +170,7 @@ static void print_rsync_version(enum log
+@@ -163,6 +171,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
-@@ -184,6 +193,10 @@ static void print_rsync_version(enum log
+@@ -185,6 +194,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,
-@@ -197,10 +210,10 @@ static void print_rsync_version(enum log
+@@ -198,10 +211,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());
-@@ -313,6 +326,13 @@ void usage(enum logcode F)
+@@ -316,6 +329,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");
-@@ -324,7 +344,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
+@@ -326,7 +346,7 @@ void usage(enum logcode F)
+ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -411,6 +431,13 @@ static struct poptOption long_options[]
+@@ -415,6 +435,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 },
-@@ -751,6 +778,12 @@ int parse_arguments(int *argc, const cha
+@@ -747,6 +774,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 (opt-BASE is its index). */
-@@ -948,6 +981,17 @@ int parse_arguments(int *argc, const cha
+@@ -949,6 +982,17 @@ int parse_arguments(int *argc, const cha
bwlimit_writemax = 512;
}
Do we need configure support for mktime()?
---- orig/io.c 2005-01-17 23:11:45
+--- orig/io.c 2005-01-19 20:11:10
+++ io.c 2004-07-17 15:28:36
@@ -51,6 +51,7 @@ extern int eol_nulls;
extern int csum_length;
if (!am_server && !am_daemon) {
rprintf(FERROR, "io timeout after %d seconds - exiting\n",
(int)(t-last_io));
---- orig/options.c 2005-01-17 23:11:45
+--- orig/options.c 2005-01-24 00:18:21
+++ options.c 2005-01-01 21:19:56
-@@ -98,6 +98,7 @@ int blocking_io = -1;
+@@ -100,6 +100,7 @@ int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
/** Network address family. **/
-@@ -306,6 +307,8 @@ void usage(enum logcode F)
- rprintf(F," --log-format=FORMAT log file transfers using specified format\n");
+@@ -310,6 +311,8 @@ void usage(enum logcode F)
rprintf(F," --password-file=FILE get 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");
+ rprintf(F," --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute\n");
+ rprintf(F," --time-limit=MINS Stop rsync after MINS minutes have elapsed\n");
rprintf(F," --write-batch=FILE write a batch to FILE\n");
rprintf(F," --read-batch=FILE read a batch from FILE\n");
#ifdef INET6
-@@ -324,6 +327,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -327,6 +330,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -397,6 +401,8 @@ static struct poptOption long_options[]
+@@ -402,6 +406,8 @@ static struct poptOption long_options[]
{"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
{"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
{"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
-@@ -750,6 +756,36 @@ int parse_arguments(int *argc, const cha
+@@ -747,6 +753,36 @@ 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 (opt-BASE is its index). */
-@@ -1135,6 +1171,15 @@ void server_options(char **args,int *arg
+@@ -1144,6 +1180,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
---- orig/rsync.yo 2005-01-17 23:11:46
+--- orig/rsync.yo 2005-01-24 00:18:21
+++ rsync.yo 2004-07-15 02:44:40
-@@ -376,6 +376,8 @@ verb(
- --log-format=FORMAT log file transfers using specified format
+@@ -378,6 +378,8 @@ verb(
--password-file=FILE get password from FILE
+ --list-only list the files instead of copying them
--bwlimit=KBPS limit I/O bandwidth, KBytes per second
+ --stop-at=y-m-dTh:m Stop rsync at year-month-dayThour:minute
+ --time-limit=MINS Stop rsync after MINS minutes have elapsed
--write-batch=FILE write a batch to FILE
--read-batch=FILE read a batch from FILE
--checksum-seed=NUM set block/file checksum seed
-@@ -1025,6 +1027,19 @@ transfer was too fast, it will wait befo
+@@ -1040,6 +1042,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.
dit(bf(--write-batch=FILE)) Record a file that can later be applied to
another identical destination with --read-batch. See the "BATCH MODE"
section for details.
---- orig/util.c 2004-09-07 21:45:30
+--- orig/util.c 2005-01-20 23:05:34
+++ util.c 2004-07-03 20:23:22
@@ -126,6 +126,132 @@ void overflow(char *str)
exit_cleanup(RERR_MALLOC);
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff