X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..8e41b68e8f975c02a5d9281be780ba5d1a385107:/hlink.c

diff --git a/hlink.c b/hlink.c
index 010389db..e9e76cdb 100644
--- a/hlink.c
+++ b/hlink.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2004-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
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,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"
@@ -26,6 +26,7 @@ extern int verbose;
 extern int dry_run;
 extern int do_xfers;
 extern int link_dest;
+extern int preserve_acls;
 extern int make_backups;
 extern int protocol_version;
 extern int remove_source_files;
@@ -33,11 +34,13 @@ extern int stdout_format_has_i;
 extern int maybe_ATTRS_REPORT;
 extern char *basis_dir[];
 extern struct file_list *cur_flist;
+#ifdef ICONV_OPTION
+extern int ic_ndx;
+#endif
 
 #ifdef SUPPORT_HARD_LINKS
 
 #define HASH_LOAD_LIMIT(size) ((size)*3/4)
-#define FPTR(i) (cur_flist->files[i])
 
 struct ihash_table {
 	int32 size;
@@ -199,8 +202,8 @@ void idev_destroy(void)
 
 static int hlink_compare_gnum(int *int1, int *int2)
 {
-	struct file_struct *f1 = FPTR(*int1);
-	struct file_struct *f2 = FPTR(*int2);
+	struct file_struct *f1 = cur_flist->sorted[*int1];
+	struct file_struct *f2 = cur_flist->sorted[*int2];
 	int32 gnum1 = F_HL_GNUM(f1);
 	int32 gnum2 = F_HL_GNUM(f2);
 
@@ -220,17 +223,24 @@ static void match_gnums(int32 *ndx_list, int ndx_count)
 	     (int (*)()) hlink_compare_gnum);
 
 	for (from = 0; from < ndx_count; from++) {
-		for (file = FPTR(ndx_list[from]), gnum = F_HL_GNUM(file), prev = -1;
+		for (file = cur_flist->sorted[ndx_list[from]], gnum = F_HL_GNUM(file), prev = -1;
 		     from < ndx_count-1;
-		     file = file_next, gnum = gnum_next, prev = ndx_list[from++])
+		     file = file_next, gnum = gnum_next, from++) /*SHARED ITERATOR*/
 		{
-			file_next = FPTR(ndx_list[from+1]);
+			file_next = cur_flist->sorted[ndx_list[from+1]];
 			gnum_next = F_HL_GNUM(file_next);
 			if (gnum != gnum_next)
 				break;
 			if (prev < 0)
 				file->flags |= FLAG_HLINK_FIRST;
 			F_HL_PREV(file) = prev;
+			/* The linked list must use raw ndx values. */
+#ifdef ICONV_OPTION
+			if (ic_ndx)
+				prev = F_NDX(file);
+			else
+#endif
+				prev = ndx_list[from];
 		}
 		if (prev < 0)
 			file->flags &= ~FLAG_HLINKED;
@@ -250,11 +260,11 @@ void match_hard_links(void)
 	int i, ndx_count = 0;
 	int32 *ndx_list;
 
-	if (!(ndx_list = new_array(int32, cur_flist->count)))
+	if (!(ndx_list = new_array(int32, cur_flist->used)))
 		out_of_memory("match_hard_links");
 
-	for (i = 0; i < cur_flist->count; i++) {
-		if (F_IS_HLINKED(FPTR(i)))
+	for (i = 0; i < cur_flist->used; i++) {
+		if (F_IS_HLINKED(cur_flist->sorted[i]))
 			ndx_list[ndx_count++] = i;
 	}
 
@@ -267,15 +277,15 @@ void match_hard_links(void)
 }
 
 static int maybe_hard_link(struct file_struct *file, int ndx,
-			   const char *fname, int statret, STRUCT_STAT *stp,
+			   const char *fname, int statret, statx *sxp,
 			   const char *oldname, STRUCT_STAT *old_stp,
 			   const char *realname, int itemizing, enum logcode code)
 {
 	if (statret == 0) {
-		if (stp->st_dev == old_stp->st_dev
-		 && stp->st_ino == old_stp->st_ino) {
+		if (sxp->st.st_dev == old_stp->st_dev
+		 && sxp->st.st_ino == old_stp->st_ino) {
 			if (itemizing) {
-				itemize(file, ndx, statret, stp,
+				itemize(fname, file, ndx, statret, sxp,
 					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
 					0, "");
 			}
@@ -296,7 +306,7 @@ static int maybe_hard_link(struct file_struct *file, int ndx,
 
 	if (hard_link_one(file, fname, oldname, 0)) {
 		if (itemizing) {
-			itemize(file, ndx, statret, stp,
+			itemize(fname, file, ndx, statret, sxp,
 				ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
 				realname);
 		}
@@ -310,13 +320,13 @@ static int maybe_hard_link(struct file_struct *file, int ndx,
 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not.  Returns:
  * 0 = process the file, 1 = skip the file, -1 = error occurred. */
 int hard_link_check(struct file_struct *file, int ndx, const char *fname,
-		    int statret, STRUCT_STAT *stp, int itemizing,
+		    int statret, statx *sxp, int itemizing,
 		    enum logcode code)
 {
 	STRUCT_STAT prev_st;
 	char prev_name[MAXPATHLEN], altbuf[MAXPATHLEN], *realname;
 	int alt_dest, prev_ndx = F_HL_PREV(file);
-	struct file_struct *prev_file = FPTR(prev_ndx);
+	struct file_struct *prev_file = cur_flist->files[prev_ndx];
 
 	/* Is the previous link is not complete yet? */
 	if (!(prev_file->flags & FLAG_HLINK_DONE)) {
@@ -337,7 +347,7 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
 	if (!(prev_file->flags & FLAG_HLINK_FIRST)) {
 		/* The previous previous will be marked with FIRST. */
 		prev_ndx = F_HL_PREV(prev_file);
-		prev_file = FPTR(prev_ndx);
+		prev_file = cur_flist->files[prev_ndx];
 		/* Update our previous pointer to point to the first. */
 		F_HL_PREV(file) = prev_ndx;
 	}
@@ -361,18 +371,20 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
 	if (statret < 0 && basis_dir[0] != NULL) {
 		/* If we match an alt-dest item, we don't output this as a change. */
 		char cmpbuf[MAXPATHLEN];
-		STRUCT_STAT alt_st;
+		statx alt_sx;
 		int j = 0;
+#ifdef SUPPORT_ACLS
+		alt_sx.acc_acl = alt_sx.def_acl = NULL;
+#endif
 		do {
 			pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
-			if (link_stat(cmpbuf, &alt_st, 0) < 0)
+			if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
 				continue;
 			if (link_dest) {
-				if (prev_st.st_dev != alt_st.st_dev
-				 || prev_st.st_ino != alt_st.st_ino)
+				if (prev_st.st_dev != alt_sx.st.st_dev
+				 || prev_st.st_ino != alt_sx.st.st_ino)
 					continue;
 				statret = 1;
-				*stp = alt_st;
 				if (verbose < 2 || !stdout_format_has_i) {
 					itemizing = 0;
 					code = FNONE;
@@ -381,16 +393,32 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
 				}
 				break;
 			}
-			if (!unchanged_file(cmpbuf, file, &alt_st))
+			if (!unchanged_file(cmpbuf, file, &alt_sx.st))
 				continue;
 			statret = 1;
-			*stp = alt_st;
-			if (unchanged_attrs(file, &alt_st))
+			if (unchanged_attrs(cmpbuf, file, &alt_sx))
 				break;
 		} while (basis_dir[++j] != NULL);
+		if (statret == 1) {
+			sxp->st = alt_sx.st;
+#ifdef SUPPORT_ACLS
+			if (preserve_acls && !S_ISLNK(file->mode)) {
+				if (!ACL_READY(*sxp))
+					get_acl(cmpbuf, sxp);
+				else {
+					sxp->acc_acl = alt_sx.acc_acl;
+					sxp->def_acl = alt_sx.def_acl;
+				}
+			}
+#endif
+		}
+#ifdef SUPPORT_ACLS
+		else if (preserve_acls)
+			free_acl(&alt_sx);
+#endif
 	}
 
-	if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
+	if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
 			    realname, itemizing, code) < 0)
 		return -1;
 
@@ -425,7 +453,8 @@ void finish_hard_link(struct file_struct *file, const char *fname,
 		      STRUCT_STAT *stp, int itemizing, enum logcode code,
 		      int alt_dest)
 {
-	STRUCT_STAT st, prev_st;
+	statx prev_sx;
+	STRUCT_STAT st;
 	char alt_name[MAXPATHLEN], *prev_name;
 	const char *our_name;
 	int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
@@ -449,14 +478,24 @@ void finish_hard_link(struct file_struct *file, const char *fname,
 	} else
 		our_name = fname;
 
+#ifdef SUPPORT_ACLS
+	prev_sx.acc_acl = prev_sx.def_acl = NULL;
+#endif
+
 	while ((ndx = prev_ndx) >= 0) {
-		file = FPTR(ndx);
+		int val;
+		file = cur_flist->files[ndx];
 		file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
 		prev_ndx = F_HL_PREV(file);
 		prev_name = f_name(file, NULL);
-		prev_statret = link_stat(prev_name, &prev_st, 0);
-		if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
-				    our_name, stp, fname, itemizing, code) < 0)
+		prev_statret = link_stat(prev_name, &prev_sx.st, 0);
+		val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
+				      our_name, stp, fname, itemizing, code);
+#ifdef SUPPORT_ACLS
+		if (preserve_acls)
+			free_acl(&prev_sx);
+#endif
+		if (val < 0)
 			continue;
 		if (remove_source_files == 1 && do_xfers)
 			send_msg_int(MSG_SUCCESS, ndx);