- if (i == argc - 1) {
- snprintf(buff2, sizeof buff2, "${1:-%s}", argv[i]);
- strlcat(buff, buff2, sizeof buff);
- }
- else {
- strlcat(buff, argv[i], sizeof buff);
- }
-
- if (i < (argc - 1)) {
- strlcat(buff, " ", sizeof buff);
- }
- }
- strlcat(buff, "\n", sizeof buff);
- if (!write(f, buff, strlen(buff))) {
- rprintf(FERROR, "Batch file %s write error: %s\n",
- filename, strerror(errno));
- close(f);
- exit_cleanup(1);
- }
- close(f);
-}
-
-struct file_list *create_flist_from_batch(void)
-{
- char filename[MAXPATHLEN];
- unsigned short flags;
- int i, f, save_pv;
- int64 save_read;
-
- stringjoin(filename, sizeof filename,
- batch_prefix, rsync_flist_file, NULL);
-
- f = do_open(filename, O_RDONLY, 0);
- if (f < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
- exit_cleanup(1);
- }
-
- batch_flist = flist_new(WITH_HLINK, "create_flist_from_batch");
-
- save_read = stats.total_read;
- save_pv = protocol_version;
- protocol_version = read_int(f);
-
- batch_flist->count = read_int(f);
- flist_expand(batch_flist);
-
- for (i = 0; (flags = read_byte(f)) != 0; i++) {
- if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
- flags |= read_byte(f) << 8;
- receive_file_entry(&batch_flist->files[i], flags, batch_flist, f);
- }
- receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
-
- protocol_version = save_pv;
- stats.total_read = save_read;
-
- return batch_flist;
-}
-
-void write_batch_csums_file(void *buff, int bytes_to_write)
-{
- if (write(f_csums, buff, bytes_to_write) < 0) {
- rprintf(FERROR, "Batch file write error: %s\n",
- strerror(errno));
- close(f_csums);
- exit_cleanup(1);
- }
-}
-
-void close_batch_csums_file(void)
-{
- close(f_csums);
- f_csums = -1;
-}
-
-
-/**
- * Write csum info to batch file
- *
- * @todo This will break if s->count is ever larger than maxint. The
- * batch code should probably be changed to consistently use the
- * variable-length integer routines, which is probably a compatible
- * change.
- **/
-void write_batch_csum_info(int *flist_entry, struct sum_struct *s)
-{
- size_t i;
- int int_count;
- char filename[MAXPATHLEN];
-
- if (f_csums < 0) {
- stringjoin(filename, sizeof filename,
- batch_prefix, rsync_csums_file, NULL);
-
- f_csums = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR);
- if (f_csums < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
- close(f_csums);
- exit_cleanup(1);
- }