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) {
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];
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_argvs_file);
+ 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);
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) {
out_of_memory("create_flist_from_batch");
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);
}
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);
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) {
char filename[MAXPATHLEN];
if (f_delta < 0) {
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_delta_file);
+ 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);
char filename[MAXPATHLEN];
if (f_delta < 0) {
- snprintf(filename, sizeof filename, "%s%s",
- batch_prefix, rsync_delta_file);
+ stringjoin(filename, sizeof filename,
+ batch_prefix, rsync_delta_file, NULL);
f_delta = do_open(filename, O_RDONLY, 0);
if (f_delta < 0) {