X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3ec4dd9781ed23be4a2b939fa5bfded619a1a8fb..dd04a03440be7c04ec7c3005d5fd92ec03311358:/hlink.c

diff --git a/hlink.c b/hlink.c
index 7360a021..eef7c54c 100644
--- a/hlink.c
+++ b/hlink.c
@@ -31,7 +31,7 @@ static int hlink_compare(struct file_struct *f1,struct file_struct *f2)
   if (!S_ISREG(f2->mode)) return 1;
 
   if (f1->dev != f2->dev) 
-    return (f1->dev - f2->dev);
+    return (int)(f1->dev - f2->dev);
 
   if (f1->inode != f2->inode) 
     return (f1->inode - f2->inode);
@@ -40,30 +40,30 @@ static int hlink_compare(struct file_struct *f1,struct file_struct *f2)
 }
 
 
-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 (flist->count < 2) return;
 
-  if (hlink_list) free(hlink_list);
+	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 (!(hlink_list = 
+	      (struct file_struct *)malloc(sizeof(hlink_list[0])*flist->count)))
+		out_of_memory("init_hard_links");
 
-  bcopy((char *)flist->files,
-	(char *)hlink_list,
-	sizeof(hlink_list[0])*flist->count);
+	for (i = 0; i < flist->count; i++)
+		bcopy(flist->files[i], &hlink_list[i], sizeof(hlink_list[0]));
 
-  qsort(hlink_list,flist->count,
-	sizeof(hlink_list[0]),
-	(int (*)())hlink_compare);
+	qsort(hlink_list,flist->count,
+	      sizeof(hlink_list[0]),
+	      (int (*)())hlink_compare);
 
-  hlink_count=flist->count;
+	hlink_count=flist->count;
 #endif
 }
 
@@ -121,7 +121,7 @@ void do_hard_links(struct file_list *flist)
 
       if (link_stat(f_name(&hlink_list[i-1]),&st1) != 0) continue;
       if (link_stat(f_name(&hlink_list[i]),&st2) != 0) {
-	if (!dry_run && link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
+	if (do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
 		if (verbose > 0)
 			fprintf(FINFO,"link %s => %s : %s\n",
 				f_name(&hlink_list[i]),
@@ -131,8 +131,8 @@ void do_hard_links(struct file_list *flist)
       } else {
 	if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino) continue;
 	
-	if (!dry_run && (unlink(f_name(&hlink_list[i])) != 0 ||
-			 link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0)) {
+	if (do_unlink(f_name(&hlink_list[i])) != 0 ||
+	    do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
 		if (verbose > 0)
 			fprintf(FINFO,"link %s => %s : %s\n",
 				f_name(&hlink_list[i]),