#include "rsync.h"
#include <time.h>
+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;
-void write_batch_argvs_file(int argc, char *argv[])
+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);
+}
+
+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)
+{
+ char *x, *s;
+
+ if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
+ write(fd, arg, x - arg + 1);
+ arg += x - arg + 1;
+ }
+
+ if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
+ write(fd, "'", 1);
+ for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
+ write(fd, s, x - s + 1);
+ write(fd, "'", 1);
+ }
+ write(fd, s, strlen(s));
+ write(fd, "'", 1);
+ return;
+ }
+
+ write(fd, arg, strlen(arg));
+}
+
+static void write_filter_rules(int fd)
+{
+ struct filter_struct *ent;
+
+ write_sbuf(fd, " <<'#E#'\n");
+ 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');
+ }
+ if (eol_nulls)
+ write_sbuf(fd, ";\n");
+ write_sbuf(fd, "#E#");
+}
+
+/* This routine tries to write out an equivalent --read-batch command
+ * given the user's --write-batch args. However, it doesn't really
+ * understand most of the options, so it uses some overly simple
+ * heuristics to munge the command line into something that will
+ * (hopefully) work. */
+void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
{
int fd, i;
- char filename[MAXPATHLEN];
+ char *p, filename[MAXPATHLEN];
stringjoin(filename, sizeof filename,
- batch_name, ".rsync_argvs", NULL);
+ batch_name, ".sh", NULL);
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.rsync_argvs file */
- for (i = 0; i < argc; i++) {
- if (i == argc - 2) /* Skip source directory on cmdline */
+ /* Write argvs info to BATCH.sh file */
+ write_arg(fd, argv[0]);
+ 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 (strncmp(argv[i], "--files-from=", 13) == 0)
+ }
+ if (strcmp(p, "-f") == 0) {
+ i++;
continue;
- if (i != 0)
- write(fd, " ", 1);
- if (strncmp(argv[i], "--write-batch=", 14) == 0) {
- write(fd, "--read-batch=", 13);
- write(fd, batch_name, strlen(batch_name));
- } else if (i == argc - 1) {
- char *p = find_colon(argv[i]);
- if (p) {
- if (*++p == ':')
- p++;
- } else
- p = argv[i];
- write(fd, "${1:-", 5);
- write(fd, p, strlen(p));
- write(fd, "}", 1);
+ }
+ write(fd, " ", 1);
+ if (strncmp(p, "--write-batch", 13) == 0) {
+ write(fd, "--read-batch", 12);
+ if (p[13] == '=') {
+ write(fd, "=", 1);
+ write_arg(fd, p + 14);
+ }
} else
- write(fd, argv[i], strlen(argv[i]));
+ write_arg(fd, p);
}
+ if ((p = find_colon(argv[argc - 1])) != NULL) {
+ if (*++p == ':')
+ p++;
+ } else
+ p = argv[argc - 1];
+ write(fd, " ${1:-", 6);
+ write_arg(fd, p);
+ write_byte(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]));
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff