X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d01d15e096dd63f3248e47c0c6846b2a48e3ab01..13c5b463610baf30f9af52d32a7da6de1bdbaa53:/flist.c

diff --git a/flist.c b/flist.c
index 26ecb3cc..58e3da00 100644
--- a/flist.c
+++ b/flist.c
@@ -185,17 +185,18 @@ static void list_file_entry(struct file_struct *f)
 
 	permstring(perms, f->mode);
 
+#if SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(f->mode)) {
 		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
 			perms,
 			(double) f->length, timestring(f->modtime),
 			f_name(f), f->u.link);
-	} else {
+	} else
+#endif
 		rprintf(FINFO, "%s %11.0f %s %s\n",
 			perms,
 			(double) f->length, timestring(f->modtime),
 			f_name(f));
-	}
 }
 
 
@@ -299,8 +300,10 @@ static void set_filesystem(char *fname)
 
 static int to_wire_mode(mode_t mode)
 {
+#if SUPPORT_LINKS
 	if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
 		return (mode & ~(_S_IFMT)) | 0120000;
+#endif
 	return (int) mode;
 }
 
@@ -342,7 +345,8 @@ static void flist_expand(struct file_list *flist)
 		}
 
 		if (verbose >= 2) {
-			rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
+			rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
+				who_am_i(),
 				(double)sizeof(flist->files[0])
 				* flist->malloced,
 				(new_ptr == flist->files) ? " not" : "");
@@ -360,7 +364,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	unsigned short flags;
 	static time_t modtime;
 	static mode_t mode;
-	static DEV64_T rdev;	/* just high bytes in p28 onward */
+	static DEV64_T rdev, rdev_high;
 	static DEV64_T dev;
 	static uid_t uid;
 	static gid_t gid;
@@ -374,7 +378,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	if (!file) {
 		write_byte(f, 0);
 		modtime = 0, mode = 0;
-		rdev = 0, dev = 0;
+		rdev = 0, rdev_high = 0, dev = 0;
 		uid = 0, gid = 0;
 		*lastname = '\0';
 		return;
@@ -403,10 +407,12 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 			} else
 				rdev = 0;
 		} else if (IS_DEVICE(mode)) {
-			if ((file->u.rdev & ~0xFF) == rdev)
+			if ((file->u.rdev & ~0xFF) == rdev_high)
 				flags |= XMIT_SAME_HIGH_RDEV;
-			else
-				rdev = file->u.rdev & ~0xFF;
+			else {
+				rdev = file->u.rdev;
+				rdev_high = rdev & ~0xFF;
+			}
 		}
 	}
 	if (file->uid == uid)
@@ -421,6 +427,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 		flags |= XMIT_SAME_TIME;
 	else
 		modtime = file->modtime;
+#if SUPPORT_HARD_LINKS
 	if (file->link_u.idev) {
 		if (file->F_DEV == dev) {
 			if (protocol_version >= 28)
@@ -429,6 +436,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 			dev = file->F_DEV;
 		flags |= XMIT_HAS_IDEV_DATA;
 	}
+#endif
 
 	for (l1 = 0;
 	     lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
@@ -440,19 +448,23 @@ 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
-	 * the other end will terminate the flist transfer. */
-	if (flags == 0 && !S_ISDIR(mode))
-		flags |= XMIT_TOP_DIR; /* Will be stripped off by receiver. */
+	/* We must make sure we don't send a zero flag byte or the
+	 * other end will terminate the flist transfer.  Note that
+	 * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
+	 * it's harmless way to add a bit to the first flag byte. */
 	if (protocol_version >= 28) {
-		if ((flags & 0xFF00) || flags == 0) {
+		if (!flags && !S_ISDIR(mode))
+			flags |= XMIT_TOP_DIR;
+		if ((flags & 0xFF00) || !flags) {
 			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) && !S_ISDIR(mode))
+			flags |= XMIT_TOP_DIR;
+		if (!(flags & 0xFF))
 			flags |= XMIT_LONG_NAME;
 		write_byte(f, flags);
 	}
@@ -479,18 +491,18 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	}
 	if (preserve_devices && IS_DEVICE(mode)) {
 		/* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
-		 * also off.  Also, avoid using "rdev" because it may be
-		 * incomplete. */
+		 * also off. */
 		if (!(flags & XMIT_SAME_HIGH_RDEV))
-			write_int(f, file->u.rdev);
+			write_int(f, rdev);
 		else if (protocol_version >= 28)
-			write_byte(f, file->u.rdev);
+			write_byte(f, rdev);
 	}
 
 #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
 
@@ -535,7 +547,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 {
 	static time_t modtime;
 	static mode_t mode;
-	static DEV64_T rdev;	/* just high bytes in p28 onward */
+	static DEV64_T rdev, rdev_high;
 	static DEV64_T dev;
 	static uid_t uid;
 	static gid_t gid;
@@ -547,7 +559,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 
 	if (!fptr) {
 		modtime = 0, mode = 0;
-		rdev = 0, dev = 0;
+		rdev = 0, rdev_high = 0, dev = 0;
 		uid = 0, gid = 0;
 		*lastname = '\0';
 		return;
@@ -579,13 +591,11 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 	thisname[l1 + l2] = 0;
 
 	strlcpy(lastname, thisname, MAXPATHLEN);
-	lastname[MAXPATHLEN - 1] = 0;
 
 	clean_fname(thisname);
 
-	if (sanitize_paths) {
+	if (sanitize_paths)
 		sanitize_path(thisname, NULL);
-	}
 
 	if ((p = strrchr(thisname, '/'))) {
 		static char *lastdir;
@@ -634,25 +644,29 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 				rdev = 0;
 		} else if (IS_DEVICE(mode)) {
 			if (!(flags & XMIT_SAME_HIGH_RDEV)) {
-				file->u.rdev = (DEV64_T)read_int(f);
-				rdev = file->u.rdev & ~0xFF;
+				rdev = (DEV64_T)read_int(f);
+				rdev_high = rdev & ~0xFF;
 			} else
-				file->u.rdev = rdev | (DEV64_T)read_byte(f);
+				rdev = rdev_high | (DEV64_T)read_byte(f);
+			file->u.rdev = rdev;
 		}
 	}
 
+#if SUPPORT_LINKS
 	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);
 	}
