Solaris uses EEXIST instead of ENOTEMPTY.

[rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 3213b2ea5e80e85d69a80d709f2b33703f353a47..b3f1d27441a9d13bbdc72b25dd73e5b3666fac9c 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)
@@ -30,17 +31,17 @@ 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);
 
-  return file_compare(f1,f2);
+  return file_compare(&f1,&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)
@@ -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,27 +72,30 @@ 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 mid=0,ret=0;
+  int low=0,high=hlink_count-1;
+  int ret=0;
 
   if (!hlink_list || !S_ISREG(file->mode)) return 0;
 
   while (low != high) {
-    mid = (low+high)/2;
+    int mid = (low+high)/2;
     ret = hlink_compare(&hlink_list[mid],file);
-    if (ret == 0) break;
+    if (ret == 0) {
+           low = mid;
+           break;
+    }
     if (ret > 0) 
       high=mid;
     else
       low=mid+1;
   }
 
-  if (hlink_compare(&hlink_list[mid],file) != 0) return 0;
+  if (hlink_compare(&hlink_list[low],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)
+  if (low > 0 &&
+      S_ISREG(hlink_list[low-1].mode) &&
+      file->dev == hlink_list[low-1].dev &&
+      file->inode == hlink_list[low-1].inode)
     return 1;
 #endif
 
@@ -108,30 +114,35 @@ void do_hard_links(struct file_list *flist)
   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].basename && hlink_list[i-1].basename &&
        hlink_list[i].dev == hlink_list[i-1].dev &&
        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 (!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 (link_stat(f_name(&hlink_list[i-1]),&st1) != 0) continue;
+      if (link_stat(f_name(&hlink_list[i]),&st2) != 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]),
+                               f_name(&hlink_list[i-1]),strerror(errno));
          continue;
        }
       } 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));
+       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]),
+                               f_name(&hlink_list[i-1]),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",
+                     f_name(&hlink_list[i]),f_name(&hlink_list[i-1]));
     }  
   }
 #endif