X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e17883827b2f387e00172ac280484d77be47f70f..a2ebbffca75efb33a81624c2d7f5644784e0992b:/generator.c

diff --git a/generator.c b/generator.c
index dacb6c78..71bd5a72 100644
--- a/generator.c
+++ b/generator.c
@@ -234,7 +234,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
 	for (j = dirlist->count; j--; ) {
 		struct file_struct *fp = dirlist->files[j];
 
-		if (fp->flags & FLAG_MOUNT_POINT) {
+		if (fp->flags & FLAG_MOUNT_DIR) {
 			if (verbose > 1) {
 				rprintf(FINFO,
 				    "mount point, %s, pins parent directory\n",
@@ -244,7 +244,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
 			continue;
 		}
 
-		strlcpy(p, fp->basename, remainder);
+		strlcpy(p, F_BASENAME(fp), remainder);
 		/* Save stack by recursing to ourself directly. */
 		if (S_ISDIR(fp->mode)
 		 && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
@@ -391,9 +391,9 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 	 * from the filesystem. */
 	for (i = dirlist->count; i--; ) {
 		struct file_struct *fp = dirlist->files[i];
-		if (!fp->basename)
+		if (!F_IS_ACTIVE(fp))
 			continue;
-		if (fp->flags & FLAG_MOUNT_POINT) {
+		if (fp->flags & FLAG_MOUNT_DIR) {
 			if (verbose > 1)
 				rprintf(FINFO, "cannot delete mount point: %s\n",
 					f_name(fp, NULL));
@@ -426,7 +426,7 @@ static void do_delete_pass(struct file_list *flist)
 	for (j = 0; j < flist->count; j++) {
 		struct file_struct *file = flist->files[j];
 
-		if (!(file->flags & FLAG_DEL_HERE))
+		if (!(file->flags & FLAG_XFER_DIR))
 			continue;
 
 		f_name(file, fbuf);
@@ -451,10 +451,10 @@ int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
 		return 0;
 
-	if (am_root && preserve_uid && st->st_uid != file->uid)
+	if (am_root && preserve_uid && st->st_uid != F_UID(file))
 		return 0;
 
-	if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+	if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
 		return 0;
 
 	return 1;
@@ -468,7 +468,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 		    : S_ISDIR(file->mode) ? !omit_dir_times
 		    : !S_ISLNK(file->mode);
 
-		if (S_ISREG(file->mode) && file->length != st->st_size)
+		if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
 			iflags |= ITEM_REPORT_SIZE;
 		if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
 		  && !(iflags & ITEM_MATCHED)
@@ -477,10 +477,10 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 			iflags |= ITEM_REPORT_TIME;
 		if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
-		if (preserve_uid && am_root && file->uid != st->st_uid)
+		if (preserve_uid && am_root && F_UID(file) != st->st_uid)
 			iflags |= ITEM_REPORT_OWNER;
-		if (preserve_gid && file->gid != GID_NONE
-		    && st->st_gid != file->gid)
+		if (preserve_gid && F_GID(file) != GID_NONE
+		    && st->st_gid != F_GID(file))
 			iflags |= ITEM_REPORT_GROUP;
 	} else
 		iflags |= ITEM_IS_NEW;
@@ -507,7 +507,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 /* Perform our quick-check heuristic for determining if a file is unchanged. */
 int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
 {
-	if (st->st_size != file->length)
+	if (st->st_size != F_LENGTH(file))
 		return 0;
 
 	/* if always checksum is set then we use the checksum instead
@@ -515,7 +515,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
 	if (always_checksum && S_ISREG(st->st_mode)) {
 		char sum[MD4_SUM_LENGTH];
 		file_checksum(fn, sum, st->st_size);
-		return memcmp(sum, file->u.sum, checksum_len) == 0;
+		return memcmp(sum, F_SUM(file), checksum_len) == 0;
 	}
 
 	if (size_only)
@@ -664,7 +664,7 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 {
 	int fname_len, fname_suf_len;
-	const char *fname_suf, *fname = file->basename;
+	const char *fname_suf, *fname = F_BASENAME(file);
 	uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
 	int j, lowest_j = -1;
 
@@ -677,13 +677,12 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 		int len, suf_len;
 		uint32 dist;
 
-		if (!S_ISREG(fp->mode) || !fp->length
-		    || fp->flags & FLAG_NO_FUZZY)
+		if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_SENT)
 			continue;
 
-		name = fp->basename;
+		name = F_BASENAME(fp);
 
-		if (fp->length == file->length
+		if (F_LENGTH(fp) == F_LENGTH(file)
 		    && cmp_time(fp->modtime, file->modtime) == 0) {
 			if (verbose > 4) {
 				rprintf(FINFO,
@@ -723,10 +722,10 @@ void check_for_finished_hlinks(int itemizing, enum logcode code)
 			continue;
 
 		file = the_file_list->files[ndx];
-		if (!file->link_u.links)
+		if (!F_IS_HLINKED(file))
 			continue;
 
-		hard_link_cluster(file, ndx, itemizing, code);
+		hard_link_cluster(file, ndx, itemizing, code, -1);
 	}
 }
 
@@ -786,11 +785,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			if (hard_link_one(file, ndx, fname, 0, stp,
 					  cmpbuf, 1, i, code) < 0)
 				goto try_a_copy;
-			if (preserve_hard_links && file->link_u.links) {
-				if (dry_run)
-					file->link_u.links->link_dest_used = j + 1;
-				hard_link_cluster(file, ndx, itemizing, code);
-			}
+			if (preserve_hard_links && F_IS_HLINKED(file))
+				hard_link_cluster(file, ndx, itemizing, code, j);
 		} else
 #endif
 		if (itemizing)
@@ -820,8 +816,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			rprintf(code, "%s%s\n", fname,
 				match_level == 3 ? " is uptodate" : "");
 		}
-		if (preserve_hard_links && file->link_u.links)
-			hard_link_cluster(file, ndx, itemizing, code);
+		if (preserve_hard_links && F_IS_HLINKED(file))
+			hard_link_cluster(file, ndx, itemizing, code, j);
 		return -2;
 	}
 
@@ -895,7 +891,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			break;
 		case TYPE_SPECIAL:
 		case TYPE_DEVICE:
-			if (stp->st_rdev != file->u.rdev)
+			if (stp->st_rdev != MAKEDEV(F_DMAJOR(file), F_DMINOR(file)))
 				continue;
 			break;
 #ifdef SUPPORT_LINKS
@@ -903,7 +899,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0)
 				continue;
 			lnk[len] = '\0';
-			if (strcmp(lnk, file->u.link) != 0)
+			if (strcmp(lnk, F_SYMLINK(file)) != 0)
 				continue;
 			break;
 #endif
@@ -945,8 +941,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 					cmpbuf, fname);
 				return j;
 			}
-			if (preserve_hard_links && file->link_u.links)
-				hard_link_cluster(file, ndx, itemizing, code);
+			if (preserve_hard_links && F_IS_HLINKED(file))
+				hard_link_cluster(file, ndx, itemizing, code, -1);
 		} else
 #endif
 			match_level = 2;
@@ -1138,7 +1134,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",
 					full_fname(fname));
-				file->flags |= FLAG_MISSING;
+				file->flags |= FLAG_MISSING_DIR;
 				if (ndx+1 < the_file_list->count
 				 && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
 					rprintf(FERROR,
@@ -1154,25 +1150,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (real_ret != 0 && one_file_system)
 			real_st.st_dev = filesystem_dev;
 		if (delete_during && f_out != -1 && !phase && dry_run < 2
-		    && (file->flags & FLAG_DEL_HERE))
+		    && (file->flags & FLAG_XFER_DIR))
 			delete_in_dir(the_file_list, fname, file, &real_st);
 		return;
 	}
 
-	if (preserve_hard_links && file->link_u.links
+	if (preserve_hard_links && F_IS_HLINKED(file)
 	    && hard_link_check(file, ndx, fname, statret, &st,
 			       itemizing, code, HL_CHECK_MASTER))
 		return;
 
 	if (preserve_links && S_ISLNK(file->mode)) {
 #ifdef SUPPORT_LINKS
-		if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
+		const char *sl = F_SYMLINK(file);
+		if (safe_symlinks && unsafe_symlink(sl, fname)) {
 			if (verbose) {
 				if (the_file_list->count == 1)
 					fname = f_name(file, NULL);
 				rprintf(FINFO,
 					"ignoring unsafe symlink %s -> \"%s\"\n",
-					full_fname(fname), file->u.link);
+					full_fname(fname), sl);
 			}
 			return;
 		}
@@ -1183,14 +1180,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			if (!S_ISLNK(st.st_mode))
 				statret = -1;
 			else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
-			      && strncmp(lnk, file->u.link, len) == 0
-			      && file->u.link[len] == '\0') {
+			      && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
 				/* The link is pointing to the right place. */
 				if (itemizing)
 					itemize(file, ndx, 0, &st, 0, 0, NULL);
 				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
-				if (preserve_hard_links && file->link_u.links)
-					hard_link_cluster(file, ndx, itemizing, code);
+				if (preserve_hard_links && F_IS_HLINKED(file))
+					hard_link_cluster(file, ndx, itemizing, code, -1);
 				if (remove_source_files == 1)
 					goto return_with_success;
 				return;
@@ -1215,13 +1211,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			} else if (j >= 0)
 				statret = 1;
 		}
-		if (preserve_hard_links && file->link_u.links
+		if (preserve_hard_links && F_IS_HLINKED(file)
 		    && hard_link_check(file, ndx, fname, -1, &st,
 				       itemizing, code, HL_SKIP))
 			return;
-		if (do_symlink(file->u.link, fname) != 0) {
+		if (do_symlink(sl, fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
-				full_fname(fname), file->u.link);
+				full_fname(fname), sl);
 		} else {
 			set_file_attrs(fname, file, NULL, 0);
 			if (itemizing) {
@@ -1229,9 +1225,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					ITEM_LOCAL_CHANGE, 0, NULL);
 			}
 			if (code != FNONE && verbose)
-				rprintf(code, "%s -> %s\n", fname, file->u.link);
-			if (preserve_hard_links && file->link_u.links)
-				hard_link_cluster(file, ndx, itemizing, code);
+				rprintf(code, "%s -> %s\n", fname, sl);
+			if (preserve_hard_links && F_IS_HLINKED(file))
+				hard_link_cluster(file, ndx, itemizing, code, -1);
 			/* This does not check remove_source_files == 1
 			 * because this is one of the items that the old
 			 * --remove-sent-files option would remove. */
@@ -1244,6 +1240,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
 	 || (preserve_specials && IS_SPECIAL(file->mode))) {
+		dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file));
 		if (statret == 0) {
 			char *t;
 			if (IS_DEVICE(file->mode)) {
@@ -1257,13 +1254,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			if (statret == 0
 			 && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
-			 && st.st_rdev == file->u.rdev) {
+			 && st.st_rdev == rdev) {
 				/* The device or special file is identical. */
 				if (itemizing)
 					itemize(file, ndx, 0, &st, 0, 0, NULL);
 				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
-				if (preserve_hard_links && file->link_u.links)
-					hard_link_cluster(file, ndx, itemizing, code);
+				if (preserve_hard_links && F_IS_HLINKED(file))
+					hard_link_cluster(file, ndx, itemizing, code, -1);
 				if (remove_source_files == 1)
 					goto return_with_success;
 				return;
@@ -1286,15 +1283,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			} else if (j >= 0)
 				statret = 1;
 		}
-		if (preserve_hard_links && file->link_u.links
+		if (preserve_hard_links && F_IS_HLINKED(file)
 		    && hard_link_check(file, ndx, fname, -1, &st,
 				       itemizing, code, HL_SKIP))
 			return;
 		if (verbose > 2) {
 			rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-				fname, (int)file->mode, (int)file->u.rdev);
+				fname, (int)file->mode, (int)rdev);
 		}
-		if (do_mknod(fname, file->mode, file->u.rdev) < 0) {
+		if (do_mknod(fname, file->mode, rdev) < 0) {
 			rsyserr(FERROR, errno, "mknod %s failed",
 				full_fname(fname));
 		} else {
@@ -1305,8 +1302,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			if (code != FNONE && verbose)
 				rprintf(code, "%s\n", fname);
-			if (preserve_hard_links && file->link_u.links)
-				hard_link_cluster(file, ndx, itemizing, code);
+			if (preserve_hard_links && F_IS_HLINKED(file))
+				hard_link_cluster(file, ndx, itemizing, code, -1);
 			if (remove_source_files == 1)
 				goto return_with_success;
 		}
@@ -1320,7 +1317,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 	}
 
-	if (max_size && file->length > max_size) {
+	if (max_size && F_LENGTH(file) > max_size) {
 		if (verbose > 1) {
 			if (the_file_list->count == 1)
 				fname = f_name(file, NULL);
@@ -1328,7 +1325,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		return;
 	}
-	if (min_size && file->length < min_size) {
+	if (min_size && F_LENGTH(file) < min_size) {
 		if (verbose > 1) {
 			if (the_file_list->count == 1)
 				fname = f_name(file, NULL);
@@ -1395,7 +1392,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
 					fname, fnamecmpbuf);
 			}
-			st.st_size = fuzzy_file->length;
+			st.st_size = F_LENGTH(fuzzy_file);
 			statret = 0;
 			fnamecmp = fnamecmpbuf;
 			fnamecmp_type = FNAMECMP_FUZZY;
@@ -1403,7 +1400,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	if (statret != 0) {
-		if (preserve_hard_links && file->link_u.links
+		if (preserve_hard_links && F_IS_HLINKED(file)
 		    && hard_link_check(file, ndx, fname, statret, &st,
 				       itemizing, code, HL_SKIP))
 			return;
@@ -1414,7 +1411,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 	}
 
-	if (append_mode && st.st_size > file->length)
+	if (append_mode && st.st_size > F_LENGTH(file))
 		return;
 
 	if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
@@ -1431,16 +1428,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				0, 0, NULL);
 		}
 		set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
-		if (preserve_hard_links && file->link_u.links)
-			hard_link_cluster(file, ndx, itemizing, code);
+		if (preserve_hard_links && F_IS_HLINKED(file))
+			hard_link_cluster(file, ndx, itemizing, code, -1);
 		if (remove_source_files != 1)
 			return;
 	  return_with_success:
-		if (!dry_run) {
-			char numbuf[4];
-			SIVAL(numbuf, 0, ndx);
-			send_msg(MSG_SUCCESS, numbuf, 4);
-		}
+		if (!dry_run)
+			send_msg_int(MSG_SUCCESS, ndx);
 		return;
 	}
 
@@ -1458,7 +1452,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	if (fuzzy_dirlist) {
 		int j = flist_find(fuzzy_dirlist, file);
 		if (j >= 0) /* don't use changing file as future fuzzy basis */
-			fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
+			fuzzy_dirlist->files[j]->flags |= FLAG_SENT;
 	}
 
 	/* open the file */
@@ -1469,7 +1463,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			full_fname(fnamecmp));
 	  pretend_missing:
 		/* pretend the file didn't exist */
-		if (preserve_hard_links && file->link_u.links
+		if (preserve_hard_links && F_IS_HLINKED(file)
 		    && hard_link_check(file, ndx, fname, statret, &st,
 				       itemizing, code, HL_SKIP))
 			return;
@@ -1489,7 +1483,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (robust_unlink(backupptr) && errno != ENOENT) {
 			rsyserr(FERROR, errno, "unlink %s",
 				full_fname(backupptr));
-			free(back_file);
+			unmake_file(back_file);
 			close(fd);
 			return;
 		}
@@ -1497,7 +1491,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		    O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
 			rsyserr(FERROR, errno, "open %s",
 				full_fname(backupptr));
-			free(back_file);
+			unmake_file(back_file);
 			close(fd);
 			return;
 		}
@@ -1525,12 +1519,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (fnamecmp_type == FNAMECMP_FUZZY)
 			iflags |= ITEM_XNAME_FOLLOWS;
 		itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
-			fuzzy_file ? fuzzy_file->basename : NULL);
+			fuzzy_file ? F_BASENAME(fuzzy_file) : NULL);
 	}
 
 	if (!do_xfers) {
-		if (preserve_hard_links && file->link_u.links)
-			hard_link_cluster(file, ndx, itemizing, code);
+		if (preserve_hard_links && F_IS_HLINKED(file))
+			hard_link_cluster(file, ndx, itemizing, code, -1);
 		return;
 	}
 	if (read_batch)
@@ -1550,7 +1544,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			rprintf(FINFO, "backed up %s to %s\n",
 				fname, backupptr);
 		}
-		free(back_file);
+		unmake_file(back_file);
 	}
 
 	close(fd);
@@ -1618,7 +1612,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	for (i = 0; i < flist->count; i++) {
 		struct file_struct *file = flist->files[i];
 
-		if (!file->basename)
+		if (!F_IS_ACTIVE(file))
 			continue;
 
 		if (local_name)
@@ -1669,7 +1663,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files phase=%d\n",phase);
 
-	write_int(f_out, -1);
+	write_int(f_out, NDX_DONE);
 
 	/* files can cycle through the system more than once
 	 * to catch initial checksum errors */
@@ -1691,10 +1685,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files phase=%d\n",phase);
 
-	write_int(f_out, -1);
+	write_int(f_out, NDX_DONE);
 	/* Reduce round-trip lag-time for a useless delay-updates phase. */
 	if (protocol_version >= 29 && !delay_updates)
-		write_int(f_out, -1);
+		write_int(f_out, NDX_DONE);
 
 	/* Read MSG_DONE for the redo phase (and any prior messages). */
 	get_redo_num(itemizing, code);
@@ -1704,7 +1698,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		if (verbose > 2)
 			rprintf(FINFO, "generate_files phase=%d\n", phase);
 		if (delay_updates)
-			write_int(f_out, -1);
+			write_int(f_out, NDX_DONE);
 		/* Read MSG_DONE for delay-updates phase & prior messages. */
 		get_redo_num(itemizing, code);
 	}
@@ -1722,12 +1716,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		 * modified-time values. */
 		for (i = 0; i < flist->count; i++) {
 			struct file_struct *file = flist->files[i];
-
-			if (!file->basename || !S_ISDIR(file->mode))
+			if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode))
 				continue;
 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
 				continue;
-			if (file->flags & FLAG_MISSING) {
+			if (file->flags & FLAG_MISSING_DIR) {
 				int missing = file->dir.depth;
 				while (++i < flist->count) {
 					file = flist->files[i];