X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ea847c623231ebbf9cceabe855ae0b40780f9040..306ffb8c718faf0ff09c432301217482ce1e26c7:/flist.c

diff --git a/flist.c b/flist.c
index ee18d4d9..245a7ef9 100644
--- a/flist.c
+++ b/flist.c
@@ -441,19 +441,19 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	if (l2 > 255)
 		flags |= XMIT_LONG_NAME;
 
-	/* We must make sure we don't send a zero flags byte or
+	/* We must make sure we don't send a zero flag-byte or
 	 * the other end will terminate the flist transfer. */
-	if (flags == 0 && !S_ISDIR(mode))
+	if (!(flags & 0xFF) && !S_ISDIR(mode))
 		flags |= XMIT_TOP_DIR; /* NOTE: no meaning for non-dir */
 	if (protocol_version >= 28) {
-		if ((flags & 0xFF00) || flags == 0) {
+		if ((flags & 0xFF00) || !(flags & 0xFF)) {
 			flags |= XMIT_EXTENDED_FLAGS;
 			write_byte(f, flags);
 			write_byte(f, flags >> 8);
 		} else
 			write_byte(f, flags);
 	} else {
-		if (flags == 0)
+		if (!(flags & 0xFF))
 			flags |= XMIT_LONG_NAME;
 		write_byte(f, flags);
 	}
@@ -490,8 +490,9 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 #if SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
-		write_int(f, strlen(file->u.link));
-		write_buf(f, file->u.link, strlen(file->u.link));
+		int len = strlen(file->u.link);
+		write_int(f, len);
+		write_buf(f, file->u.link, len);
 	}
 #endif
 
@@ -643,14 +644,14 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 	}
 
 	if (preserve_links && S_ISLNK(mode)) {
-		int l = read_int(f);
-		if (l < 0) {
-			rprintf(FERROR, "overflow: l=%d\n", l);
+		int len = read_int(f);
+		if (len < 0 || len >= MAXPATHLEN) {
+			rprintf(FERROR, "overflow: len=%d\n", len);
 			overflow("receive_file_entry");
 		}
-		if (!(file->u.link = new_array(char, l + 1)))
+		if (!(file->u.link = new_array(char, len + 1)))
 			out_of_memory("receive_file_entry 2");
-		read_sbuf(f, file->u.link, l);
+		read_sbuf(f, file->u.link, len);
 		if (sanitize_paths)
 			sanitize_path(file->u.link, file->dirname);
 	}
@@ -724,36 +725,35 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	STRUCT_STAT st;
 	char sum[SUM_LENGTH];
 	char *p;
-	char cleaned_name[MAXPATHLEN];
-	char linkbuf[MAXPATHLEN];
+	char thisname[MAXPATHLEN];
+	char linkname[MAXPATHLEN];
 	unsigned short flags = 0;
 
-	if (strlcpy(cleaned_name, fname, sizeof cleaned_name)
-	    >= sizeof cleaned_name - flist_dir_len) {
+	if (strlcpy(thisname, fname, sizeof thisname)
+	    >= sizeof thisname - flist_dir_len) {
 		rprintf(FINFO, "skipping overly long name: %s\n", fname);
 		return NULL;
 	}
-	clean_fname(cleaned_name);
+	clean_fname(thisname);
 	if (sanitize_paths)
-		sanitize_path(cleaned_name, NULL);
-	fname = cleaned_name;
+		sanitize_path(thisname, NULL);
 
 	memset(sum, 0, SUM_LENGTH);
 
-	if (readlink_stat(fname, &st, linkbuf) != 0) {
+	if (readlink_stat(thisname, &st, linkname) != 0) {
 		int save_errno = errno;
 		if (errno == ENOENT && exclude_level != NO_EXCLUDES) {
 			/* either symlink pointing nowhere or file that
 			 * was removed during rsync run; see if excluded
 			 * before reporting an error */
-			if (check_exclude_file(fname, 0, exclude_level)) {
+			if (check_exclude_file(thisname, 0, exclude_level)) {
 				/* file is excluded anyway, ignore silently */
 				return NULL;
 			}
 		}
 		io_error |= IOERR_GENERAL;
 		rprintf(FERROR, "readlink %s failed: %s\n",
-			full_fname(fname), strerror(save_errno));
+			full_fname(thisname), strerror(save_errno));
 		return NULL;
 	}
 
@@ -762,7 +762,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 		goto skip_excludes;
 
 	if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
-		rprintf(FINFO, "skipping directory %s\n", fname);
+		rprintf(FINFO, "skipping directory %s\n", thisname);
 		return NULL;
 	}
 
@@ -774,17 +774,17 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 		flags |= FLAG_MOUNT_POINT;
 	}
 
-	if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level))
+	if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
 		return NULL;
 
-	if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0)
+	if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
 		return NULL;
 
       skip_excludes:
 
 	if (verbose > 2) {
 		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
-			who_am_i(), fname, exclude_level);
+			who_am_i(), thisname, exclude_level);
 	}
 
 	file = new(struct file_struct);
@@ -793,20 +793,20 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	memset((char *) file, 0, sizeof(*file));
 	file->flags = flags;
 
-	if ((p = strrchr(fname, '/'))) {
+	if ((p = strrchr(thisname, '/'))) {
 		static char *lastdir;
 		*p = 0;
-		if (lastdir && strcmp(fname, lastdir) == 0)
+		if (lastdir && strcmp(thisname, lastdir) == 0)
 			file->dirname = lastdir;
 		else {
-			file->dirname = strdup(fname);
+			file->dirname = strdup(thisname);
 			lastdir = file->dirname;
 		}
 		file->basename = STRDUP(ap, p + 1);
 		*p = '/';
 	} else {
 		file->dirname = NULL;
-		file->basename = STRDUP(ap, fname);
+		file->basename = STRDUP(ap, thisname);
 	}
 
 	file->modtime = st.st_mtime;
@@ -830,13 +830,13 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
 #if SUPPORT_LINKS
 	if (S_ISLNK(st.st_mode))
-		file->u.link = STRDUP(ap, linkbuf);
+		file->u.link = STRDUP(ap, linkname);
 #endif
 
 	if (always_checksum && S_ISREG(st.st_mode)) {
 		if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH)))
 			out_of_memory("md4 sum");
-		file_checksum(fname, file->u.sum, st.st_size);
+		file_checksum(thisname, file->u.sum, st.st_size);
 	}
 
 	file->basedir = flist_dir;