X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13c5b463610baf30f9af52d32a7da6de1bdbaa53..6de0d062599b12263d212d55adfa8a4131ad8215:/hlink.c

diff --git a/hlink.c b/hlink.c
index 988de701..7fc92ac7 100644
--- a/hlink.c
+++ b/hlink.c
@@ -1,188 +1,317 @@
 /*
-   Copyright (C) Andrew Tridgell 1996
-   Copyright (C) Paul Mackerras 1996
-   Copyright (C) 2002 by Martin Pool <mbp@samba.org>
+ * Routines to support hard-linking.
+ *
+ * Copyright (C) 1996 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ */
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+#include "rsync.h"
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+extern int verbose;
+extern int dry_run;
+extern int do_xfers;
+extern int link_dest;
+extern int make_backups;
+extern int remove_source_files;
+extern int stdout_format_has_i;
+extern int maybe_ATTRS_REPORT;
+extern char *basis_dir[];
+extern struct file_list *the_file_list;
 
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+#ifdef SUPPORT_HARD_LINKS
 
-#include "rsync.h"
+alloc_pool_t hlink_pool;
 
-extern int dry_run;
-extern int verbose;
+#define FPTR(i) (the_file_list->files[i])
+#define LINKED(i1,i2) ((i1)->dev == (i2)->dev && (i1)->ino == (i2)->ino)
+
+void init_hard_links(void)
+{
+	if (!(hlink_pool = pool_create(HLINK_EXTENT, sizeof (struct idev),
+				       out_of_memory, POOL_INTERN)))
+		out_of_memory("init_hard_links");
+}
 
-#if SUPPORT_HARD_LINKS
-static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
+static int hlink_compare(int *int1, int *int2)
 {
-	struct file_struct *f1 = *file1;
-	struct file_struct *f2 = *file2;
+	struct file_struct *f1 = FPTR(*int1);
+	struct file_struct *f2 = FPTR(*int2);
+	struct idev *i1 = F_HL_IDEV(f1);
+	struct idev *i2 = F_HL_IDEV(f2);
 
-	if (f1->F_DEV != f2->F_DEV)
-		return (int) (f1->F_DEV > f2->F_DEV ? 1 : -1);
+	if (i1->dev != i2->dev)
+		return i1->dev > i2->dev ? 1 : -1;
 
-	if (f1->F_INODE != f2->F_INODE)
-		return (int) (f1->F_INODE > f2->F_INODE ? 1 : -1);
+	if (i1->ino != i2->ino)
+		return i1->ino > i2->ino ? 1 : -1;
 
-	return file_compare(file1, file2);
+	return f_name_cmp(f1, f2);
 }
 
-struct file_struct **hlink_list;
-int hlink_count;
+/* Analyze the dev+inode data in the file-list by creating a list of all
+ * the items that have hlink data, sorting them, and matching up identical
+ * values into clusters.  These will be a single linked list from last to
+ * first when we're done. */
+void match_hard_links(void)
+{
+	int32 from, prev, *ndx_list;
+	struct file_struct *file, *file_next;
+	struct idev *idev, *idev_next;
+	int i, ndx_count = 0;
+
+	if (!(ndx_list = new_array(int32, the_file_list->count)))
+		out_of_memory("match_hard_links");
 
-#define LINKED(p1,p2) ((p1)->F_DEV == (p2)->F_DEV \
-		    && (p1)->F_INODE == (p2)->F_INODE)
+	for (i = 0; i < the_file_list->count; i++) {
+		if (F_IS_HLINKED(FPTR(i)))
+			ndx_list[ndx_count++] = i;
+	}
+
+	if (!ndx_count) {
+		free(ndx_list);
+		return;
+	}
 
