Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Added the 'p' (perishable) flag to the filter rules, as suggested
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
814e4a4
..
2ef998c
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-83,6
+83,7
@@
static void link_idev_data(void)
FPTR(cur)->F_HLINDEX = to;
FPTR(cur)->F_NEXT = hlink_list[++from];
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) {
}
pool_free(idev_pool, 0, FPTR(cur)->link_u.idev);
if (from > start) {
@@
-94,6
+95,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)->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;
hlink_list[to++] = head;
} else
FPTR(cur)->link_u.links = NULL;
@@
-216,8
+218,10
@@
int hard_link_check(struct file_struct *file, int ndx, char *fname,
continue;
statret = 1;
st = &st3;
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))
break;
}
if (!unchanged_file(cmpbuf, file, &st3))
@@
-266,7
+270,7
@@
int hard_link_one(struct file_struct *file, int ndx, char *fname,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
terse ? "" : toname);
}
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;
}
rprintf(code, "%s => %s\n", fname, toname);
return 0;
}