struct file_struct *f1 = *file1;
struct file_struct *f2 = *file2;
- if (f1->dev != f2->dev)
- return (int) (f1->dev > f2->dev ? 1 : -1);
+ if (f1->F_DEV != f2->F_DEV)
+ return (int) (f1->F_DEV > f2->F_DEV ? 1 : -1);
- if (f1->inode != f2->inode)
- return (int) (f1->inode > f2->inode ? 1 : -1);
+ if (f1->F_INODE != f2->F_INODE)
+ return (int) (f1->F_INODE > f2->F_INODE ? 1 : -1);
return file_compare(file1, file2);
}
-static struct file_struct **hlink_list;
-static int hlink_count;
+struct file_struct **hlink_list;
+int hlink_count;
+
+#define LINKED(p1,p2) ((p1)->F_DEV == (p2)->F_DEV \
+ && (p1)->F_INODE == (p2)->F_INODE)
+
+/* 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(struct file_list *flist)
+{
+ struct file_struct *head;
+ int from, to, start;
+
+ alloc_pool_t hlink_pool;
+ alloc_pool_t idev_pool = flist->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])) {
+ pool_free(idev_pool, 0, hlink_list[from]->link_u.idev);
+ hlink_list[from]->link_u.links = pool_talloc(hlink_pool,
+ struct hlink, 1, "hlink_list");
+
+ hlink_list[from]->F_HLINDEX = to;
+ hlink_list[from]->F_NEXT = hlink_list[from+1];
+ from++;
+ }
+ if (from > start) {
+ pool_free(idev_pool, 0, hlink_list[from]->link_u.idev);
+ hlink_list[from]->link_u.links = pool_talloc(hlink_pool,
+ struct hlink, 1, "hlink_list");
+
+ hlink_list[from]->F_HLINDEX = to;
+ hlink_list[from]->F_NEXT = head;
+ hlink_list[from]->flags |= FLAG_HLINK_EOL;
+ hlink_list[to++] = head;
+ } else {
+ pool_free(idev_pool, 0, head->link_u.idev);
+ head->link_u.idev = 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)))
+ out_of_memory("init_hard_links");
+ }
+ flist->hlink_pool = hlink_pool;
+ pool_destroy(idev_pool);
+}
#endif
void init_hard_links(struct file_list *flist)
if (!(hlink_list = new_array(struct file_struct *, flist->count)))
out_of_memory("init_hard_links");
-/* we'll want to restore the memcpy when we purge the
- * hlink list after the sort.
- * memcpy(hlink_list, flist->files, sizeof(hlink_list[0]) * flist->count);
- */
hlink_count = 0;
for (i = 0; i < flist->count; i++) {
- if (flist->files[i]->flags & HAS_INODE_DATA)
+ if (flist->files[i]->link_u.idev)
hlink_list[hlink_count++] = flist->files[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);
hlink_list = NULL;
- } else if (!(hlink_list = realloc_array(hlink_list,
- struct file_struct *, hlink_count)))
- out_of_memory("init_hard_links");
+ } else
+ link_idev_data(flist);
#endif
}
-/* check if a file should be skipped because it is the same as an
- earlier hard link */
-int check_hard_link(struct file_struct *file)
+int hard_link_check(struct file_struct *file, int skip)
{
-#if SUPPORT_HARD_LINKS
- int low = 0, high = hlink_count - 1;
- int ret = 0;
-
- if (!hlink_list || !(file->flags & HAS_INODE_DATA))
+ if (!file->link_u.links)
return 0;
-
- while (low != high) {
- int mid = (low + high) / 2;
- ret = hlink_compare(&hlink_list[mid], &file);
- if (ret == 0) {
- low = mid;
- break;
- }
- if (ret > 0)
- high = mid;
- else
- low = mid + 1;
- }
-
- /* XXX: To me this looks kind of dodgy -- why do we use [low]
- * here and [low-1] below? -- mbp */
- if (hlink_compare(&hlink_list[low], &file) != 0)
- return 0;
-
- if (low > 0 &&
- file->dev == hlink_list[low - 1]->dev &&
- file->inode == hlink_list[low - 1]->inode) {
- if (verbose >= 2) {
- rprintf(FINFO, "check_hard_link: \"%s\" is a hard link to file %d, \"%s\"\n",
- f_name(file), low-1, f_name(hlink_list[low-1]));
+ 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) {
+ rprintf(FINFO, "\"%s\" is a hard link\n",
+ f_name(file));
}
return 1;
}
-#endif
-
return 0;
}
-
#if SUPPORT_HARD_LINKS
-static void hard_link_one(int i)
+static void hard_link_one(char *hlink1, char *hlink2)
{
- STRUCT_STAT st1, st2;
- char *hlink2, *hlink1 = f_name(hlink_list[i - 1]);
-
- if (link_stat(hlink1, &st1) != 0)
- return;
-
- hlink2 = f_name(hlink_list[i]);
- if (link_stat(hlink2, &st2) != 0) {
- if (do_link(hlink1, hlink2)) {
- if (verbose > 0) {
- rprintf(FINFO, "link %s => %s : %s\n",
- hlink2, hlink1, strerror(errno));
- }
- return;
- }
- } else {
- if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino)
- return;
-
- if (robust_unlink(hlink2) || do_link(hlink1, hlink2)) {
- if (verbose > 0) {
- rprintf(FINFO, "link %s => %s : %s\n",
- hlink2, hlink1, strerror(errno));
- }
- return;
+ if (do_link(hlink1, hlink2)) {
+ if (verbose) {
+ rprintf(FINFO, "link %s => %s failed: %s\n",
+ hlink2, hlink1, strerror(errno));
}
}
- if (verbose > 0)
+ else if (verbose)
rprintf(FINFO, "%s => %s\n", hlink2, hlink1);
}
#endif
void do_hard_links(void)
{
#if SUPPORT_HARD_LINKS
+ struct file_struct *file, *first;
+ char hlink1[MAXPATHLEN];
+ char *hlink2;
+ STRUCT_STAT st1, st2;
int i;
if (!hlink_list)
return;
- for (i = 1; i < hlink_count; i++) {
- if (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) {
- hard_link_one(i);
+ 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);
}
}
#endif
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff