X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/527cea662a18071b595d551599ad29ba9780fb8d..279b1c1ebb1ce80d6a3cd24e05738a0374d2f4fd:/hlink.c

diff --git a/hlink.c b/hlink.c
index 60b639bf..a45f91c8 100644
--- a/hlink.c
+++ b/hlink.c
@@ -1,6 +1,7 @@
 /* 
    Copyright (C) Andrew Tridgell 1996
    Copyright (C) Paul Mackerras 1996
+   Copyright (C) 2002 by Martin Pool <mbp@samba.org>
    
    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
@@ -19,50 +20,66 @@
 
 #include "rsync.h"
 
-extern int am_server;
 extern int dry_run;
+extern int verbose;
 
 #if SUPPORT_HARD_LINKS
-static int hlink_compare(struct file_struct *f1,struct file_struct *f2)
+static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
 {
-  if (!S_ISREG(f1->mode) && !S_ISREG(f2->mode)) return 0;
-  if (!S_ISREG(f1->mode)) return -1;
-  if (!S_ISREG(f2->mode)) return 1;
+	struct file_struct *f1 = *file1;
+	struct file_struct *f2 = *file2;
 
-  if (f1->dev != f2->dev) 
-    return (f1->dev - f2->dev);
+	if (!S_ISREG(f1->mode) && !S_ISREG(f2->mode))
+		return 0;
+	if (!S_ISREG(f1->mode))
+		return -1;
+	if (!S_ISREG(f2->mode))
+		return 1;
 
-  if (f1->inode != f2->inode) 
-    return (f1->inode - f2->inode);
+	if (f1->dev != f2->dev)
+		return (int) (f1->dev > f2->dev ? 1 : -1);
+
+	if (f1->inode != f2->inode)
+		return (int) (f1->inode > f2->inode ? 1 : -1);
 
-  return file_compare(f1,f2);
-}
 
+	return file_compare(file1, file2);
+}
 
-static struct file_struct *hlink_list = NULL;
-static int hlink_count=0;
+static struct file_struct **hlink_list;
+static int hlink_count;
 #endif
 
 void init_hard_links(struct file_list *flist)
 {
 #if SUPPORT_HARD_LINKS
-  if (flist->count < 2) return;
+	int i;
 
-  if (hlink_list) free(hlink_list);
-    
-  if (!(hlink_list = 
-	(struct file_struct *)malloc(sizeof(hlink_list[0])*flist->count)))
-    out_of_memory("init_hard_links");
+	if (flist->count < 2)
+		return;
 
-  bcopy((char *)flist->files,
-	(char *)hlink_list,
-	sizeof(hlink_list[0])*flist->count);
+	if (hlink_list)
+		free(hlink_list);
+
+	if (!(hlink_list = new_array(struct file_struct *, flist->count)))
+		out_of_memory("init_hard_links");
+	
+/*	we'll want to restore the memcpy when we purge the
+ *	hlink list after the sort.
+ *	memcpy(hlink_list, flist->files, sizeof(hlink_list[0]) * flist->count);	
+ */
+	hlink_count = 0;
+	for (i = 0; i < flist->count; i++) {
+		if (S_ISREG(flist->files[i]->mode))
+			hlink_list[hlink_count++] = flist->files[i];
+	}
 
-  qsort(hlink_list,flist->count,
-	sizeof(hlink_list[0]),
-	(int (*)())hlink_compare);
+	qsort(hlink_list, hlink_count,
+	      sizeof(hlink_list[0]), (int (*)()) hlink_compare);
 
-  hlink_count=flist->count;
+	if (!(hlink_list = realloc_array(hlink_list,
+					struct file_struct *, hlink_count)))
+		out_of_memory("init_hard_links");
 #endif
 }
 
