Added "const" to appropriate char pointers.

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 2cd1c6e..e0a5265 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -27,7 +27,7 @@ extern int verbose;
 extern int do_xfers;
 extern int link_dest;
 extern int make_backups;
-extern int remove_sender_files;
+extern int remove_source_files;
 extern int stdout_format_has_i;
 extern char *basis_dir[];
 extern struct file_list *the_file_list;
@@ -55,20 +55,19 @@ static int hlink_compare(int *int1, int *int2)
        return f_name_cmp(f1, f2);
 }
 
-static int *hlink_list;
-static int hlink_count;
+static int32 *hlink_list;
+static int32 hlink_count;
 
 /* Analyze the data in the hlink_list[], remove items that aren't multiply
  * linked, and replace the dev+inode data with the hlindex+next linked list. */
 static void link_idev_data(void)
 {
-       int cur, from, to, start;
+       int32 cur, from, to, start;
 
        alloc_pool_t hlink_pool;
        alloc_pool_t idev_pool = the_file_list->hlink_pool;
 
-       hlink_pool = pool_create(128 * 1024, sizeof (struct hlink),
-           out_of_memory, POOL_INTERN);
+       hlink_pool = pool_create(128 * 1024, sizeof (struct hlink), out_of_memory, POOL_INTERN);
 
        for (from = to = 0; from < hlink_count; from++) {
                start = from;
@@ -83,6 +82,7 @@ static void link_idev_data(void)
 
                        FPTR(cur)->F_HLINDEX = to;
                        FPTR(cur)->F_NEXT = hlink_list[++from];
+                       FPTR(cur)->link_u.links->link_dest_used = 0;
                }
                pool_free(idev_pool, 0, FPTR(cur)->link_u.idev);
                if (from > start) {
@@ -94,6 +94,7 @@ static void link_idev_data(void)
                        FPTR(cur)->F_HLINDEX = to;
                        FPTR(cur)->F_NEXT = head;
                        FPTR(cur)->flags |= FLAG_HLINK_EOL;
+                       FPTR(cur)->link_u.links->link_dest_used = 0;
                        hlink_list[to++] = head;
                } else
                        FPTR(cur)->link_u.links = NULL;
@@ -106,7 +107,7 @@ static void link_idev_data(void)
                hlink_pool = NULL;
        } else {
                hlink_count = to;
-               hlink_list = realloc_array(hlink_list, int, hlink_count);
+               hlink_list = realloc_array(hlink_list, int32, hlink_count);
                if (!hlink_list)
                        out_of_memory("init_hard_links");
        }
@@ -123,7 +124,7 @@ void init_hard_links(void)
        if (hlink_list)
                free(hlink_list);
 
-       if (!(hlink_list = new_array(int, the_file_list->count)))
+       if (!(hlink_list = new_array(int32, the_file_list->count)))
                out_of_memory("init_hard_links");
 
        hlink_count = 0;
@@ -191,7 +192,13 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
                }
                if (head_file->F_HLINDEX == FINISHED_LINK) {
                        STRUCT_STAT st2, st3;
-                       char *toname = f_name(head_file, NULL);
+                       char toname[MAXPATHLEN];
+                       int ldu = head_file->link_u.links->link_dest_used;
+                       if (ldu) {
+                               pathjoin(toname, MAXPATHLEN, basis_dir[ldu-1],
+                                        f_name(head_file, NULL));
+                       } else
+                               f_name(head_file, toname);
                        if (link_stat(toname, &st2, 0) < 0) {
                                rsyserr(FERROR, errno, "stat %s failed",
                                        full_fname(toname));
@@ -210,8 +217,10 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
                                                        continue;
                                                statret = 1;
                                                st = &st3;
-                                               if (verbose < 2 || !stdout_format_has_i)
-                                                       itemizing = code = 0;
+                                               if (verbose < 2 || !stdout_format_has_i) {
+                                                       itemizing = 0;
+                                                       code = FNONE;
+                                               }
                                                break;
                                        }
                                        if (!unchanged_file(cmpbuf, file, &st3))
@@ -224,7 +233,7 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
                        }
                        maybe_hard_link(file, ndx, fname, statret, st,
                                        toname, &st2, itemizing, code);
-                       if (remove_sender_files == 1 && do_xfers) {
+                       if (remove_source_files == 1 && do_xfers) {
                                char numbuf[4];
                                SIVAL(numbuf, 0, ndx);
                                send_msg(MSG_SUCCESS, numbuf, 4);
@@ -260,7 +269,7 @@ 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)
+       if (code != FNONE && verbose && !terse)
                rprintf(code, "%s => %s\n", fname, toname);
        return 0;
 }
@@ -294,7 +303,7 @@ void hard_link_cluster(struct file_struct *file, int master, int itemizing,
                statret = link_stat(hlink2, &st2, 0);
                maybe_hard_link(file, ndx, hlink2, statret, &st2,
                                hlink1, &st1, itemizing, code);
-               if (remove_sender_files == 1 && do_xfers) {
+               if (remove_source_files == 1 && do_xfers) {
                        char numbuf[4];
                        SIVAL(numbuf, 0, ndx);
                        send_msg(MSG_SUCCESS, numbuf, 4);