X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/57469f6c31cec390c014cde5851ec8b279d2c287..808c57c3439ed65062ff79193a67b1e281060ab1:/flist.c

diff --git a/flist.c b/flist.c
index d8115b66..bc08898a 100644
--- a/flist.c
+++ b/flist.c
@@ -43,6 +43,7 @@ extern int ignore_errors;
 extern int cvs_exclude;
 
 extern int recurse;
+extern char curr_dir[MAXPATHLEN];
 extern char *files_from;
 extern int filesfrom_fd;
 
@@ -430,7 +431,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	for (l1 = 0;
 	     lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
 	     l1++) {}
-	l2 = strlen(fname) - l1;
+	l2 = strlen(fname+l1);
 
 	if (l1 > 0)
 		flags |= SAME_NAME;
@@ -911,7 +912,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 	DIR *d;
 	struct dirent *di;
 	char fname[MAXPATHLEN];
-	int l;
+	unsigned int offset;
 	char *p;
 
 	d = opendir(dir);
@@ -922,28 +923,27 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		return;
 	}
 
-	strlcpy(fname, dir, MAXPATHLEN);
-	l = strlen(fname);
-	if (fname[l - 1] != '/') {
-		if (l == MAXPATHLEN - 1) {
+	offset = strlcpy(fname, dir, MAXPATHLEN);
+	p = fname + offset;
+	if (offset >= MAXPATHLEN || p[-1] != '/') {
+		if (offset >= MAXPATHLEN - 1) {
 			io_error |= IOERR_GENERAL;
 			rprintf(FERROR, "skipping long-named directory: %s\n",
 				full_fname(fname));
 			closedir(d);
 			return;
 		}
-		strlcat(fname, "/", MAXPATHLEN);
-		l++;
+		*p++ = '/';
+		offset++;
 	}
-	p = fname + strlen(fname);
 
 	local_exclude_list = NULL;
 
 	if (cvs_exclude) {
-		if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) {
-			strcpy(p, ".cvsignore");
+		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
+		    < MAXPATHLEN - offset)
 			add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-		} else {
+		else {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 				"cannot cvs-exclude in long-named directory %s\n",
@@ -956,13 +956,19 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		if (dname[0] == '.' && (dname[1] == '\0'
 		    || (dname[1] == '.' && dname[2] == '\0')))
 			continue;
-		strlcpy(p, dname, MAXPATHLEN - l);
-		send_file_name(f, flist, fname, recurse, 0);
+		if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset)
+			send_file_name(f, flist, fname, recurse, 0);
+		else {
+			io_error |= IOERR_GENERAL;
+			rprintf(FINFO,
+				"cannot send long-named file %s\n",
+				full_fname(fname));
+		}
 	}
 	if (errno) {
 		io_error |= IOERR_GENERAL;
 		rprintf(FERROR, "readdir(%s): (%d) %s\n",
-		    dir, errno, strerror(errno));
+			dir, errno, strerror(errno));
 	}
 
 	if (local_exclude_list)
@@ -982,7 +988,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 {
 	int l;
 	STRUCT_STAT st;
-	char *p, *dir, *olddir;
+	char *p, *dir, olddir[sizeof curr_dir];
 	char lastpath[MAXPATHLEN] = "";
 	struct file_list *flist;
 	int64 start_write;
@@ -998,7 +1004,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	if (f != -1) {
 		io_start_buffering_out(f);
 		if (filesfrom_fd >= 0) {
-			if (argv[0] && !push_dir(argv[0], 0)) {
+			if (argv[0] && !push_dir(argv[0])) {
 				rprintf(FERROR, "push_dir %s failed: %s\n",
 					full_fname(argv[0]), strerror(errno));
 				exit_cleanup(RERR_FILESELECT);
@@ -1028,8 +1034,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			if (l == 2 && fname[0] == '.') {
 				/* Turn "./" into just "." rather than "./." */
 				fname[1] = '\0';
-			} else {
-				strlcat(fname, ".", MAXPATHLEN);
+			} else if (l < MAXPATHLEN) {
+				fname[l++] = '.';
+				fname[l] = '\0';
 			}
 		}
 
@@ -1048,7 +1055,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 
 		dir = NULL;
-		olddir = NULL;
+		olddir[0] = '\0';
 
 		if (!relative_paths) {
 			p = strrchr(fname, '/');
@@ -1099,9 +1106,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			fname = ".";
 
 		if (dir && *dir) {
-			olddir = push_dir(dir, 1);
+			strcpy(olddir, curr_dir); /* can't overflow */
 
-			if (!olddir) {
+			if (!push_dir(dir)) {
 				io_error |= IOERR_GENERAL;
 				rprintf(FERROR, "push_dir %s failed: %s\n",
 					full_fname(dir), strerror(errno));
@@ -1116,9 +1123,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 		send_file_name(f, flist, fname, recurse, FLAG_DELETE);
 
-		if (olddir != NULL) {
+		if (olddir[0]) {
 			flist_dir = NULL;
-			if (pop_dir(olddir) != 0) {
+			if (!pop_dir(olddir)) {
 				rprintf(FERROR, "pop_dir %s failed: %s\n",
 					full_fname(dir), strerror(errno));
 				exit_cleanup(RERR_FILESELECT);