X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16edf86595a5a990a942fa045dfb523dae1fe6cb..e5bf3b58558733a233f598ffb580207b7977994d:/generator.c

diff --git a/generator.c b/generator.c
index 09c6b7d2..f4ecbbd1 100644
--- a/generator.c
+++ b/generator.c
@@ -7,7 +7,7 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
+ * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -42,10 +41,10 @@ extern int preserve_devices;
 extern int preserve_specials;
 extern int preserve_hard_links;
 extern int preserve_perms;
-extern int preserve_uid;
-extern int preserve_gid;
 extern int preserve_times;
 extern int omit_dir_times;
+extern int uid_ndx;
+extern int gid_ndx;
 extern int delete_mode;
 extern int delete_before;
 extern int delete_during;
@@ -97,6 +96,9 @@ extern char *backup_suffix;
 extern int backup_suffix_len;
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
 extern struct filter_list_struct server_filter_list;
+#ifdef ICONV_OPTION
+extern int ic_ndx;
+#endif
 
 int ignore_perishable = 0;
 int non_perishable_cnt = 0;
@@ -110,6 +112,7 @@ static int deldelay_fd = -1;
 static int lull_mod;
 static int dir_tweaking;
 static int need_retouch_dir_times;
+static int need_retouch_dir_perms;
 static const char *solo_file = NULL;
 
 /* For calling delete_item() and delete_dir_contents(). */
@@ -228,7 +231,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
 	dirlist = get_dirlist(fname, dlen, 0);
 	ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
 
