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);
}
*/
hlink_count = 0;
for (i = 0; i < flist->count; i++) {
- if (S_ISREG(flist->files[i]->mode))
+ if (flist->files[i]->link_u.idev)
hlink_list[hlink_count++] = flist->files[i];
}
int low = 0, high = hlink_count - 1;
int ret = 0;
- if (!hlink_list || !S_ISREG(file->mode))
+ if (!hlink_list || !file->link_u.idev)
return 0;
while (low != high) {
low = mid + 1;
}
- /* XXX: To me this looks kind of dodgy -- why do we use [low]
- * here and [low-1] below? -- mbp */
+ /* Check if we ended up finding the file struct or not. */
if (hlink_compare(&hlink_list[low], &file) != 0)
return 0;
+ /* Now check if the previous item shares the current one's device
+ * and inode. If so, we're not the "master", so return 1. */
if (low > 0 &&
- file->dev == hlink_list[low - 1]->dev &&
- file->inode == hlink_list[low - 1]->inode) {
+ file->F_DEV == hlink_list[low - 1]->F_DEV &&
+ file->F_INODE == hlink_list[low - 1]->F_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]));
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) {
+ hlink_list[i]->F_DEV == hlink_list[i - 1]->F_DEV &&
+ hlink_list[i]->F_INODE == hlink_list[i - 1]->F_INODE) {
hard_link_one(i);
}
}