X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/785db4ced0a9e97b33cf3e3567d11e91809c1573..882e68931246958a37c63c557d6f758356bd92d9:/flist.c

diff --git a/flist.c b/flist.c
index 55107a71..1ef1617a 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;
 
@@ -314,6 +315,7 @@ static mode_t from_wire_mode(int mode)
 static void send_directory(int f, struct file_list *flist, char *dir);
 
 static char *flist_dir;
+static int flist_dir_len;
 
 
 /**
@@ -380,7 +382,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 	io_write_phase = "send_file_entry";
 
-	fname = f_name_to(file, fbuf, sizeof fbuf);
+	fname = f_name_to(file, fbuf);
 
 	flags = base_flags;
 
@@ -430,7 +432,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;
@@ -521,7 +523,6 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	}
 
 	strlcpy(lastname, fname, MAXPATHLEN);
-	lastname[MAXPATHLEN - 1] = 0;
 
 	io_write_phase = "unknown";
 }
@@ -749,8 +750,11 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	char cleaned_name[MAXPATHLEN];
 	char linkbuf[MAXPATHLEN];
 
-	strlcpy(cleaned_name, fname, MAXPATHLEN);
-	cleaned_name[MAXPATHLEN - 1] = 0;
+	if (strlcpy(cleaned_name, fname, sizeof cleaned_name)
+	    >= sizeof cleaned_name - flist_dir_len) {
+		rprintf(FINFO, "skipping overly long name: %s\n", fname);
+		return NULL;
+	}
 	clean_fname(cleaned_name);
 	if (sanitize_paths)
 		sanitize_path(cleaned_name, NULL);
@@ -851,16 +855,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 		file_checksum(fname, file->u.sum, st.st_size);
 	}
 
-	if (flist_dir) {
-		static char *lastdir;
-		if (lastdir && strcmp(lastdir, flist_dir) == 0)
-			file->basedir = lastdir;
-		else {
-			file->basedir = strdup(flist_dir);
-			lastdir = file->basedir;
-		}
-	} else
-		file->basedir = NULL;
+	file->basedir = flist_dir;
 
 	if (!S_ISDIR(st.st_mode))
 		stats.total_size += st.st_size;
@@ -899,7 +894,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	if (S_ISDIR(file->mode) && recursive) {
 		struct exclude_struct **last_exclude_list =
 		    local_exclude_list;
-		send_directory(f, flist, f_name_to(file, fbuf, sizeof fbuf));
+		send_directory(f, flist, f_name_to(file, fbuf));
 		local_exclude_list = last_exclude_list;
 		return;
 	}
@@ -911,7 +906,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 +917,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");
-			add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-		} else {
+		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
+		    < MAXPATHLEN - offset)
+			add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
+		else {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 				"cannot cvs-exclude in long-named directory %s\n",
@@ -956,13 +950,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 +982,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 +998,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 +1028,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 +1049,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,16 +1100,27 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			fname = ".";
 
 		if (dir && *dir) {
-			olddir = push_dir(dir, 1);
+			static char *lastdir;
+			static int lastdir_len;
+
+			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));
 				continue;
 			}
 
-			flist_dir = dir;
+			if (lastdir && strcmp(lastdir, dir) == 0) {
+				flist_dir = lastdir;
+				flist_dir_len = lastdir_len;
+			} else {
+				if (lastdir)
+					free(lastdir);
+				flist_dir = lastdir = strdup(dir);
+				flist_dir_len = lastdir_len = strlen(dir);
+			}
 		}
 
 		if (one_file_system)
@@ -1116,9 +1128,10 @@ 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) {
+			flist_dir_len = 0;
+			if (!pop_dir(olddir)) {
 				rprintf(FERROR, "pop_dir %s failed: %s\n",
 					full_fname(dir), strerror(errno));
 				exit_cleanup(RERR_FILESELECT);
@@ -1503,19 +1516,21 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 
 
 /* Return a copy of the full filename of a flist entry, using the indicated
- * buffer.
+ * buffer.  No size-checking is done because we checked the size when creating
+ * the file_struct entry.
  */
-char *f_name_to(struct file_struct *f, char *fbuf, int bsize)
+char *f_name_to(struct file_struct *f, char *fbuf)
 {
 	if (!f || !f->basename)
 		return NULL;
 
 	if (f->dirname) {
-		int off = strlcpy(fbuf, f->dirname, bsize);
-		off += strlcpy(fbuf + off, "/", bsize - off);
-		strlcpy(fbuf + off, f->basename, bsize - off);
+		int len = strlen(f->dirname);
+		memcpy(fbuf, f->dirname, len);
+		fbuf[len] = '/';
+		strcpy(fbuf + len + 1, f->basename);
 	} else
-		strlcpy(fbuf, f->basename, bsize);
+		strcpy(fbuf, f->basename);
 	return fbuf;
 }
 
@@ -1529,5 +1544,5 @@ char *f_name(struct file_struct *f)
 
 	n = (n + 1) % (sizeof names / sizeof names[0]);
 
-	return f_name_to(f, names[n], sizeof names[0]);
+	return f_name_to(f, names[n]);
 }