stringjoin(filename, sizeof filename,
batch_prefix, rsync_flist_file, NULL);
- f = do_open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE);
+ f = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
if (f < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s open error", filename);
exit_cleanup(1);
}
void write_batch_argvs_file(int argc, char *argv[])
{
- int f;
- int i;
- char buff[256]; /* XXX */
- char buff2[MAXPATHLEN + 6];
+ int fd, i;
char filename[MAXPATHLEN];
stringjoin(filename, sizeof filename,
- batch_prefix, rsync_argvs_file, NULL);
-
- f = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IREAD | S_IWRITE | S_IEXEC);
- if (f < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ batch_prefix, rsync_argvs_file, 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(1);
}
- buff[0] = '\0';
- /* Write argvs info to batch file */
-
- for (i = 0; i < argc; ++i) {
+ /* Write argvs info to BATCH.rsync_argvs file */
+ for (i = 0; i < argc; i++) {
if (i == argc - 2) /* Skip source directory on cmdline */
continue;
- /*
- * FIXME:
- * I think directly manipulating argv[] is probably bogus
- */
- if (!strncmp(argv[i], "--write-batch",
- strlen("--write-batch"))) {
- /* Safer to change it here than script */
- /*
- * Change to --read-batch=prefix
- * to get ready for remote
- */
- strlcat(buff, "--read-batch=", sizeof buff);
- strlcat(buff, batch_prefix, sizeof buff);
+ if (i != 0)
+ write(fd, " ", 1);
+ if (!strncmp(argv[i], "--write-batch=", 14)) {
+ write(fd, "--read-batch=", 13);
+ write(fd, batch_prefix, strlen(batch_prefix));
+ } 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);
} else
- 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);
- }
+ write(fd, argv[i], strlen(argv[i]));
}
- 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);
+ if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
+ rsyserr(FERROR, errno, "Batch file %s write error", filename);
exit_cleanup(1);
}
- close(f);
}
struct file_list *create_flist_from_batch(void)
f = do_open(filename, O_RDONLY, 0);
if (f < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s open error", filename);
exit_cleanup(1);
}
- batch_flist = new(struct file_list);
- if (!batch_flist)
- out_of_memory("create_flist_from_batch");
+ 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 = batch_flist->malloced = read_int(f);
- batch_flist->files = new_array(struct file_struct *,
- batch_flist->malloced);
- if (!batch_flist->files)
- out_of_memory("create_flist_from_batch");
+ 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, f);
+ receive_file_entry(&batch_flist->files[i], flags, batch_flist, f);
}
- receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
+ receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
protocol_version = save_pv;
stats.total_read = save_read;
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));
+ rsyserr(FERROR, errno, "Batch file write error");
close(f_csums);
exit_cleanup(1);
}
batch_prefix, rsync_csums_file, NULL);
f_csums = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IREAD | S_IWRITE);
+ S_IRUSR | S_IWUSR);
if (f_csums < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s open error",
+ filename);
close(f_csums);
exit_cleanup(1);
}
int bytes_read;
if ((bytes_read = read(f_csums, buff, len)) < 0) {
- rprintf(FERROR, "Batch file read error: %s\n", strerror(errno));
+ rsyserr(FERROR, errno, "Batch file read error");
close(f_csums);
exit_cleanup(1);
}
f_csums = do_open(filename, O_RDONLY, 0);
if (f_csums < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s open error",
+ filename);
close(f_csums);
exit_cleanup(1);
}
batch_prefix, rsync_delta_file, NULL);
f_delta = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IREAD | S_IWRITE);
+ S_IRUSR | S_IWUSR);
if (f_delta < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s open error",
+ filename);
exit_cleanup(1);
}
}
if (write(f_delta, buff, bytes_to_write) < 0) {
- rprintf(FERROR, "Batch file %s write error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s write error", filename);
close(f_delta);
exit_cleanup(1);
}
f_delta = do_open(filename, O_RDONLY, 0);
if (f_delta < 0) {
- rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s open error",
+ filename);
close(f_delta);
exit_cleanup(1);
}
bytes_read = read(f_delta, buff, len);
if (bytes_read < 0) {
- rprintf(FERROR, "Batch file %s read error: %s\n",
- filename, strerror(errno));
+ rsyserr(FERROR, errno, "Batch file %s read error", filename);
close(f_delta);
exit_cleanup(1);
}