From 893c4cc0564c00dd541f9ee612be5896a7894679 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 20 Jan 2004 04:56:20 +0000 Subject: [PATCH] Use new stringjoin() function. --- batch.c | 28 ++++++++++++++-------------- socket.c | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/batch.c b/batch.c index 632c6077..456bbb92 100644 --- a/batch.c +++ b/batch.c @@ -29,8 +29,8 @@ void write_batch_flist_info(int flist_count, struct file_struct **files) int i, f, save_pv; int64 save_written; - i = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename + i, rsync_flist_file, sizeof filename - i); + 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) { @@ -64,8 +64,8 @@ void write_batch_argvs_file(int argc, char *argv[]) char buff2[MAXPATHLEN + 6]; char filename[MAXPATHLEN]; - i = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename+i, rsync_argvs_file, sizeof filename - i); + 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); @@ -124,8 +124,8 @@ struct file_list *create_flist_from_batch(void) int i, f, save_pv; int64 save_read; - i = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename + i, rsync_flist_file, sizeof filename - i); + stringjoin(filename, sizeof filename, + batch_prefix, rsync_flist_file, NULL); f = do_open(filename, O_RDONLY, 0); if (f < 0) { @@ -193,8 +193,8 @@ void write_batch_csum_info(int *flist_entry, struct sum_struct *s) char filename[MAXPATHLEN]; if (f_csums < 0) { - int n = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename + n, rsync_csums_file, sizeof filename - n); + 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); @@ -242,8 +242,8 @@ void read_batch_csum_info(int flist_entry, struct sum_struct *s, char filename[MAXPATHLEN]; if (f_csums < 0) { - int n = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename + n, rsync_csums_file, sizeof filename - n); + stringjoin(filename, sizeof filename, + batch_prefix, rsync_csums_file, NULL); f_csums = do_open(filename, O_RDONLY, 0); if (f_csums < 0) { @@ -284,8 +284,8 @@ void write_batch_delta_file(char *buff, int bytes_to_write) char filename[MAXPATHLEN]; if (f_delta < 0) { - int n = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename + n, rsync_delta_file, sizeof filename - n); + 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); @@ -316,8 +316,8 @@ int read_batch_delta_file(char *buff, int len) char filename[MAXPATHLEN]; if (f_delta < 0) { - int n = strlcpy(filename, batch_prefix, sizeof filename); - strlcpy(filename + n, rsync_delta_file, sizeof filename - n); + stringjoin(filename, sizeof filename, + batch_prefix, rsync_delta_file, NULL); f_delta = do_open(filename, O_RDONLY, 0); if (f_delta < 0) { diff --git a/socket.c b/socket.c index 5843325a..4ca87037 100644 --- a/socket.c +++ b/socket.c @@ -48,8 +48,8 @@ static int establish_proxy_connection(int fd, char *host, int port, int len; if (proxy_user && proxy_pass) { - snprintf(buffer, sizeof buffer, "%s:%s", - proxy_user, proxy_pass); + stringjoin(buffer, sizeof buffer, + proxy_user, ":", proxy_pass, NULL); len = strlen(buffer); if ((len*8 + 5) / 6 >= (int)sizeof authbuf) { -- 2.34.1