@@ -71,70 +88,103 @@ void init_hard_links(struct file_list *flist)
 int check_hard_link(struct file_struct *file)
 {
 #if SUPPORT_HARD_LINKS
-  int low=0,high=hlink_count-1;
-  int mid=0,ret=0;
-
-  if (!hlink_list || !S_ISREG(file->mode)) return 0;
-
-  while (low != high) {
-    mid = (low+high)/2;
-    ret = hlink_compare(&hlink_list[mid],file);
-    if (ret == 0) break;
-    if (ret > 0) 
-      high=mid;
-    else
-      low=mid+1;
-  }
-
-  if (hlink_compare(&hlink_list[mid],file) != 0) return 0;
-
-  if (mid > 0 &&
-      S_ISREG(hlink_list[mid-1].mode) &&
-      file->dev == hlink_list[mid-1].dev &&
-      file->inode == hlink_list[mid-1].inode)
-    return 1;
+	int low = 0, high = hlink_count - 1;
+	int ret = 0;
+
+	if (!hlink_list || !S_ISREG(file->mode))
+		return 0;
+
+	while (low != high) {
+		int mid = (low + high) / 2;
+		ret = hlink_compare(&hlink_list[mid], &file);
+		if (ret == 0) {
+			low = mid;
+			break;
+		}
+		if (ret > 0)
+			high = mid;
+		else
+			low = mid + 1;
+	}
+
+	/* XXX: To me this looks kind of dodgy -- why do we use [low]
+	 * here and [low-1] below? -- mbp */
+	if (hlink_compare(&hlink_list[low], &file) != 0)
+		return 0;
+
+	if (low > 0 &&
+	    S_ISREG(hlink_list[low - 1]->mode) &&
+	    file->dev == hlink_list[low - 1]->dev &&
+	    file->inode == hlink_list[low - 1]->inode) {
+		if (verbose >= 2) {
+			rprintf(FINFO, "check_hard_link: \"%s\" is a hard link to file %d, \"%s\"\n",
+				f_name(file), low-1, f_name(hlink_list[low-1]));
+		}
+		return 1;
+	}
 #endif
 
-  return 0;
+	return 0;
 }
 
 
-/* create any hard links in the flist */
-void do_hard_links(struct file_list *flist)
-{
 #if SUPPORT_HARD_LINKS
-  int i;
-  
-  if (!hlink_list) return;
-
-  for (i=1;i<hlink_count;i++) {
-    if (S_ISREG(hlink_list[i].mode) &&
-	S_ISREG(hlink_list[i-1].mode) &&
-	hlink_list[i].name && hlink_list[i-1].name &&
-	hlink_list[i].dev == hlink_list[i-1].dev &&
-	hlink_list[i].inode == hlink_list[i-1].inode) {
-      struct stat st1,st2;
-
-      if (lstat(hlink_list[i-1].name,&st1) != 0) continue;
-      if (lstat(hlink_list[i].name,&st2) != 0) {
-	if (!dry_run && link(hlink_list[i-1].name,hlink_list[i].name) != 0) {
-	  fprintf(FINFO,"link %s => %s : %s\n",
-		  hlink_list[i].name,hlink_list[i-1].name,strerror(errno));
-	  continue;
+static void hard_link_one(int i)
+{
+	STRUCT_STAT st1, st2;
+	char *hlink2, *hlink1 = f_name(hlink_list[i - 1]);
+
+	if (link_stat(hlink1, &st1) != 0)
+		return;
+
+	hlink2 = f_name(hlink_list[i]);
+	if (link_stat(hlink2, &st2) != 0) {
+		if (do_link(hlink1, hlink2)) {
+			if (verbose > 0) {
+				rprintf(FINFO, "link %s => %s : %s\n",
+					hlink2, hlink1, strerror(errno));
+			}
+			return;
+		}
+	} else {
+		if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino)
+			return;
+
+		if (robust_unlink(hlink2) || do_link(hlink1, hlink2)) {
+			if (verbose > 0) {
+				rprintf(FINFO, "link %s => %s : %s\n",
+					hlink2, hlink1, strerror(errno));
+			}
+			return;
+		}
 	}
-      } else {
-	if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino) continue;
-	
-	if (!dry_run && (unlink(hlink_list[i].name) != 0 ||
-			 link(hlink_list[i-1].name,hlink_list[i].name) != 0)) {
-	  fprintf(FINFO,"link %s => %s : %s\n",
-		  hlink_list[i].name,hlink_list[i-1].name,strerror(errno));
-	  continue;
+	if (verbose > 0)
+		rprintf(FINFO, "%s => %s\n", hlink2, hlink1);
+}
+#endif
+
+
+
+/**
+ * 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
+	int i;
+
+	if (!hlink_list)
+		return;
+
+	for (i = 1; i < hlink_count; i++) {
+		if (S_ISREG(hlink_list[i]->mode) &&
+		    S_ISREG(hlink_list[i - 1]->mode) &&
+		    hlink_list[i]->basename && hlink_list[i - 1]->basename &&
+		    hlink_list[i]->dev == hlink_list[i - 1]->dev &&
+		    hlink_list[i]->inode == hlink_list[i - 1]->inode) {
+			hard_link_one(i);
+		}
 	}
-      }
-      fprintf(FINFO,"%s => %s\n",
-	      hlink_list[i].name,hlink_list[i-1].name);
-    }	
-  }
 #endif
 }