-/* Analyze the data in the hlink_list[], remove items that aren't multiply
- * linked, and replace the dev+inode data with the hlindex+next linked list. */
-static void link_idev_data(void)
+	qsort(ndx_list, ndx_count, sizeof ndx_list[0],
+	     (int (*)()) hlink_compare);
+
+	for (from = 0; from < ndx_count; from++) {
+		for (file = FPTR(ndx_list[from]), idev = F_HL_IDEV(file), prev = -1;
+		     from < ndx_count-1;
+		     file = file_next, idev = idev_next, prev = ndx_list[from++])
+		{
+			file_next = FPTR(ndx_list[from+1]);
+			idev_next = F_HL_IDEV(file_next);
+			if (!LINKED(idev, idev_next))
+				break;
+			pool_free(hlink_pool, 0, idev);
+			if (prev < 0)
+				file->flags |= FLAG_HLINK_FIRST;
+			F_HL_PREV(file) = prev;
+		}
+		pool_free(hlink_pool, 0, idev);
+		if (prev < 0)
+			file->flags &= ~FLAG_HLINKED;
+		else {
+			file->flags |= FLAG_HLINK_LAST;
+			F_HL_PREV(file) = prev;
+		}
+	}
+
+	pool_destroy(hlink_pool);
+	free(ndx_list);
+}
+
+static int maybe_hard_link(struct file_struct *file, int ndx,
+			   const char *fname, int statret, STRUCT_STAT *stp,
+			   const char *oldname, STRUCT_STAT *old_stp,
+			   const char *realname, int itemizing, enum logcode code)
 {
-	struct file_struct *head;
-	int from, to, start;
-
-	for (from = to = 0; from < hlink_count; from++) {
-		start = from;
-		head = hlink_list[start];
-		while (from < hlink_count-1
-		    && LINKED(hlink_list[from], hlink_list[from+1])) {
-			hlink_list[from]->F_HLINDEX = to;
-			hlink_list[from]->F_NEXT = hlink_list[from+1];
-			from++;
+	if (statret == 0) {
+		if (stp->st_dev == old_stp->st_dev
+		 && stp->st_ino == old_stp->st_ino) {
+			if (itemizing) {
+				itemize(file, ndx, statret, stp,
+					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+					0, "");
+			}
+			if (verbose > 1 && maybe_ATTRS_REPORT)
+				rprintf(FCLIENT, "%s is uptodate\n", fname);
+			file->flags |= FLAG_HLINK_DONE;
+			return 0;
 		}
-		if (from > start) {
-			hlink_list[from]->F_HLINDEX = to;
-			hlink_list[from]->F_NEXT = head;
-			hlink_list[from]->flags |= FLAG_HLINK_EOL;
-			hlink_list[to++] = head;
-		} else {
-			head->link_u.idev = NULL;
+		if (make_backups) {
+			if (!make_backup(fname))
+				return -1;
+		} else if (robust_unlink(fname)) {
+			rsyserr(FERROR, errno, "unlink %s failed",
+				full_fname(fname));
+			return -1;
 		}
 	}
 
-	if (!to) {
-		free(hlink_list);
-		hlink_list = NULL;
-	} else {
-		hlink_count = to;
-		if (!(hlink_list = realloc_array(hlink_list,
-					struct file_struct *, hlink_count)))
-			out_of_memory("init_hard_links");
+	if (hard_link_one(file, fname, oldname, 0)) {
+		if (itemizing) {
+			itemize(file, ndx, statret, stp,
+				ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
+				realname);
+		}
+		if (code != FNONE && verbose)
+			rprintf(code, "%s => %s\n", fname, realname);
+		return 0;
 	}
+	return -1;
 }
-#endif
 
-void init_hard_links(struct file_list *flist)
+/* 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,
+		    enum logcode code)
 {
-#if SUPPORT_HARD_LINKS
-	int i;
+	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);
 
-	if (flist->count < 2)
-		return;
+	/* Is the previous link is not complete yet? */
+	if (!(prev_file->flags & FLAG_HLINK_DONE)) {
+		/* Is the previous link being transferred? */
+		if (prev_file->flags & FLAG_SENT) {
+			/* Add ourselves to the list of files that will be
+			 * updated when the transfer completes, and mark
+			 * ourself as waiting for the transfer. */
+			F_HL_PREV(file) = F_HL_PREV(prev_file);
+			F_HL_PREV(prev_file) = ndx;
+			file->flags |= FLAG_SENT;
+			return 1;
+		}
+		return 0;
+	}
 
-	if (hlink_list)
-		free(hlink_list);
+	/* There is a finished file to link with! */
+	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);
+		/* Update our previous pointer to point to the first. */
+		F_HL_PREV(file) = prev_ndx;
+	}
+	alt_dest = F_HL_PREV(prev_file); /* alternate value when DONE && FIRST */
+	if (alt_dest >= 0 && dry_run) {
+		pathjoin(prev_name, MAXPATHLEN, basis_dir[alt_dest],
+			 f_name(prev_file, NULL));
+		f_name(prev_file, altbuf);
+		realname = altbuf;
+	} else {
+		f_name(prev_file, prev_name);
+		realname = prev_name;
+	}
 
-	if (!(hlink_list = new_array(struct file_struct *, flist->count)))
-		out_of_memory("init_hard_links");
+	if (link_stat(prev_name, &prev_st, 0) < 0) {
+		rsyserr(FERROR, errno, "stat %s failed",
+			full_fname(prev_name));
+		return -1;
+	}
 
-	hlink_count = 0;
-	for (i = 0; i < flist->count; i++) {
-		if (flist->files[i]->link_u.idev)
-			hlink_list[hlink_count++] = flist->files[i];
+	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;
+		int j = 0;
+		do {
+			pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+			if (link_stat(cmpbuf, &alt_st, 0) < 0)
+				continue;
+			if (link_dest) {
+				if (prev_st.st_dev != alt_st.st_dev
+				 || prev_st.st_ino != alt_st.st_ino)
+					continue;
+				statret = 1;
+				*stp = alt_st;
+				if (verbose < 2 || !stdout_format_has_i) {
+					itemizing = 0;
+					code = FNONE;
+					if (verbose > 1 && maybe_ATTRS_REPORT)
+						rprintf(FCLIENT, "%s is uptodate\n", fname);
+				}
+				break;
+			}
+			if (!unchanged_file(cmpbuf, file, &alt_st))
+				continue;
+			statret = 1;
+			*stp = alt_st;
+			if (unchanged_attrs(file, &alt_st))
+				break;
+		} while (basis_dir[++j] != NULL);
 	}
 
-	qsort(hlink_list, hlink_count,
-	      sizeof(hlink_list[0]), (int (*)()) hlink_compare);
+	if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
+			    realname, itemizing, code) < 0)
+		return -1;
 