+#endif
+
 #if SUPPORT_HARD_LINKS
 	if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
 		flags |= XMIT_HAS_IDEV_DATA;
@@ -697,32 +711,6 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 }
 
 
-/* determine if a file in a different filesystem should be skipped
-   when one_file_system is set. We bascally only want to include
-   the mount points - but they can be hard to find! */
-static int skip_filesystem(char *fname, STRUCT_STAT * st)
-{
-	STRUCT_STAT st2;
-	char *p = strrchr(fname, '/');
-
-	/* skip all but directories */
-	if (!S_ISDIR(st->st_mode))
-		return 1;
-
-	/* if its not a subdirectory then allow */
-	if (!p)
-		return 0;
-
-	*p = 0;
-	if (link_stat(fname, &st2)) {
-		*p = '/';
-		return 0;
-	}
-	*p = '/';
-
-	return (st2.st_dev != filesystem_dev);
-}
-
 #define STRDUP(ap, p)	(ap ? string_area_strdup(ap, p) : strdup(p))
 /* IRIX cc cares that the operands to the ternary have the same type. */
 #define MALLOC(ap, i)	(ap ? (void*) string_area_malloc(ap, i) : malloc(i))
@@ -749,35 +737,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;
 	}
 
@@ -786,45 +774,51 @@ 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;
 	}
 
 	if (one_file_system && st.st_dev != filesystem_dev) {
-		if (skip_filesystem(fname, &st))
+		/* We allow a directory though to preserve the mount point.
+		 * However, flag it so that we don't recurse. */
+		if (!S_ISDIR(st.st_mode))
 			return NULL;
+		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, "make_file(%s,*,%d)\n", fname, exclude_level);
+	if (verbose > 2) {
+		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
+			who_am_i(), thisname, exclude_level);
+	}
 
 	file = new(struct file_struct);
 	if (!file)
 		out_of_memory("make_file");
 	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;
@@ -832,6 +826,18 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
+
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
+	if (preserve_devices && IS_DEVICE(st.st_mode))
+		file->u.rdev = st.st_rdev;
+#endif
+
+#if SUPPORT_LINKS
+	if (S_ISLNK(st.st_mode))
+		file->u.link = STRDUP(ap, linkname);
+#endif
+
+#if SUPPORT_HARD_LINKS
 	if (preserve_hard_links) {
 		if (protocol_version < 28 ? S_ISREG(st.st_mode)
 		    : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
@@ -841,20 +847,12 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 			file->F_INODE = st.st_ino;
 		}
 	}
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
-	if (IS_DEVICE(st.st_mode))
-		file->u.rdev = st.st_rdev;
-#endif
-
-#if SUPPORT_LINKS
-	if (S_ISLNK(st.st_mode))
-		file->u.link = STRDUP(ap, linkbuf);
 #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;
@@ -893,7 +891,8 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 		send_file_entry(file, f, base_flags);
 	}
 
-	if (S_ISDIR(file->mode) && recursive) {
+	if (recursive && S_ISDIR(file->mode)
+	    && !(file->flags & FLAG_MOUNT_POINT)) {
 		struct exclude_struct **last_exclude_list = local_exclude_list;
 		send_directory(f, flist, f_name_to(file, fbuf));
 		local_exclude_list = last_exclude_list;
@@ -1117,8 +1116,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				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);
 			}
@@ -1311,10 +1308,12 @@ void free_file(struct file_struct *file)
 		return;
 	if (file->basename)
 		free(file->basename);
-	if (!IS_DEVICE(file->mode) && file->u.link)
-		free(file->u.link); /* Handles u.sum too. */
+	if (!IS_DEVICE(file->mode) && file->u.sum)
+		free(file->u.sum); /* Handles u.link too. */
+#if SUPPORT_HARD_LINKS
 	if (file->link_u.idev)
 		free((char*)file->link_u.idev); /* Handles link_u.links too. */
+#endif
 	*file = null_file;
 }
 
@@ -1436,8 +1435,9 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		return;
 
 	for (i = 0; i < flist->count; i++) {
-		rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
-			(long) getpid(), i,
+		rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
+			who_am_i(), i,
+			NS(flist->files[i]->basedir),
 			NS(flist->files[i]->dirname),
 			NS(flist->files[i]->basename),
 			(int) flist->files[i]->mode,