..wayne..
--- exclude.c 22 May 2004 05:32:20 -0000 1.82
-+++ exclude.c 4 Jun 2004 07:07:33 -0000
++++ exclude.c 11 Jun 2004 07:55:58 -0000
@@ -30,13 +30,59 @@ extern int verbose;
extern int eol_nulls;
extern int list_only;
add_exclude(&exclude_list, default_cvsignore,
XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
---- flist.c 29 May 2004 21:21:17 -0000 1.226
-+++ flist.c 4 Jun 2004 07:07:33 -0000
+--- flist.c 11 Jun 2004 07:40:57 -0000 1.230
++++ flist.c 11 Jun 2004 07:55:58 -0000
@@ -39,8 +39,6 @@ extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
extern char curr_dir[MAXPATHLEN];
extern char *files_from;
-@@ -58,6 +56,7 @@ extern int implied_dirs;
+@@ -59,6 +57,7 @@ extern int implied_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
+extern int inherit_exclude_levels;
extern int sanitize_paths;
-
- extern int read_batch;
-@@ -65,7 +64,6 @@ extern int write_batch;
+ extern int delete_excluded;
+ extern int orig_umask;
+@@ -69,7 +68,6 @@ extern int write_batch;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
int io_error;
-@@ -210,8 +208,6 @@ int link_stat(const char *path, STRUCT_S
+@@ -224,8 +222,6 @@ int link_stat(const char *path, STRUCT_S
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
-@@ -233,10 +229,7 @@ static int check_exclude_file(char *fnam
+@@ -247,10 +243,7 @@ static int check_exclude_file(char *fnam
if (exclude_level != ALL_EXCLUDES)
return 0;
if (exclude_list.head
return 1;
return 0;
}
-@@ -942,15 +935,7 @@ void send_file_name(int f, struct file_l
+@@ -960,15 +953,7 @@ void send_file_name(int f, struct file_l
if (recursive && S_ISDIR(file->mode)
&& !(file->flags & FLAG_MOUNT_POINT)) {
}
}
-@@ -961,6 +946,7 @@ static void send_directory(int f, struct
+@@ -979,6 +964,7 @@ static void send_directory(int f, struct
struct dirent *di;
char fname[MAXPATHLEN];
unsigned int offset;
char *p;
d = opendir(dir);
-@@ -984,19 +970,13 @@ static void send_directory(int f, struct
+@@ -1002,19 +988,13 @@ static void send_directory(int f, struct
offset++;
}
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
char *dname = d_name(di);
if (dname[0] == '.' && (dname[1] == '\0'
-@@ -1016,6 +996,8 @@ static void send_directory(int f, struct
+@@ -1034,6 +1014,8 @@ static void send_directory(int f, struct
rsyserr(FERROR, errno, "readdir(%s)", dir);
}
closedir(d);
}
---- options.c 27 May 2004 21:51:53 -0000 1.153
-+++ options.c 4 Jun 2004 07:07:34 -0000
-@@ -48,6 +48,7 @@ int preserve_gid = 0;
+--- options.c 7 Jun 2004 22:05:22 -0000 1.156
++++ options.c 11 Jun 2004 07:55:59 -0000
+@@ -50,6 +50,7 @@ int preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
int local_server = 0;
int ignore_times = 0;
-@@ -306,7 +307,7 @@ void usage(enum logcode F)
+@@ -309,7 +310,7 @@ void usage(enum logcode F)
enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
OPT_REFUSED_BASE = 9000};
-@@ -331,6 +332,7 @@ static struct poptOption long_options[]
+@@ -334,6 +335,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 },
-@@ -543,6 +545,31 @@ int parse_arguments(int *argc, const cha
+@@ -542,6 +544,31 @@ int parse_arguments(int *argc, const cha
XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
break;
case 'h':
usage(FINFO);
exit_cleanup(0);
-@@ -767,6 +794,9 @@ int parse_arguments(int *argc, const cha
+@@ -771,6 +798,9 @@ int parse_arguments(int *argc, const cha
}
}
return 1;
}
-@@ -866,6 +896,12 @@ void server_options(char **args,int *arg
+@@ -872,6 +902,12 @@ void server_options(char **args,int *arg
if (x != 1)
args[ac++] = argstr;
if (asprintf(&arg, "-B%u", block_size) < 0)
goto oom;
--- rsync.h 16 May 2004 07:28:24 -0000 1.204
-+++ rsync.h 4 Jun 2004 07:07:34 -0000
++++ rsync.h 11 Jun 2004 07:55:59 -0000
@@ -108,6 +108,7 @@
#define XFLG_DEF_INCLUDE (1<<1)
#define XFLG_WORDS_ONLY (1<<2)
};
struct exclude_list_struct {
---- rsync.yo 21 May 2004 09:44:32 -0000 1.170
-+++ rsync.yo 4 Jun 2004 07:07:35 -0000
-@@ -331,6 +331,7 @@ verb(
+--- rsync.yo 5 Jun 2004 16:16:30 -0000 1.171
++++ rsync.yo 11 Jun 2004 07:56:00 -0000
+@@ -332,6 +332,7 @@ verb(
--exclude-from=FILE exclude patterns listed in FILE
--include=PATTERN don't exclude files matching PATTERN
--include-from=FILE don't exclude patterns listed in FILE
--files-from=FILE read FILE for list of source-file names
-0 --from0 all file lists are delimited by nulls
--version print version number
-@@ -683,6 +684,28 @@ dit(bf(--include-from=FILE)) This specif
+@@ -688,6 +689,28 @@ dit(bf(--include-from=FILE)) This specif
from a file.
If em(FILE) is bf(-) the list will be read from standard input.
dit(bf(--files-from=FILE)) Using this option allows you to specify the
exact list of files to transfer (as read from the specified FILE or "-"
for stdin). It also tweaks the default behavior of rsync to make
-@@ -1038,6 +1061,11 @@ itemize(
+@@ -1043,6 +1066,11 @@ itemize(
then it is always considered an exclude pattern, even if specified as
part of an include option. The prefix is discarded before matching.
it() if the pattern is a single exclamation mark ! then the current
include/exclude list is reset, removing all previously defined patterns.
)
-@@ -1090,6 +1118,67 @@ itemize(
+@@ -1095,6 +1123,67 @@ itemize(
it would be excluded by the "*")
)
bf(Note:) Batch mode should be considered experimental in this version
--- testsuite/exclude.test 24 May 2004 00:16:07 -0000 1.8
-+++ testsuite/exclude.test 4 Jun 2004 07:07:35 -0000
++++ testsuite/exclude.test 11 Jun 2004 07:56:00 -0000
@@ -23,19 +23,47 @@ export HOME CVSIGNORE
makepath "$fromdir/foo/down/to/you"
makepath "$fromdir/bar/down/to/foo/too"