-	if (!hlink_count) {
-		free(hlink_list);
-		hlink_list = NULL;
-	} else
-		link_idev_data();
-#endif
+	if (remove_source_files == 1 && do_xfers)
+		send_msg_int(MSG_SUCCESS, ndx);
+
+	return 1;
 }
 
-int hard_link_check(struct file_struct *file, int skip)
+int hard_link_one(struct file_struct *file, const char *fname,
+		  const char *oldname, int terse)
 {
-	if (!file->link_u.links)
+	if (do_link(oldname, fname) < 0) {
+		enum logcode code;
+		if (terse) {
+			if (!verbose)
+				return -1;
+			code = FINFO;
+		} else
+			code = FERROR;
+		rsyserr(code, errno, "link %s => %s failed",
+			full_fname(fname), oldname);
 		return 0;
-	if (skip && !(file->flags & FLAG_HLINK_EOL))
-		hlink_list[file->F_HLINDEX] = file->F_NEXT;
-	if (hlink_list[file->F_HLINDEX] != file) {
-		if (verbose > 1) {
-			rprintf(FINFO, "\"%s\" is a hard link\n",
-				f_name(file));
-		}
-		return 1;
 	}
-	return 0;
+
+	file->flags |= FLAG_HLINK_DONE;
+
+	return 1;
 }
 
-#if SUPPORT_HARD_LINKS
-static void hard_link_one(char *hlink1, char *hlink2)
+void finish_hard_link(struct file_struct *file, const char *fname,
+		      STRUCT_STAT *stp, int itemizing, enum logcode code,
+		      int alt_dest)
 {
-	if (do_link(hlink1, hlink2)) {
-		if (verbose > 0) {
-			rprintf(FINFO, "link %s => %s failed: %s\n",
-				hlink2, hlink1, strerror(errno));
+	STRUCT_STAT st, prev_st;
+	char alt_name[MAXPATHLEN], *prev_name;
+	const char *our_name;
+	int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
+
+	if (stp == NULL && prev_ndx >= 0) {
+		if (link_stat(fname, &st, 0) < 0) {
+			rsyserr(FERROR, errno, "stat %s failed",
+				full_fname(fname));
+			return;
 		}
+		stp = &st;
 	}
-	else if (verbose > 0)
-		rprintf(FINFO, "%s => %s\n", hlink2, hlink1);
-}
-#endif
-
 
+	/* FIRST combined with DONE means we were the first to get done. */
+	file->flags |= FLAG_HLINK_FIRST | FLAG_HLINK_DONE;
+	F_HL_PREV(file) = alt_dest;
+	if (alt_dest >= 0 && dry_run) {
+		pathjoin(alt_name, MAXPATHLEN, basis_dir[alt_dest],
+			 f_name(file, NULL));
+		our_name = alt_name;
+	} else
+		our_name = fname;
 
-/**
- * Create any hard links in the global hlink_list.  They were put
- * there by running init_hard_links on the filelist.
- **/
-void do_hard_links(void)
-{
-#if SUPPORT_HARD_LINKS
-	struct file_struct *file, *first;
-	char hlink1[MAXPATHLEN];
-	char *hlink2;
-	STRUCT_STAT st1, st2;
-	int i;
-
-	if (!hlink_list)
-		return;
-
-	for (i = 0; i < hlink_count; i++) {
-		first = file = hlink_list[i];
-		if (link_stat(f_name_to(first, hlink1), &st1) != 0)
+	while ((ndx = prev_ndx) >= 0) {
+		file = FPTR(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)
 			continue;
-		while ((file = file->F_NEXT) != first) {
-			hlink2 = f_name(file);
-			if (link_stat(hlink2, &st2) == 0) {
-				if (st2.st_dev == st1.st_dev
-				    && st2.st_ino == st1.st_ino)
-					continue;
-				if (robust_unlink(hlink2)) {
-					if (verbose > 0) {
-						rprintf(FINFO,
-							"unlink %s failed: %s\n",
-							full_fname(hlink2), 
-							strerror(errno));
-					}
-					continue;
-				}
-			}
-			hard_link_one(hlink1, hlink2);
-		}
+		if (remove_source_files == 1 && do_xfers)
+			send_msg_int(MSG_SUCCESS, ndx);
 	}
-#endif
 }
+#endif