Preparing for release of 2.6.6pre1
[rsync.git] / hlink.c
diff --git a/hlink.c b/hlink.c
index fe51a234a0b54207803099e0e69d4aa7e8616329..5a4077dbc3db226c98d62e6985d39a98e4b64ad6 100644 (file)
--- a/hlink.c
+++ b/hlink.c
 
 extern int dry_run;
 extern int verbose;
+extern int make_backups;
+extern int log_format_has_i;
+extern struct file_list *the_file_list;
 
-#if SUPPORT_HARD_LINKS
-static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
+#ifdef SUPPORT_HARD_LINKS
+
+#define SKIPPED_LINK (-1)
+#define FINISHED_LINK (-2)
+
+#define FPTR(i) (the_file_list->files[i])
+#define LINKED(p1,p2) (FPTR(p1)->F_DEV == FPTR(p2)->F_DEV \
+                   && FPTR(p1)->F_INODE == FPTR(p2)->F_INODE)
+
+static int hlink_compare(int *int1, int *int2)
 {
-       struct file_struct *f1 = *file1;
-       struct file_struct *f2 = *file2;
+       struct file_struct *f1 = FPTR(*int1);
+       struct file_struct *f2 = FPTR(*int2);
 
        if (f1->F_DEV != f2->F_DEV)
                return (int) (f1->F_DEV > f2->F_DEV ? 1 : -1);
@@ -35,76 +46,88 @@ static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
        if (f1->F_INODE != f2->F_INODE)
                return (int) (f1->F_INODE > f2->F_INODE ? 1 : -1);
 
-       return file_compare(file1, file2);
+       return f_name_cmp(f1, f2);
 }
 
-struct file_struct **hlink_list;
-int hlink_count;
-
-#define LINKED(p1,p2) ((p1)->F_DEV == (p2)->F_DEV \
-                   && (p1)->F_INODE == (p2)->F_INODE)
+static int *hlink_list;
+static int 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)
 {
-       struct file_struct *head;
-       int from, to, start;
+       int 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);
 
        for (from = to = 0; from < hlink_count; from++) {
                start = from;
-               head = hlink_list[start];
-               while (from < hlink_count-1
-                   && LINKED(hlink_list[from], hlink_list[from+1])) {
-                       hlink_list[from]->F_HLINDEX = to;
-                       hlink_list[from]->F_NEXT = hlink_list[from+1];
-                       from++;
+               while (1) {
+                       cur = hlink_list[from];
+                       if (from == hlink_count-1
+                           || !LINKED(cur, hlink_list[from+1]))
+                               break;
+                       pool_free(idev_pool, 0, FPTR(cur)->link_u.idev);
+                       FPTR(cur)->link_u.links = pool_talloc(hlink_pool,
+                           struct hlink, 1, "hlink_list");
+
+                       FPTR(cur)->F_HLINDEX = to;
+                       FPTR(cur)->F_NEXT = hlink_list[++from];
                }
+               pool_free(idev_pool, 0, FPTR(cur)->link_u.idev);
                if (from > start) {
-                       hlink_list[from]->F_HLINDEX = to;
-                       hlink_list[from]->F_NEXT = head;
-                       hlink_list[from]->flags |= FLAG_HLINK_EOL;
+                       int head = hlink_list[start];
+                       FPTR(cur)->link_u.links = pool_talloc(hlink_pool,
+                           struct hlink, 1, "hlink_list");
+
+                       FPTR(head)->flags |= FLAG_HLINK_TOL;
+                       FPTR(cur)->F_HLINDEX = to;
+                       FPTR(cur)->F_NEXT = head;
+                       FPTR(cur)->flags |= FLAG_HLINK_EOL;
                        hlink_list[to++] = head;
-               } else {
-                       free((char*)head->link_u.idev);
-                       head->link_u.idev = NULL;
-               }
+               } else
+                       FPTR(cur)->link_u.links = NULL;
        }
 
        if (!to) {
                free(hlink_list);
                hlink_list = NULL;
+               pool_destroy(hlink_pool);
+               hlink_pool = NULL;
        } else {
                hlink_count = to;
-               if (!(hlink_list = realloc_array(hlink_list,
-                                       struct file_struct *, hlink_count)))
+               hlink_list = realloc_array(hlink_list, int, hlink_count);
+               if (!hlink_list)
                        out_of_memory("init_hard_links");
        }
