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) {
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);
if (f < 0) {
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) {
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) {
- 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);
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) {