-	if (!dirlist->count)
+	if (!dirlist->used)
 		goto done;
 
 	if (!(flags & DEL_RECURSE)) {
@@ -244,7 +247,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
 	/* We do our own recursion, so make delete_item() non-recursive. */
 	flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
 
-	for (j = dirlist->count; j--; ) {
+	for (j = dirlist->used; j--; ) {
 		struct file_struct *fp = dirlist->files[j];
 
 		if (fp->flags & FLAG_MOUNT_DIR) {
@@ -415,15 +418,14 @@ static void do_delayed_deletions(char *delbuf)
  * MAXPATHLEN buffer with the name of the directory in it (the functions we
  * call will append names onto the end, but the old dir value will be restored
  * on exit). */
-static void delete_in_dir(struct file_list *flist, char *fbuf,
-			  struct file_struct *file, dev_t *fs_dev)
+static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
 {
 	static int already_warned = 0;
 	struct file_list *dirlist;
 	char delbuf[MAXPATHLEN];
 	int dlen, i;
 
-	if (!flist) {
+	if (!fbuf) {
 		change_local_filter_dir(NULL, 0, 0);
 		return;
 	}
@@ -457,7 +459,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 
 	/* If an item in dirlist is not found in flist, delete it
 	 * from the filesystem. */
-	for (i = dirlist->count; i--; ) {
+	for (i = dirlist->used; i--; ) {
 		struct file_struct *fp = dirlist->files[i];
 		if (!F_IS_ACTIVE(fp))
 			continue;
@@ -467,7 +469,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 					f_name(fp, NULL));
 			continue;
 		}
-		if (flist_find(flist, fp) < 0) {
+		if (flist_find(cur_flist, fp) < 0) {
 			f_name(fp, delbuf);
 			if (delete_during == 2) {
 				if (!remember_delete(fp, delbuf))
@@ -482,7 +484,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 
 /* This deletes any files on the receiving side that are not present on the
  * sending side.  This is used by --delete-before and --delete-after. */
-static void do_delete_pass(struct file_list *flist)
+static void do_delete_pass(void)
 {
 	char fbuf[MAXPATHLEN];
 	STRUCT_STAT st;
@@ -492,8 +494,8 @@ static void do_delete_pass(struct file_list *flist)
 	if (dry_run > 1 || list_only)
 		return;
 
-	for (j = 0; j < flist->count; j++) {
-		struct file_struct *file = flist->files[j];
+	for (j = 0; j < cur_flist->used; j++) {
+		struct file_struct *file = cur_flist->sorted[j];
 
 		if (!(file->flags & FLAG_XFER_DIR))
 			continue;
@@ -506,9 +508,9 @@ static void do_delete_pass(struct file_list *flist)
 		 || !S_ISDIR(st.st_mode))
 			continue;
 
-		delete_in_dir(flist, fbuf, file, &st.st_dev);
+		delete_in_dir(fbuf, file, &st.st_dev);
 	}
-	delete_in_dir(NULL, NULL, NULL, &dev_zero);
+	delete_in_dir(NULL, NULL, &dev_zero);
 
 	if (do_progress && !am_server)
 		rprintf(FINFO, "                    \r");
@@ -519,10 +521,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
 	if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
 		return 0;
 
-	if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
+	if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file))
 		return 0;
 
-	if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
+	if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
 		return 0;
 
 #ifdef SUPPORT_ACLS
@@ -563,10 +565,10 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
 			iflags |= ITEM_REPORT_TIME;
 		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
-		if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
+		if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
 			iflags |= ITEM_REPORT_OWNER;
-		if (preserve_gid && F_GID(file) != GID_NONE
-		    && sxp->st.st_gid != F_GID(file))
+		if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
+		    && sxp->st.st_gid != (gid_t)F_GROUP(file))
 			iflags |= ITEM_REPORT_GROUP;
 #ifdef SUPPORT_ACLS
 		if (preserve_acls && !S_ISLNK(file->mode)) {
@@ -782,7 +784,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 	fname_len = strlen(fname);
 	fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len);
 
-	for (j = 0; j < dirlist->count; j++) {
+	for (j = 0; j < dirlist->used; j++) {
 		struct file_struct *fp = dirlist->files[j];
 		const char *suf, *name;
 		int len, suf_len;
@@ -1260,6 +1262,22 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
 		    && verbose && code != FNONE && f_out != -1)
 			rprintf(code, "%s/\n", fname);
+
+		/* We need to ensure that the dirs in the transfer have writable
+		 * permissions during the time we are putting files within them.
+		 * This is then fixed after the transfer is done. */
+#ifdef HAVE_CHMOD
+		if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) {
+			mode_t mode = file->mode | S_IWUSR;
+			if (do_chmod(fname, mode) < 0) {
+				rsyserr(FERROR, errno,
+					"failed to modify permissions on %s",
+					full_fname(fname));
+			}
+			need_retouch_dir_perms = 1;
+		}
+#endif
+
 		if (real_ret != 0 && one_file_system)
 			real_sx.st.st_dev = filesystem_dev;
 		if (inc_recurse) {
@@ -1271,7 +1289,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		else if (delete_during && f_out != -1 && !phase && dry_run < 2
 		    && (file->flags & FLAG_XFER_DIR))
-			delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev);
+			delete_in_dir(fname, file, &real_sx.st.st_dev);
 		goto cleanup;
 	}
 
@@ -1718,20 +1736,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 static void touch_up_dirs(struct file_list *flist, int ndx)
 {
+	static int counter = 0;
 	struct file_struct *file;
 	char *fname;
-	int i, j, start, end;
+	int i, start, end;
 
 	if (ndx < 0) {
 		start = 0;
-		end = flist->count - 1;
+		end = flist->used - 1;
 	} else
 		start = end = ndx;
 
 	/* Fix any directory permissions that were modified during the
 	 * transfer and/or re-set any tweaked modified-time values. */
-	for (i = start, j = 0; i <= end; i++) {
+	for (i = start; i <= end; i++, counter++) {
 		file = flist->files[i];
+		if (verbose > 3) {
+			fname = f_name(file, NULL);
+			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
+				NS(fname), i);
+		}
 		if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode)
 		 || file->flags & FLAG_MISSING_DIR)
 			continue;
@@ -1742,9 +1766,9 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 			do_chmod(fname, file->mode);
 		if (need_retouch_dir_times)
 			set_modtime(fname, file->modtime, file->mode);
-		if (allowed_lull && !(++j % lull_mod))
+		if (allowed_lull && !(counter % lull_mod))
 			maybe_send_keepalive();
-		else if (!(j % 200))
+		else if (!(counter & 0xFF))
 			maybe_flush_socket(0);
 	}
 }
@@ -1827,11 +1851,10 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
 
 void generate_files(int f_out, const char *local_name)
 {
-	int i;
+	int i, ndx;
 	char fbuf[MAXPATHLEN];
 	int itemizing;
 	enum logcode code;
-	int need_retouch_dir_perms = 0;
 	int save_do_progress = do_progress;
 
 	if (protocol_version >= 29) {
@@ -1859,8 +1882,8 @@ void generate_files(int f_out, const char *local_name)
 	if (verbose > 2)
 		rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
 
-	if (delete_before && !solo_file && cur_flist->count > 0)
-		do_delete_pass(cur_flist);
+	if (delete_before && !solo_file && cur_flist->used > 0)
+		do_delete_pass();
 	if (delete_during == 2) {
 		deldelay_size = BIGPATHBUFLEN * 4;
 		deldelay_buf = new_array(char, deldelay_size);
@@ -1887,54 +1910,55 @@ void generate_files(int f_out, const char *local_name)
 	dflt_perms = (ACCESSPERMS & ~orig_umask);
 
 	do {
-		if (inc_recurse && delete_during && cur_flist->ndx_start) {
+		if (inc_recurse && cur_flist->ndx_start) {
 			struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
-			if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) {
-				dev_t dirdev;
-				if (one_file_system) {
-					uint32 *devp = F_DIRDEV_P(fp);
-					dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
-				} else
-					dirdev = MAKEDEV(0, 0);
-				delete_in_dir(cur_flist, f_name(fp, fbuf), fp, &dirdev);
+			f_name(fp, fbuf);
+			ndx = cur_flist->ndx_start - 1;
+			recv_generator(fbuf, fp, ndx, itemizing, code, f_out);
+			if (delete_during) {
+				if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) {
+					dev_t dirdev;
+					if (one_file_system) {
+						uint32 *devp = F_DIRDEV_P(fp);
+						dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+					} else
+						dirdev = MAKEDEV(0, 0);
+					delete_in_dir(f_name(fp, fbuf), fp, &dirdev);
+				}
 			}
 		}
 		for (i = cur_flist->low; i <= cur_flist->high; i++) {
-			struct file_struct *file = cur_flist->files[i];
+			struct file_struct *file = cur_flist->sorted[i];
 
 			if (!F_IS_ACTIVE(file))
 				continue;
 
+			if (inc_recurse && S_ISDIR(file->mode)) {
+				/* Regular dirs are at the end, so we can stop. */
+				if (F_DEPTH(file))
+					break;
+				/* A dot-dir is at the start, so just skip it. */
+				continue;
+			}
+
+#ifdef ICONV_OPTION
+			if (ic_ndx)
+				ndx = F_NDX(file);
+			else
+#endif
+				ndx = i + cur_flist->ndx_start;
+
 			if (solo_file)
 				strlcpy(fbuf, solo_file, sizeof fbuf);
 			else
 				f_name(file, fbuf);
-			recv_generator(fbuf, file, i + cur_flist->ndx_start,
-				       itemizing, code, f_out);
-
-			/* We need to ensure that any dirs we create have
-			 * writeable permissions during the time we are putting
-			 * files within them.  This is then fixed after the
-			 * transfer is done. */
-#ifdef HAVE_CHMOD
-			if (!am_root && S_ISDIR(file->mode)
-			 && !(file->mode & S_IWUSR) && dir_tweaking) {
-				mode_t mode = file->mode | S_IWUSR;
-				const char *fname = solo_file ? solo_file : fbuf;
-				if (do_chmod(fname, mode) < 0) {
-					rsyserr(FERROR, errno,
-					    "failed to modify permissions on %s",
-					    full_fname(fname));
-				}
-				need_retouch_dir_perms = 1;
-			}
-#endif
+			recv_generator(fbuf, file, ndx, itemizing, code, f_out);
 
 			check_for_finished_files(itemizing, code, 0);
 
 			if (allowed_lull && !(i % lull_mod))
 				maybe_send_keepalive();
-			else if (!(i % 200))
+			else if (!(i & 0xFF))
 				maybe_flush_socket(0);
 		}
 
@@ -1952,7 +1976,7 @@ void generate_files(int f_out, const char *local_name)
 	} while ((cur_flist = cur_flist->next) != NULL);
 
 	if (delete_during)
-		delete_in_dir(NULL, NULL, NULL, &dev_zero);
+		delete_in_dir(NULL, NULL, &dev_zero);
 	phase++;
 	if (verbose > 2)
 		rprintf(FINFO, "generate_files phase=%d\n", phase);
@@ -1996,11 +2020,11 @@ void generate_files(int f_out, const char *local_name)
 	if (delete_during == 2)
 		do_delayed_deletions(fbuf);
 	if (delete_after && !solo_file && file_total > 0)
-		do_delete_pass(cur_flist);
+		do_delete_pass();
 
 	if ((need_retouch_dir_perms || need_retouch_dir_times)
 	 && dir_tweaking && (!inc_recurse || delete_during == 2))
-		touch_up_dirs(inc_recurse ? dir_flist : cur_flist, -1);
+		touch_up_dirs(dir_flist, -1);
 
 	if (max_delete >= 0 && deletion_count > max_delete) {
 		rprintf(FINFO,