+       the_file_list->hlink_pool = hlink_pool;
+       pool_destroy(idev_pool);
 }
 #endif
 
-void init_hard_links(struct file_list *flist)
+void init_hard_links(void)
 {
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
        int i;
 
-       if (flist->count < 2)
-               return;
-
        if (hlink_list)
                free(hlink_list);
 
-       if (!(hlink_list = new_array(struct file_struct *, flist->count)))
+       if (!(hlink_list = new_array(int, the_file_list->count)))
                out_of_memory("init_hard_links");
 
        hlink_count = 0;
-       for (i = 0; i < flist->count; i++) {
-               if (flist->files[i]->link_u.idev)
-                       hlink_list[hlink_count++] = flist->files[i];
+       for (i = 0; i < the_file_list->count; i++) {
+               if (FPTR(i)->link_u.idev)
+                       hlink_list[hlink_count++] = i;
        }
 
        qsort(hlink_list, hlink_count,
-             sizeof(hlink_list[0]), (int (*)()) hlink_compare);
+           sizeof hlink_list[0], (int (*)()) hlink_compare);
 
        if (!hlink_count) {
                free(hlink_list);
@@ -114,76 +137,132 @@ void init_hard_links(struct file_list *flist)
 #endif
 }
 
-int hard_link_check(struct file_struct *file, int skip)
+#ifdef SUPPORT_HARD_LINKS
+static int maybe_hard_link(struct file_struct *file, int ndx,
+                          char *fname, int statret, STRUCT_STAT *st,
+                          char *toname, STRUCT_STAT *to_st,
+                          int itemizing, enum logcode code)
+{
+       if (statret == 0) {
+               if (st->st_dev == to_st->st_dev
+                && st->st_ino == to_st->st_ino) {
+                       if (itemizing) {
+                               itemize(file, ndx, statret, st,
+                                       ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+                                       0, "");
+                       }
+                       return 0;
+               }
+               if (make_backups) {
+                       if (!make_backup(fname))
+                               return -1;
+               } else if (robust_unlink(fname)) {
+                       rsyserr(FERROR, errno, "unlink %s failed",
+                               full_fname(fname));
+                       return -1;
+               }
+       }
+       return hard_link_one(file, ndx, fname, statret, st, toname,
+                            0, itemizing, code);
+}
+#endif
+
+int hard_link_check(struct file_struct *file, int ndx, char *fname,
+                   int statret, STRUCT_STAT *st, int itemizing,
+                   enum logcode code, int skip)
 {
+#ifdef SUPPORT_HARD_LINKS
+       int head;
        if (!file->link_u.links)
                return 0;
        if (skip && !(file->flags & FLAG_HLINK_EOL))
-               hlink_list[file->F_HLINDEX] = file->F_NEXT;
-       if (hlink_list[file->F_HLINDEX] != file) {
-               if (verbose > 1) {
+               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 (!log_format_has_i && verbose > 1) {
                        rprintf(FINFO, "\"%s\" is a hard link\n",
-                               f_name(file));
+                               safe_fname(f_name(file)));
                }
+               if (head_file->F_HLINDEX == FINISHED_LINK) {
+                       STRUCT_STAT st2;
+                       char *toname = f_name(head_file);
+                       if (link_stat(toname, &st2, 0) < 0) {
+                               rsyserr(FERROR, errno, "stat %s failed",
+                                       full_fname(toname));
+                               return -1;
+                       }
+                       maybe_hard_link(file, ndx, fname, statret, st,
+                                       toname, &st2, itemizing, code);
+                       file->F_HLINDEX = FINISHED_LINK;
+               } else
+                       file->F_HLINDEX = SKIPPED_LINK;
                return 1;
        }
+#endif
        return 0;
 }
 
-#if SUPPORT_HARD_LINKS
-static void hard_link_one(char *hlink1, char *hlink2)
+#ifdef SUPPORT_HARD_LINKS
+int hard_link_one(struct file_struct *file, int ndx, char *fname,
+                 int statret, STRUCT_STAT *st, char *toname, int terse,
+                 int itemizing, enum logcode code)
 {
-       if (do_link(hlink1, hlink2)) {
-               if (verbose > 0) {
-                       rprintf(FINFO, "link %s => %s failed: %s\n",
-                               hlink2, hlink1, strerror(errno));
-               }
+       if (do_link(toname, fname)) {
+               if (terse) {
+                       if (!verbose)
+                               return -1;
+                       code = FINFO;
+               } else
+                       code = FERROR;
+               rsyserr(code, errno, "link %s => %s failed",
+                       full_fname(fname), safe_fname(toname));
+               return -1;
+       }
+
+       if (itemizing) {
+               itemize(file, ndx, statret, st,
+                       ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
+                       terse ? "" : toname);
        }
-       else if (verbose > 0)
-               rprintf(FINFO, "%s => %s\n", hlink2, hlink1);
+       if (code && verbose && !terse) {
+               rprintf(code, "%s => %s\n",
+                       safe_fname(fname), safe_fname(toname));
+       }
+       return 0;
 }
 #endif
 
 
-
-/**
- * Create any hard links in the global hlink_list.  They were put
- * there by running init_hard_links on the filelist.
- **/
-void do_hard_links(void)
+void hard_link_cluster(struct file_struct *file, int master, int itemizing,
+                      enum logcode code)
 {
-#if SUPPORT_HARD_LINKS
-       struct file_struct *file, *first;
+#ifdef SUPPORT_HARD_LINKS
        char hlink1[MAXPATHLEN];
        char *hlink2;
        STRUCT_STAT st1, st2;
-       int i;
+       int statret, ndx = master;
 
-       if (!hlink_list)
+       file->F_HLINDEX = FINISHED_LINK;
+       if (link_stat(f_name_to(file, hlink1), &st1, 0) < 0)
                return;
-
-       for (i = 0; i < hlink_count; i++) {
-               first = file = hlink_list[i];
-               if (link_stat(f_name_to(first, hlink1), &st1) != 0)
-                       continue;
-               while ((file = file->F_NEXT) != first) {
-                       hlink2 = f_name(file);
-                       if (link_stat(hlink2, &st2) == 0) {
-                               if (st2.st_dev == st1.st_dev
-                                   && st2.st_ino == st1.st_ino)
-                                       continue;
-                               if (robust_unlink(hlink2)) {
-                                       if (verbose > 0) {
-                                               rprintf(FINFO,
-                                                       "unlink %s failed: %s\n",
-                                                       full_fname(hlink2), 
-                                                       strerror(errno));
-                                       }
-                                       continue;
-                               }
-                       }
-                       hard_link_one(hlink1, hlink2);
+       if (!(file->flags & FLAG_HLINK_TOL)) {
+               while (!(file->flags & FLAG_HLINK_EOL)) {
+                       ndx = file->F_NEXT;
+                       file = FPTR(ndx);
                }
        }
+       do {
+               ndx = file->F_NEXT;
+               file = FPTR(ndx);
+               if (file->F_HLINDEX != SKIPPED_LINK)
+                       continue;
+               hlink2 = f_name(file);
+               statret = link_stat(hlink2, &st2, 0);
+               maybe_hard_link(file, ndx, hlink2, statret, &st2,
+                               hlink1, &st1, itemizing, code);
+               file->F_HLINDEX = FINISHED_LINK;
+       } while (!(file->flags & FLAG_HLINK_EOL));
 #endif
 }