- fixed the "write exception" error. I was resetting got_select at the

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 3213b2e..6e4e31f 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -21,6 +21,7 @@
 
 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)
@@ -54,7 +55,9 @@ void init_hard_links(struct file_list *flist)
        (struct file_struct *)malloc(sizeof(hlink_list[0])*flist->count)))
     out_of_memory("init_hard_links");
 
-  bcopy((char *)flist->files,hlink_list,sizeof(hlink_list[0])*flist->count);
+  bcopy((char *)flist->files,
+       (char *)hlink_list,
+       sizeof(hlink_list[0])*flist->count);
 
   qsort(hlink_list,flist->count,
        sizeof(hlink_list[0]),
@@ -69,7 +72,7 @@ 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;
+  int low=0,high=hlink_count-1;
   int mid=0,ret=0;
 
   if (!hlink_list || !S_ISREG(file->mode)) return 0;
@@ -113,11 +116,13 @@ void do_hard_links(struct file_list *flist)
        hlink_list[i].inode == hlink_list[i-1].inode) {
       struct stat st1,st2;
 
-      if (stat(hlink_list[i-1].name,&st1) != 0) continue;
-      if (stat(hlink_list[i].name,&st2) != 0) {
+      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));
+               if (verbose > 0)
+                       fprintf(FINFO,"link %s => %s : %s\n",
+                               hlink_list[i].name,
+                               hlink_list[i-1].name,strerror(errno));
          continue;
        }
       } else {
@@ -125,13 +130,16 @@ void do_hard_links(struct file_list *flist)
        
        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));
+               if (verbose > 0)
+                       fprintf(FINFO,"link %s => %s : %s\n",
+                               hlink_list[i].name,
+                               hlink_list[i-1].name,strerror(errno));
          continue;
        }
       }
-      fprintf(FINFO,"%s => %s\n",
-             hlink_list[i].name,hlink_list[i-1].name);
+      if (verbose > 0)
+             fprintf(FINFO,"%s => %s\n",
+                     hlink_list[i].name,hlink_list[i-1].name);
     }  
   }
 #endif