#include "rsync.h"
#include <time.h>
-extern char *batch_name;
-extern int delete_mode;
-extern int delete_excluded;
+extern int am_sender;
extern int eol_nulls;
+extern int recurse;
+extern int xfer_dirs;
+extern int preserve_links;
+extern int preserve_hard_links;
+extern int preserve_devices;
+extern int preserve_uid;
+extern int preserve_gid;
+extern int always_checksum;
+extern int protocol_version;
+extern char *batch_name;
+
+extern struct filter_list_struct filter_list;
+
+static int fudged_recurse;
+
+static int *flag_ptr[] = {
+ &fudged_recurse,
+ &preserve_uid,
+ &preserve_gid,
+ &preserve_links,
+ &preserve_devices,
+ &preserve_hard_links,
+ &always_checksum,
+ &xfer_dirs,
+ NULL
+};
+
+static char *flag_name[] = {
+ "--recurse (-r)",
+ "--owner (-o)",
+ "--group (-g)",
+ "--links (-l)",
+ "--devices (-D)",
+ "--hard-links (-H)",
+ "--checksum (-c)",
+ "--dirs (-d)",
+ NULL
+};
+
+void write_stream_flags(int fd)
+{
+ int i, flags;
+
+ /* Start the batch file with a bitmap of data-stream-affecting
+ * flags. */
+ fudged_recurse = recurse < 0;
+ for (i = 0, flags = 0; flag_ptr[i]; i++) {
+ if (*flag_ptr[i])
+ flags |= 1 << i;
+ }
+ write_int(fd, flags);
+}
-extern struct exclude_list_struct exclude_list;
+void read_stream_flags(int fd)
+{
+ int i, flags;
+
+ fudged_recurse = recurse < 0;
+ if (protocol_version < 29)
+ xfer_dirs = 0;
+ for (i = 0, flags = read_int(fd); flag_ptr[i]; i++) {
+ int set = flags & (1 << i) ? 1 : 0;
+ if (*flag_ptr[i] != set) {
+ if (verbose) {
+ rprintf(FINFO,
+ "%sing the %s option to match the batchfile.\n",
+ set ? "Sett" : "Clear", flag_name[i]);
+ }
+ *flag_ptr[i] = set;
+ }
+ }
+ recurse = fudged_recurse ? -1 : 0;
+ if (protocol_version < 29)
+ xfer_dirs = recurse ? 1 : 0;
+}
static void write_arg(int fd, char *arg)
{
write(fd, arg, strlen(arg));
}
-static void write_excludes(int fd)
+static void write_filter_rules(int fd)
{
- struct exclude_struct *ent;
+ struct filter_struct *ent;
write_sbuf(fd, " <<'#E#'\n");
- for (ent = exclude_list.head; ent; ent = ent->next) {
- char *p = ent->pattern;
- if (ent->match_flags & MATCHFLG_INCLUDE)
- write_buf(fd, "+ ", 2);
- else if (((*p == '-' || *p == '+') && p[1] == ' ')
- || *p == '#' || *p == ';')
- write_buf(fd, "- ", 2);
- write_sbuf(fd, p);
+ for (ent = filter_list.head; ent; ent = ent->next) {
+ unsigned int plen;
+ char *p = get_rule_prefix(ent->match_flags, "- ", 0, &plen);
+ write_buf(fd, p, plen);
+ write_sbuf(fd, ent->pattern);
if (ent->match_flags & MATCHFLG_DIRECTORY)
write_byte(fd, '/');
write_byte(fd, eol_nulls ? 0 : '\n');
fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IEXEC);
if (fd < 0) {
- rsyserr(FERROR, errno, "Batch file %s open error", filename);
+ rsyserr(FERROR, errno, "Batch file %s open error",
+ safe_fname(filename));
exit_cleanup(1);
}
/* Write argvs info to BATCH.sh file */
write_arg(fd, argv[0]);
- if (exclude_list.head)
- write_sbuf(fd, " --exclude-from=-");
+ if (filter_list.head) {
+ if (protocol_version >= 29)
+ write_sbuf(fd, " --filter=._-");
+ else
+ write_sbuf(fd, " --exclude-from=-");
+ }
for (i = 1; i < argc - file_arg_cnt; i++) {
p = argv[i];
if (strncmp(p, "--files-from", 12) == 0
+ || strncmp(p, "--filter", 8) == 0
|| strncmp(p, "--include", 9) == 0
|| strncmp(p, "--exclude", 9) == 0) {
if (strchr(p, '=') == NULL)
i++;
continue;
}
+ if (strcmp(p, "-f") == 0) {
+ i++;
+ continue;
+ }
write(fd, " ", 1);
if (strncmp(p, "--write-batch", 13) == 0) {
write(fd, "--read-batch", 12);
write(fd, " ${1:-", 6);
write_arg(fd, p);
write_byte(fd, '}');
- if (exclude_list.head)
- write_excludes(fd);
+ if (filter_list.head)
+ write_filter_rules(fd);
if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
- rsyserr(FERROR, errno, "Batch file %s write error", filename);
+ rsyserr(FERROR, errno, "Batch file %s write error",
+ safe_fname(filename));
exit_cleanup(1);
}
}
rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
- rprintf(FINFO, "flist->basename=%s\n", fptr[i]->basename);
- if (fptr[i]->dirname)
+ rprintf(FINFO, "flist->basename=%s\n",
+ safe_fname(fptr[i]->basename));
+ if (fptr[i]->dirname) {
rprintf(FINFO, "flist->dirname=%s\n",
- fptr[i]->dirname);
- if (fptr[i]->basedir)
- rprintf(FINFO, "flist->basedir=%s\n",
- fptr[i]->basedir);
+ safe_fname(fptr[i]->dirname));
+ }
+ if (am_sender && fptr[i]->dir.root) {
+ rprintf(FINFO, "flist->dir.root=%s\n",
+ safe_fname(fptr[i]->dir.root));
+ }
}
}
+/* for debugging */
void show_argvs(int argc, char *argv[])
{
- /* for debugging * */
-
int i;
- rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc);
- for (i = 0; i < argc; i++) {
- /* if (argv[i]) */
- rprintf(FINFO, "i=%d,argv[i]=%s\n", i, argv[i]);
- }
+ rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc);
+ for (i = 0; i < argc; i++)
+ rprintf(FINFO, "i=%d,argv[i]=%s\n", i, safe_fname(argv[i]));
}