Got rid of "fudged_recurse".

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index 5df7b78..44d2c98 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -11,6 +11,7 @@
 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;
@@ -41,6 +42,7 @@ static char *flag_name[] = {
        "--devices (-D)",
        "--hard-links (-H)",
        "--checksum (-c)",
+       "--dirs (-d)",
        NULL
 };
 
@@ -61,6 +63,8 @@ void read_stream_flags(int fd)
 {
        int i, flags;
 
+       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) {
@@ -72,6 +76,8 @@ void read_stream_flags(int fd)
                        *flag_ptr[i] = set;
                }
        }
+       if (protocol_version < 29)
+               xfer_dirs = recurse ? 1 : 0;
 }
 
 static void write_arg(int fd, char *arg)
@@ -104,7 +110,7 @@ static void write_filter_rules(int fd)
        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, "- ", &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)
@@ -131,7 +137,8 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
        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);
        }
 
@@ -167,10 +174,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
                } else
                        write_arg(fd, p);
        }
-       if ((p = find_colon(argv[argc - 1])) != NULL) {
-               if (*++p == ':')
-                       p++;
-       } else
+       if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
                p = argv[argc - 1];
        write(fd, " ${1:-", 6);
        write_arg(fd, p);
@@ -178,7 +182,8 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
        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);
        }
 }
@@ -195,25 +200,25 @@ void show_flist(int index, struct file_struct **fptr)
                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 (am_sender && fptr[i]->dir.root)
+                               safe_fname(fptr[i]->dirname));
+               }
+               if (am_sender && fptr[i]->dir.root) {
                        rprintf(FINFO, "flist->dir.root=%s\n",
-                               fptr[i]->dir.root);
+                               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]));
 }