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
Include the array-size in array externs so that IBM's code-checker
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
c5a4fef
..
5c61170
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-35,7
+35,7
@@
extern int remove_source_files;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern int unsort_ndx;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern int unsort_ndx;
-extern char *basis_dir[];
+extern char *basis_dir[
MAX_BASIS_DIRS+1
];
extern struct file_list *cur_flist, *first_flist;
#ifdef SUPPORT_HARD_LINKS
extern struct file_list *cur_flist, *first_flist;
#ifdef SUPPORT_HARD_LINKS
@@
-70,10
+70,10
@@
struct ht_int64_node *idev_find(int64 dev, int64 ino)
dev_node = hashtable_find(dev_tbl, dev, 1);
if (!(tbl = dev_node->data)) {
tbl = dev_node->data = hashtable_create(512, SIZEOF_INT64 == 8);
dev_node = hashtable_find(dev_tbl, dev, 1);
if (!(tbl = dev_node->data)) {
tbl = dev_node->data = hashtable_create(512, SIZEOF_INT64 == 8);
- if (DEBUG_GTE(HLINK,
1
)) {
+ if (DEBUG_GTE(HLINK,
3
)) {
rprintf(FINFO,
rprintf(FINFO,
- "
created inode
hashtable for dev %s\n",
- big_num(dev, 0));
+ "
[%s] created
hashtable for dev %s\n",
+
who_am_i(),
big_num(dev, 0));
}
}
} else
}
}
} else
@@
-184,7
+184,7
@@
static void match_gnums(int32 *ndx_list, int ndx_count)
* to first when we're done. */
void match_hard_links(struct file_list *flist)
{
* to first when we're done. */
void match_hard_links(struct file_list *flist)
{
- if (!list_only) {
+ if (!list_only
&& flist->used
) {
int i, ndx_count = 0;
int32 *ndx_list;
int i, ndx_count = 0;
int32 *ndx_list;
@@
-309,6
+309,10
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
if (!flist) {
/* The previous file was skipped, so this one is
* treated as if it were the first in its group. */
if (!flist) {
/* The previous file was skipped, so this one is
* treated as if it were the first in its group. */
+ if (DEBUG_GTE(HLINK, 2)) {
+ rprintf(FINFO, "hlink for %d (%s,%d): virtual first\n",
+ ndx, f_name(file, NULL), gnum);
+ }
return 0;
}
return 0;
}
@@
-325,8
+329,16
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
F_HL_PREV(prev_file) = ndx;
file->flags |= FLAG_FILE_SENT;
cur_flist->in_progress++;
F_HL_PREV(prev_file) = ndx;
file->flags |= FLAG_FILE_SENT;
cur_flist->in_progress++;
+ if (DEBUG_GTE(HLINK, 2)) {
+ rprintf(FINFO, "hlink for %d (%s,%d): waiting for %d\n",
+ ndx, f_name(file, NULL), gnum, F_HL_PREV(file));
+ }
return 1;
}
return 1;
}
+ if (DEBUG_GTE(HLINK, 2)) {
+ rprintf(FINFO, "hlink for %d (%s,%d): looking for a leader\n",
+ ndx, f_name(file, NULL), gnum);
+ }
return 0;
}
return 0;
}
@@
-334,7
+346,6
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
if (!(prev_file->flags & FLAG_HLINK_FIRST)) {
/* The previous previous is FIRST when prev is not. */
prev_name = realname = check_prior(prev_file, gnum, &prev_ndx, &flist);
if (!(prev_file->flags & FLAG_HLINK_FIRST)) {
/* The previous previous is FIRST when prev is not. */
prev_name = realname = check_prior(prev_file, gnum, &prev_ndx, &flist);
- assert(prev_name != NULL || flist != NULL);
/* Update our previous pointer to point to the FIRST. */
F_HL_PREV(file) = prev_ndx;
}
/* Update our previous pointer to point to the FIRST. */
F_HL_PREV(file) = prev_ndx;
}
@@
-342,9
+353,14
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
if (!prev_name) {
int alt_dest;
if (!prev_name) {
int alt_dest;
+ assert(flist != NULL);
prev_file = flist->files[prev_ndx - flist->ndx_start];
/* F_HL_PREV() is alt_dest value when DONE && FIRST. */
alt_dest = F_HL_PREV(prev_file);
prev_file = flist->files[prev_ndx - flist->ndx_start];
/* F_HL_PREV() is alt_dest value when DONE && FIRST. */
alt_dest = F_HL_PREV(prev_file);
+ if (DEBUG_GTE(HLINK, 2)) {
+ rprintf(FINFO, "hlink for %d (%s,%d): found flist match (alt %d)\n",
+ ndx, f_name(file, NULL), gnum, alt_dest);
+ }
if (alt_dest >= 0 && dry_run) {
pathjoin(namebuf, MAXPATHLEN, basis_dir[alt_dest],
if (alt_dest >= 0 && dry_run) {
pathjoin(namebuf, MAXPATHLEN, basis_dir[alt_dest],
@@
-358,6
+374,11
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
}
}
}
}
+ if (DEBUG_GTE(HLINK, 2)) {
+ rprintf(FINFO, "hlink for %d (%s,%d): leader is %d (%s)\n",
+ ndx, f_name(file, NULL), gnum, prev_ndx, prev_name);
+ }
+
if (link_stat(prev_name, &prev_st, 0) < 0) {
rsyserr(FERROR_XFER, errno, "stat %s failed",
full_fname(prev_name));
if (link_stat(prev_name, &prev_st, 0) < 0) {
rsyserr(FERROR_XFER, errno, "stat %s failed",
full_fname(prev_name));