/* -*- c-file-style: "linux" -*-
-
+
Weiss 1/1999
Batch utilities for rsync.
int i, f, save_pv;
int64 save_written;
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_flist_file);
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_flist_file, NULL);
f = do_open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE);
if (f < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ filename, strerror(errno));
exit_cleanup(1);
}
write_int(f, protocol_version);
write_int(f, flist_count);
- for (i = 0; i < flist_count; i++)
- send_file_entry(files[i], f, files[i]->flags & LIVE_FLAGS);
+ for (i = 0; i < flist_count; i++) {
+ send_file_entry(files[i], f,
+ files[i]->flags & FLAG_TOP_DIR ? XMIT_TOP_DIR : 0);
+ }
send_file_entry(NULL, f, 0);
protocol_version = save_pv;
char buff2[MAXPATHLEN + 6];
char filename[MAXPATHLEN];
- /* Set up file extension */
- strlcpy(filename, batch_prefix, sizeof(filename));
- strlcat(filename, rsync_argvs_file, sizeof(filename));
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_argvs_file, NULL);
- /* Open batch argvs file for writing;
- * create it if it doesn't exist. */
f = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IREAD | S_IWRITE | S_IEXEC);
+ S_IREAD | S_IWRITE | S_IEXEC);
if (f < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ filename, strerror(errno));
exit_cleanup(1);
}
buff[0] = '\0';
for (i = 0; i < argc; ++i) {
if (i == argc - 2) /* Skip source directory on cmdline */
- continue;
+ continue;
/*
* FIXME:
* I think directly manipulating argv[] is probably bogus
*/
if (!strncmp(argv[i], "--write-batch",
- strlen("--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));
+ strlcat(buff, "--read-batch=", sizeof buff);
+ strlcat(buff, batch_prefix, sizeof buff);
} else
if (i == argc - 1) {
- snprintf(buff2, sizeof(buff2), "${1:-%s}", argv[i]);
- strlcat(buff, buff2, sizeof(buff));
+ snprintf(buff2, sizeof buff2, "${1:-%s}", argv[i]);
+ strlcat(buff, buff2, sizeof buff);
}
else {
- strlcat(buff, argv[i], sizeof(buff));
+ strlcat(buff, argv[i], sizeof buff);
}
if (i < (argc - 1)) {
- strlcat(buff, " ", sizeof(buff));
+ strlcat(buff, " ", sizeof buff);
}
}
- strlcat(buff, "\n", 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));
+ filename, strerror(errno));
close(f);
exit_cleanup(1);
}
int i, f, save_pv;
int64 save_read;
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_flist_file);
+ 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));
+ filename, strerror(errno));
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 & EXTENDED_FLAGS))
+ 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;
{
if (write(f_csums, buff, bytes_to_write) < 0) {
rprintf(FERROR, "Batch file write error: %s\n",
- strerror(errno));
+ strerror(errno));
close(f_csums);
exit_cleanup(1);
}
/**
- * Write csum info to batch file
+ * 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
char filename[MAXPATHLEN];
if (f_csums < 0) {
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_csums_file);
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_csums_file, NULL);
f_csums = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IREAD | S_IWRITE);
+ S_IREAD | S_IWRITE);
if (f_csums < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ filename, strerror(errno));
close(f_csums);
exit_cleanup(1);
}
}
- write_batch_csums_file(flist_entry, sizeof(int));
+ write_batch_csums_file(flist_entry, sizeof (int));
int_count = s ? (int) s->count : 0;
write_batch_csums_file(&int_count, sizeof int_count);
-
+
if (s) {
for (i = 0; i < s->count; i++) {
- write_batch_csums_file(&s->sums[i].sum1, sizeof(uint32));
+ write_batch_csums_file(&s->sums[i].sum1,
+ sizeof (uint32));
write_batch_csums_file(s->sums[i].sum2, csum_length);
}
}
int bytes_read;
if ((bytes_read = read(f_csums, buff, len)) < 0) {
- rprintf(FERROR, "Batch file read error: %s\n",
- strerror(errno));
+ rprintf(FERROR, "Batch file read error: %s\n", strerror(errno));
close(f_csums);
exit_cleanup(1);
}
char filename[MAXPATHLEN];
if (f_csums < 0) {
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_csums_file);
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_csums_file, NULL);
f_csums = do_open(filename, O_RDONLY, 0);
if (f_csums < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ filename, strerror(errno));
close(f_csums);
exit_cleanup(1);
}
}
- read_batch_csums_file((char *) &file_flist_entry, sizeof(int));
+ read_batch_csums_file((char *) &file_flist_entry, sizeof (int));
if (file_flist_entry != flist_entry) {
rprintf(FINFO, "file_flist_entry (%d) != flist_entry (%d)\n",
- file_flist_entry, flist_entry);
+ file_flist_entry, flist_entry);
close(f_csums);
exit_cleanup(1);
} else {
- read_batch_csums_file((char *) &file_chunk_ct,
- sizeof(int));
+ 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));
+ 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)) {
+ if ((s->sums[i].sum1 != file_sum1)
+ || memcmp(s->sums[i].sum2, file_sum2, csum_length))
*checksums_match = 0;
- }
} /* end for */
}
}
char filename[MAXPATHLEN];
if (f_delta < 0) {
- strlcpy(filename, batch_prefix, sizeof(filename));
- strlcat(filename, rsync_delta_file, sizeof(filename));
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_delta_file, NULL);
f_delta = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
S_IREAD | S_IWRITE);
if (write(f_delta, buff, bytes_to_write) < 0) {
rprintf(FERROR, "Batch file %s write error: %s\n",
- filename, strerror(errno));
+ filename, strerror(errno));
close(f_delta);
exit_cleanup(1);
}
char filename[MAXPATHLEN];
if (f_delta < 0) {
- strlcpy(filename, batch_prefix, sizeof(filename));
- strlcat(filename, rsync_delta_file, sizeof(filename));
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_delta_file, NULL);
f_delta = do_open(filename, O_RDONLY, 0);
if (f_delta < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
- filename, strerror(errno));
+ filename, strerror(errno));
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));
+ filename, strerror(errno));
close(f_delta);
exit_cleanup(1);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff