Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 49d3530..2babcec 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -20,9 +20,11 @@
 
 #include "rsync.h"
 
-extern int dry_run;
 extern int verbose;
+extern int link_dest;
 extern int make_backups;
+extern int log_format_has_i;
+extern char *basis_dir[];
 extern struct file_list *the_file_list;
 
 #ifdef SUPPORT_HARD_LINKS
@@ -172,26 +174,49 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 {
 #ifdef SUPPORT_HARD_LINKS
        int head;
-       if (!file->link_u.links)
-               return 0;
        if (skip && !(file->flags & FLAG_HLINK_EOL))
                head = hlink_list[file->F_HLINDEX] = file->F_NEXT;
        else
                head = hlink_list[file->F_HLINDEX];
        if (ndx != head) {
                struct file_struct *head_file = FPTR(head);
-               if (verbose > 2) {
+               if (!log_format_has_i && verbose > 1) {
                        rprintf(FINFO, "\"%s\" is a hard link\n",
-                               safe_fname(f_name(file)));
+                               f_name(file, NULL));
                }
                if (head_file->F_HLINDEX == FINISHED_LINK) {
-                       STRUCT_STAT st2;
-                       char *toname = f_name(head_file);
+                       STRUCT_STAT st2, st3;
+                       char *toname = f_name(head_file, NULL);
                        if (link_stat(toname, &st2, 0) < 0) {
                                rsyserr(FERROR, errno, "stat %s failed",
                                        full_fname(toname));
                                return -1;
                        }
+                       if (statret < 0 && basis_dir[0] != NULL) {
+                               char cmpbuf[MAXPATHLEN];
+                               int j = 0;
+                               do {
+                                       pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+                                       if (link_stat(cmpbuf, &st3, 0) < 0)
+                                               continue;
+                                       if (link_dest) {
+                                               if (st2.st_dev != st3.st_dev
+                                                || st2.st_ino != st3.st_ino)
+                                                       continue;
+                                               statret = 1;
+                                               st = &st3;
+                                               if (verbose < 2 || !log_format_has_i)
+                                                       itemizing = code = 0;
+                                               break;
+                                       }
+                                       if (!unchanged_file(cmpbuf, file, &st3))
+                                               continue;
+                                       statret = 1;
+                                       st = &st3;
+                                       if (unchanged_attrs(file, &st3))
+                                               break;
+                               } while (basis_dir[++j] != NULL);
+                       }
                        maybe_hard_link(file, ndx, fname, statret, st,
                                        toname, &st2, itemizing, code);
                        file->F_HLINDEX = FINISHED_LINK;
@@ -216,7 +241,7 @@ int hard_link_one(struct file_struct *file, int ndx, char *fname,
                } else
                        code = FERROR;
                rsyserr(code, errno, "link %s => %s failed",
-                       full_fname(fname), safe_fname(toname));
+                       full_fname(fname), toname);
                return -1;
        }
 
@@ -225,10 +250,8 @@ int hard_link_one(struct file_struct *file, int ndx, char *fname,
                        ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
                        terse ? "" : toname);
        }
-       if (code && verbose && !terse) {
-               rprintf(code, "%s => %s\n",
-                       safe_fname(fname), safe_fname(toname));
-       }
+       if (code && verbose && !terse)
+               rprintf(code, "%s => %s\n", fname, toname);
        return 0;
 }
 #endif
@@ -244,7 +267,7 @@ void hard_link_cluster(struct file_struct *file, int master, int itemizing,
        int statret, ndx = master;
 
        file->F_HLINDEX = FINISHED_LINK;
-       if (link_stat(f_name_to(file, hlink1), &st1, 0) < 0)
+       if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
                return;
        if (!(file->flags & FLAG_HLINK_TOL)) {
                while (!(file->flags & FLAG_HLINK_EOL)) {
@@ -257,7 +280,7 @@ void hard_link_cluster(struct file_struct *file, int master, int itemizing,
                file = FPTR(ndx);
                if (file->F_HLINDEX != SKIPPED_LINK)
                        continue;
-               hlink2 = f_name(file);
+               hlink2 = f_name(file, NULL);
                statret = link_stat(hlink2, &st2, 0);
                maybe_hard_link(file, ndx, hlink2, statret, &st2,
                                hlink1, &st1, itemizing, code);