Update the copyright year.
[rsync/rsync.git] / batch.c
diff --git a/batch.c b/batch.c
index 4c5d4cc..37529f0 100644 (file)
--- a/batch.c
+++ b/batch.c
-/* -*- c-file-style: "linux" -*-
-   
-   Weiss 1/1999
-   Batch utilities for rsync.
-
-*/ 
+/*
+ * Support for the batch-file options.
+ *
+ * Copyright (C) 1999 Weiss
+ * Copyright (C) 2004 Chris Shoemaker
+ * Copyright (C) 2004-2009 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
+ */
 
 #include "rsync.h"
+#include "zlib/zlib.h"
 #include <time.h>
 
-char rsync_flist_file[27] = "rsync_flist.";    
-char rsync_csums_file[27] = "rsync_csums.";     
-char rsync_delta_file[27] = "rsync_delta.";    
-char rsync_argvs_file[27] = "rsync_argvs.";    
-
-char batch_file_ext[15];
-int fdb;
-int fdb_delta;
-int fdb_open;   
-int fdb_close;  
-
-struct file_list *batch_flist;
-
-void create_batch_file_ext()
-{
-    struct tm *timeptr;
-    time_t elapsed_seconds;
-    
-    /* Save run date and time to use for batch file extensions */
-    time(&elapsed_seconds);
-    timeptr = localtime(&elapsed_seconds);
-
-    sprintf(batch_file_ext, "%4d%02d%02d%02d%02d%02d",
-             timeptr->tm_year+1900, timeptr->tm_mon+1, timeptr->tm_mday,
-             timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec);
-}
-
-void set_batch_file_ext(char *ext)
-{
-    strcpy(batch_file_ext, ext);  
-}
-
-void write_batch_flist_file(char *buff, int bytes_to_write)
-{
-
-    if (fdb_open) {
-       /* Set up file extension */
-       strcat(rsync_flist_file, batch_file_ext); 
-
-       /* Open batch flist file for writing; create it if it doesn't exist */
-       fdb = do_open(rsync_flist_file, O_WRONLY|O_CREAT|O_TRUNC,
-                                              S_IREAD|S_IWRITE);
-       if (fdb == -1) {
-          rprintf(FERROR, "Batch file %s open error: %s\n",
-          rsync_flist_file, strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-       }
-       fdb_open = 0;
-    }
-
-    /* Write buffer to batch flist file */
-
-    if ( write(fdb, buff, bytes_to_write) == -1 ) { 
-            rprintf(FERROR, "Batch file %s write error: %s\n",
-          rsync_flist_file, strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-    }
-
-
-    if (fdb_close) {
-       close(fdb);
-    }
-}
-
-void write_batch_flist_info(int flist_count, struct file_struct **fptr)
-{
-    int i;
-    int bytes_to_write;   
-
-    /* Write flist info to batch file */
-
-    bytes_to_write = sizeof(unsigned) +
-                     sizeof(time_t) +
-                     sizeof(OFF_T) +
-                     sizeof(mode_t) +
-                     sizeof(INO_T) +
-                     (2 * sizeof(dev_t)) +
-                     sizeof(uid_t) +
-                     sizeof(gid_t);   
-
-    fdb_open = 1;
-    fdb_close = 0;
-
-    for (i=0; i<flist_count; i++) {
-       write_batch_flist_file( (char *) fptr[i], bytes_to_write);
-       write_char_bufs(fptr[i]->basename);
-       write_char_bufs(fptr[i]->dirname);
-       write_char_bufs(fptr[i]->basedir);
-       write_char_bufs(fptr[i]->link);
-       if (i==flist_count - 1) {
-          fdb_close = 1;
-       }
-       write_char_bufs(fptr[i]->sum);
-    }  
-
-}
-
-void write_char_bufs(char *buf)
-{
-   /* Write the size of the string which will follow  */ 
-
-   char b[4];
-   if (buf != NULL)
-      SIVAL(b,0,strlen(buf));  
-   else {
-      SIVAL(b,0,0);
-   }
-
-   write_batch_flist_file(b, sizeof(int));  
-
-   /*  Write the string if there is one */
-
-   if (buf != NULL) {
-      write_batch_flist_file(buf, strlen(buf)); 
-   }
-}
-
-void write_batch_argvs_file(int orig_argc, int argc, char **argv)
+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 preserve_acls;
+extern int preserve_xattrs;
+extern int always_checksum;
+extern int do_compression;
+extern int inplace;
+extern int append_mode;
+extern int protocol_version;
+extern char *batch_name;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
+#endif
+
+extern struct filter_list_struct filter_list;
+
+int batch_stream_flags;
+
+static int tweaked_append;
+static int tweaked_append_verify;
+static int tweaked_iconv;
+
+static int *flag_ptr[] = {
+       &recurse,               /* 0 */
+       &preserve_uid,          /* 1 */
+       &preserve_gid,          /* 2 */
+       &preserve_links,        /* 3 */
+       &preserve_devices,      /* 4 */
+       &preserve_hard_links,   /* 5 */
+       &always_checksum,       /* 6 */
+       &xfer_dirs,             /* 7 (protocol 29) */
+       &do_compression,        /* 8 (protocol 29) */
+       &tweaked_iconv,         /* 9  (protocol 30) */
+       &preserve_acls,         /* 10 (protocol 30) */
+       &preserve_xattrs,       /* 11 (protocol 30) */
+       &inplace,               /* 12 (protocol 30) */
+       &tweaked_append,        /* 13 (protocol 30) */
+       &tweaked_append_verify, /* 14 (protocol 30) */
+       NULL
+};
+
+static char *flag_name[] = {
+       "--recurse (-r)",
+       "--owner (-o)",
+       "--group (-g)",
+       "--links (-l)",
+       "--devices (-D)",
+       "--hard-links (-H)",
+       "--checksum (-c)",
+       "--dirs (-d)",
+       "--compress (-z)",
+       "--iconv",
+       "--acls (-A)",
+       "--xattrs (-X)",
+       "--inplace",
+       "--append",
+       "--append-verify",
+       NULL
+};
+
+void write_stream_flags(int fd)
 {
-    int fdb;
-    int i;
-    char buff[256];
-
-    strcat(rsync_argvs_file, batch_file_ext);
-    
-
-    /* Open batch argvs file for writing; create it if it doesn't exist */
-    fdb = do_open(rsync_argvs_file, O_WRONLY|O_CREAT|O_TRUNC,
-                                           S_IREAD|S_IWRITE|S_IEXEC);
-    if (fdb == -1) {
-       rprintf(FERROR, "Batch file %s open error: %s\n", rsync_argvs_file,
-         strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-    }
-    buff[0] = '\0';
-    /* Write argvs info to batch file */
-   
-    for (i=argc - orig_argc;i<argc;i++) {
-       if ( !strcmp(argv[i],"-F") ){  /* safer to change it here than script*/ 
-          strncat(buff,"-f ",3);  /* chg to -f + ext to get ready for remote */
-          strncat(buff,batch_file_ext,strlen(batch_file_ext));
-       }
-       else {
-          strncat(buff,argv[i],strlen(argv[i]));
-       }
-    
-       if (i < (argc - 1)) {
-          strncat(buff," ",1);
-       }
-    }
-    if (!write(fdb, buff, strlen(buff))) { 
-          rprintf(FERROR, "Batch file %s write error: %s\n",
-            rsync_argvs_file, strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-    }
-    close(fdb);
+       int i, flags;
+
+       tweaked_append = append_mode == 1;
+       tweaked_append_verify = append_mode == 2;
+#ifdef ICONV_OPTION
+       tweaked_iconv = iconv_opt != NULL;
+#endif
+
+       /* Start the batch file with a bitmap of data-stream-affecting
+        * flags. */
+       for (i = 0, flags = 0; flag_ptr[i]; i++) {
+               if (*flag_ptr[i])
+                       flags |= 1 << i;
+       }
+       write_int(fd, flags);
 }
 
-struct file_list *create_flist_from_batch()
+void read_stream_flags(int fd)
 {
-   unsigned char flags;
-
-   fdb_open = 1;
-   fdb_close = 0;  
-
-   batch_flist = (struct file_list *)malloc(sizeof(batch_flist[0]));
-   if (!batch_flist) {
-     out_of_memory("create_flist_from_batch"); 
-   }
-   batch_flist->count=0;
-   batch_flist->malloced=1000;
-   batch_flist->files = (struct file_struct **)malloc(sizeof(batch_flist->files[0])* batch_flist->malloced);
-   if (!batch_flist->files) {
-     out_of_memory("create_flist_from_batch");   /* dw -- will exit */
-   }
-
-   for ( flags=read_batch_flags() ; flags; flags=read_batch_flags() ) {
-
-     int i = batch_flist->count;
-     if (i >= batch_flist->malloced) {
-         if (batch_flist->malloced < 1000)
-                 batch_flist->malloced += 1000;
-         else
-                 batch_flist->malloced *= 2;
-         batch_flist->files =(struct file_struct **)realloc(batch_flist->files,
-                                              sizeof(batch_flist->files[0])*
-                                              batch_flist->malloced);
-         if (!batch_flist->files)
-                 out_of_memory("create_flist_from_batch");
-    }
-    read_batch_flist_info(&batch_flist->files[i]);
-    batch_flist->files[i]->flags = flags;   
-
-    batch_flist->count++;
-  }
-
-  return batch_flist;
-
+       batch_stream_flags = read_int(fd);
 }
 
-int read_batch_flist_file(char *buff, int len)
+void check_batch_flags(void)
 {
-    int bytes_read;
-      
-    if (fdb_open) {
-
-       /*  Set up file extension  */
-       strcat(rsync_flist_file, batch_file_ext);
-
-       /* Open batch flist file for reading */
-       fdb = do_open(rsync_flist_file, O_RDONLY, 0);
-       if (fdb == -1) {
-          rprintf(FERROR, "Batch file %s open error: %s\n", rsync_flist_file,
-            strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-       }
-       fdb_open = 0;
-    }
-
-    /* Read flist batch file */
-
-    bytes_read = read(fdb, buff, len); 
-
-    if (bytes_read == -1) { 
-       rprintf(FERROR, "Batch file %s read error: %s\n",
-          rsync_flist_file, strerror(errno));
-       close(fdb);
-       exit_cleanup(1);
-    }
-    if (bytes_read == 0) {    /* EOF */
-       close(fdb);
-    }
-    return bytes_read;
+       int i;
+
+       if (protocol_version < 29)
+               flag_ptr[7] = NULL;
+       else if (protocol_version < 30)
+               flag_ptr[9] = NULL;
+       tweaked_append = append_mode == 1;
+       tweaked_append_verify = append_mode == 2;
+#ifdef ICONV_OPTION
+       tweaked_iconv = iconv_opt != NULL;
+#endif
+       for (i = 0; flag_ptr[i]; i++) {
+               int set = batch_stream_flags & (1 << i) ? 1 : 0;
+               if (*flag_ptr[i] != set) {
+                       if (i == 9) {
+                               rprintf(FERROR,
+                                       "%s specify the --iconv option to use this batch file.\n",
+                                       set ? "Please" : "Do not");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       if (INFO_GTE(MISC, 1)) {
+                               rprintf(FINFO,
+                                       "%sing the %s option to match the batchfile.\n",
+                                       set ? "Sett" : "Clear", flag_name[i]);
+                       }
+                       *flag_ptr[i] = set;
+               }
+       }
+       if (protocol_version < 29) {
+               if (recurse)
+                       xfer_dirs |= 1;
+               else if (xfer_dirs < 2)
+                       xfer_dirs = 0;
+       }
+
+       if (tweaked_append)
+               append_mode = 1;
+       else if (tweaked_append_verify)
+               append_mode = 2;
 }
 
-unsigned char read_batch_flags()
+static int write_arg(int fd, char *arg)
 {
-    int flags; 
-
-    if (read_batch_flist_file((char *)&flags, 4) ) { 
-       return 1;
-    }
-    else {
-       return 0; 
-    }
+       char *x, *s;
+       int len, ret = 0;
+
+       if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
+               if (write(fd, arg, x - arg + 1) != x - arg + 1)
+                       ret = -1;
+               arg += x - arg + 1;
+       }
+
+       if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
+               if (write(fd, "'", 1) != 1)
+                       ret = -1;
+               for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
+                       if (write(fd, s, x - s + 1) != x - s + 1
+                        || write(fd, "'", 1) != 1)
+                               ret = -1;
+               }
+               len = strlen(s);
+               if (write(fd, s, len) != len
+                || write(fd, "'", 1) != 1)
+                       ret = -1;
+               return ret;
+       }
+
+       len = strlen(arg);
+       if (write(fd, arg, len) != len)
+               ret = -1;
+
+       return ret;
 }
 
-void read_batch_flist_info(struct file_struct **fptr)
+static void write_filter_rules(int fd)
 {
-    int int_str_len;   
-    char char_str_len[4];   
-    char buff[256];   
-    struct file_struct *file;
-
-    file = (struct file_struct *)malloc(sizeof(*file));
-    if (!file) out_of_memory("read_batch_flist_info");
-    memset((char *)file, 0, sizeof(*file));
-
-    (*fptr) = file;
-
-    read_batch_flist_file((char *)&file->modtime, sizeof(time_t)); 
-    read_batch_flist_file((char *)&file->length, sizeof(OFF_T)); 
-    read_batch_flist_file((char *)&file->mode, sizeof(mode_t)); 
-    read_batch_flist_file((char *)&file->inode, sizeof(INO_T)); 
-    read_batch_flist_file((char *)&file->dev, sizeof(dev_t)); 
-    read_batch_flist_file((char *)&file->rdev, sizeof(dev_t)); 
-    read_batch_flist_file((char *)&file->uid, sizeof(uid_t)); 
-    read_batch_flist_file((char *)&file->gid, sizeof(gid_t)); 
-    read_batch_flist_file(char_str_len, sizeof(char_str_len)); 
-    int_str_len = IVAL(char_str_len,0);
-    if (int_str_len > 0) {
-       read_batch_flist_file(buff, int_str_len); 
-       buff[int_str_len] = '\0';
-       file->basename = strdup(buff); 
-    }
-    else {
-       file->basename = NULL;
-    }
-
-    read_batch_flist_file(char_str_len, sizeof(char_str_len)); 
-    int_str_len = IVAL(char_str_len,0);
-    if (int_str_len > 0) {
-       read_batch_flist_file(buff, int_str_len); 
-       buff[int_str_len] = '\0';
-       file[0].dirname = strdup(buff); 
-    }
-    else {
-       file[0].dirname = NULL;
-    }
-
-    read_batch_flist_file(char_str_len, sizeof(char_str_len)); 
-    int_str_len = IVAL(char_str_len,0);
-    if (int_str_len > 0) {
-       read_batch_flist_file(buff, int_str_len); 
-       buff[int_str_len] = '\0';
-       file[0].basedir = strdup(buff); 
-    }
-    else {
-       file[0].basedir = NULL;
-    }
-
-    read_batch_flist_file(char_str_len, sizeof(char_str_len)); 
-    int_str_len = IVAL(char_str_len,0);
-    if (int_str_len > 0) {
-       read_batch_flist_file(buff, int_str_len); 
-       buff[int_str_len] = '\0';
-       file[0].link = strdup(buff); 
-    }
-    else {
-       file[0].link = NULL;
-    }
-
-    read_batch_flist_file(char_str_len, sizeof(char_str_len)); 
-    int_str_len = IVAL(char_str_len,0);
-    if (int_str_len > 0) {
-       read_batch_flist_file(buff, int_str_len); 
-       buff[int_str_len] = '\0';
-       file[0].sum = strdup(buff); 
-    }
-    else {
-       file[0].sum = NULL;
-    }
+       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#");
 }
 
-void write_batch_csums_file(char *buff, int bytes_to_write)
+/* 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)
 {
-
-    static int fdb_open = 1;
-
-    if (fdb_open) {
-       /* Set up file extension */
-       strcat(rsync_csums_file, batch_file_ext); 
-
-       /* Open batch csums file for writing; create it if it doesn't exist */
-       fdb = do_open(rsync_csums_file, O_WRONLY|O_CREAT|O_TRUNC,
-                                              S_IREAD|S_IWRITE);
-       if (fdb == -1) {
-          rprintf(FERROR, "Batch file %s open error: %s\n",
-          rsync_csums_file, strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-       }
-       fdb_open = 0; 
-    }
-
-    /* Write buffer to batch csums file */
-
-    if ( write(fdb, buff, bytes_to_write) == -1 ) { 
-            rprintf(FERROR, "Batch file %s write error: %s\n",
-          rsync_csums_file, strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-    }
-}
-
-void close_batch_csums_file() 
-{
-    close(fdb);
-
-}
-
-void write_batch_csum_info(int *flist_entry, int flist_count, struct sum_struct *s)
-{
-    int i;
-    int int_zero = 0;
-    extern int csum_length;
-
-    fdb_open = 1;
-
-    /* Write csum info to batch file */
-
-    write_batch_csums_file ( (char *) flist_entry, sizeof(int) );
-    write_batch_csums_file ( (char *) (s?&s->count:&int_zero), sizeof(int) );
-    if (s) {
-       for (i=0; i < s->count; i++) {
-          write_batch_csums_file( (char *) &s->sums[i].sum1, sizeof(uint32));
-          if ( (*flist_entry == flist_count - 1) && (i == s->count - 1) ) {
-             fdb_close = 1;
-          }
-          write_batch_csums_file( s->sums[i].sum2, csum_length);
-       } 
-    }  
-}
-
-int read_batch_csums_file(char *buff, int len)
-{
-    static int fdb_open = 1; 
-    int bytes_read;
-      
-    if (fdb_open) {
-
-       /*  Set up file extension  */
-       strcat(rsync_csums_file, batch_file_ext);
-
-       /* Open batch flist file for reading */
-       fdb = do_open(rsync_csums_file, O_RDONLY, 0);
-       if (fdb == -1) {
-          rprintf(FERROR, "Batch file %s open error: %s\n", rsync_csums_file,
-            strerror(errno));
-          close(fdb);
-          exit_cleanup(1);
-       }
-       fdb_open = 0;
-    }
-
-    /* Read csums batch file */
-
-    bytes_read = read(fdb, buff, len); 
-
-    if (bytes_read == -1) { 
-       rprintf(FERROR, "Batch file %s read error: %s\n",
-          rsync_csums_file, strerror(errno));
-       close(fdb);
-       exit_cleanup(1);
-    }
-    return bytes_read;
-}
-
-
-void read_batch_csum_info(int flist_entry, struct sum_struct *s, int *checksums_match)
-{
-    int i;
-    int file_flist_entry;
-    int file_chunk_ct;
-    uint32 file_sum1;
-    char file_sum2[SUM_LENGTH]; 
-    extern int csum_length;
-
-    read_batch_csums_file((char *)&file_flist_entry, sizeof(int)); 
-    if (file_flist_entry != flist_entry) {
-       rprintf(FINFO,"file_list_entry NE flist_entry\n");
-       rprintf(FINFO,"file_flist_entry = %d  flist_entry = %d\n", file_flist_entry, flist_entry);
-       close(fdb);
-       exit_cleanup(1);
-    
-    }
-    else {
-       read_batch_csums_file((char *)&file_chunk_ct, sizeof(int)); 
-       *checksums_match = 1;
-       for (i = 0;i < file_chunk_ct;i++) {
-          
-          read_batch_csums_file((char *)&file_sum1, sizeof(uint32)); 
-          read_batch_csums_file(file_sum2, csum_length); 
-
-          if ( (s->sums[i].sum1 != file_sum1) ||  
-               ( memcmp(s->sums[i].sum2,file_sum2, csum_length)!=0) ) {
-                   *checksums_match = 0;
-          }
-       }  /*  end for  */
-    }
-
-}
-
-void write_batch_delta_file(char *buff, int bytes_to_write)
-{
-    static int fdb_delta_open = 1;
-
-    if (fdb_delta_open) {
-       /* Set up file extension */
-       strcat(rsync_delta_file, batch_file_ext); 
-
-       /* Open batch delta file for writing; create it if it doesn't exist */
-       fdb_delta = do_open(rsync_delta_file, O_WRONLY|O_CREAT|O_TRUNC,
-                                              S_IREAD|S_IWRITE);
-       if (fdb_delta == -1) {
-          rprintf(FERROR, "Batch file %s open error: %s\n",
-          rsync_delta_file, strerror(errno));
-          close(fdb_delta);
-          exit_cleanup(1);
-       }
-       fdb_delta_open = 0; 
-    }
-
-    /* Write buffer to batch delta file */
-
-    if ( write(fdb_delta, buff, bytes_to_write) == -1 ) { 
-            rprintf(FERROR, "Batch file %s write error: %s\n",
-          rsync_delta_file, strerror(errno));
-          close(fdb_delta);
-          exit_cleanup(1);
-    }
-}
-void close_batch_delta_file()
-{
-   close(fdb_delta);
-
-}
-
-int read_batch_delta_file(char *buff, int len)
-{
-    static int fdb_delta_open = 1;
-    int bytes_read;
-      
-    if (fdb_delta_open) {
-
-       /*  Set up file extension  */
-       strcat(rsync_delta_file, batch_file_ext);
-
-       /* Open batch flist file for reading */
-       fdb_delta = do_open(rsync_delta_file, O_RDONLY, 0);
-       if (fdb_delta == -1) {
-          rprintf(FERROR, "Batch file %s open error: %s\n", rsync_delta_file,
-            strerror(errno));
-          close(fdb_delta);
-          exit_cleanup(1);
-       }
-       fdb_delta_open = 0;
-    }
-
-    /* Read delta batch file */
-
-    bytes_read = read(fdb_delta, buff, len); 
-
-    if (bytes_read == -1) { 
-       rprintf(FERROR, "Batch file %s read error: %s\n",
-          rsync_delta_file, strerror(errno));
-       close(fdb_delta);
-       exit_cleanup(1);
-    }
-    return bytes_read;
-}
-
-
-void show_flist(int index, struct file_struct **fptr)
-{
-   /*  for debugging    show_flist(flist->count, flist->files **/ 
-
-    int i;
-    for (i=0;i<index;i++) {
-           rprintf(FINFO, "flist->flags=%#x\n",fptr[i]->flags);  
-           rprintf(FINFO, "flist->modtime=%#lx\n",
-                   (long unsigned) fptr[i]->modtime);  
-           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->dirname=%s\n",fptr[i]->dirname);
-           if (fptr[i]->basedir) 
-                   rprintf(FINFO, "flist->basedir=%s\n",fptr[i]->basedir);
-    }
-}
-
-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]);  
-
-    }
+       int fd, i, len, err = 0;
+       char *p, filename[MAXPATHLEN];
+
+       stringjoin(filename, sizeof filename,
+                  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);
+               exit_cleanup(RERR_FILESELECT);
+       }
+
+       /* Write argvs info to BATCH.sh file */
+       if (write_arg(fd, argv[0]) < 0)
+               err = 1;
+       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;
+               }
+               if (write(fd, " ", 1) != 1)
+                       err = 1;
+               if (strncmp(p, "--write-batch", len = 13) == 0
+                || strncmp(p, "--only-write-batch", len = 18) == 0) {
+                       if (write(fd, "--read-batch", 12) != 12)
+                               err = 1;
+                       if (p[len] == '=') {
+                               if (write(fd, "=", 1) != 1
+                                || write_arg(fd, p + len + 1) < 0)
+                                       err = 1;
+                       }
+               } else {
+                       if (write_arg(fd, p) < 0)
+                               err = 1;
+               }
+       }
+       if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
+               p = argv[argc - 1];
+       if (write(fd, " ${1:-", 6) != 6
+        || write_arg(fd, p) < 0)
+               err = 1;
+       write_byte(fd, '}');
+       if (filter_list.head)
+               write_filter_rules(fd);
+       if (write(fd, "\n", 1) != 1 || close(fd) < 0 || err) {
+               rsyserr(FERROR, errno, "Batch file %s write error",
+                       filename);
+               exit_cleanup(RERR_FILEIO);
+       }
 }
-