- 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(INO64_T));
- read_batch_flist_file((char *) &file->dev, sizeof(DEV64_T));
- read_batch_flist_file((char *) &file->rdev, sizeof(DEV64_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;
- }
-}
-
-void write_batch_csums_file(void *buff, int bytes_to_write)
-{
-
- 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);
+ 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;