#include "rsync.h"
-extern int verbose;
extern int dry_run;
extern int list_only;
extern int am_sender;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern int unsort_ndx;
-extern char *basis_dir[];
-extern struct file_list *cur_flist;
+extern char *basis_dir[MAX_BASIS_DIRS+1];
+extern struct file_list *cur_flist, *first_flist;
#ifdef SUPPORT_HARD_LINKS
if (!dev_node || dev_node->key != dev) {
/* We keep a separate hash table of inodes for every device. */
dev_node = hashtable_find(dev_tbl, dev, 1);
- if (!(tbl = dev_node->data))
+ if (!(tbl = dev_node->data)) {
tbl = dev_node->data = hashtable_create(512, SIZEOF_INT64 == 8);
+ if (DEBUG_GTE(HLINK, 3)) {
+ rprintf(FINFO,
+ "[%s] created hashtable for dev %s\n",
+ who_am_i(), big_num(dev, 0));
+ }
+ }
} else
tbl = dev_node->data;
if (inc_recurse) {
node = hashtable_find(prior_hlinks, gnum, 1);
if (!node->data) {
- node->data = new_array0(char, 5);
+ if (!(node->data = new_array0(char, 5)))
+ out_of_memory("match_gnums");
assert(gnum >= hlink_flist->ndx_start);
file->flags |= FLAG_HLINK_FIRST;
prev = -1;
* 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;
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
- if (verbose > 1 && maybe_ATTRS_REPORT)
+ if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
file->flags |= FLAG_HLINK_DONE;
return 0;
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
realname);
}
- if (code != FNONE && verbose)
+ if (code != FNONE && INFO_GTE(NAME, 1))
rprintf(code, "%s => %s\n", fname, realname);
return 0;
}
int *prev_ndx_p, struct file_list **flist_p)
{
struct file_struct *fp;
- struct file_list *flist;
struct ht_int32_node *node;
int prev_ndx = F_HL_PREV(file);
while (1) {
- if (prev_ndx < 0) {
- *prev_ndx_p = prev_ndx;
- *flist_p = NULL;
- return NULL;
- }
- if ((flist = flist_for_ndx(prev_ndx)) == NULL)
+ struct file_list *flist;
+ if (prev_ndx < 0
+ || (flist = flist_for_ndx(prev_ndx)) == NULL)
break;
fp = flist->files[prev_ndx - flist->ndx_start];
if (!(fp->flags & FLAG_SKIP_HLINK)) {
F_HL_PREV(file) = prev_ndx = F_HL_PREV(fp);
}
- node = hashtable_find(prior_hlinks, gnum, 0);
- assert(node != NULL && node->data);
-
- if (CVAL(node->data, 0) == 0) {
+ if (inc_recurse
+ && (node = hashtable_find(prior_hlinks, gnum, 0)) != NULL) {
+ assert(node->data != NULL);
+ if (CVAL(node->data, 0) != 0) {
+ *prev_ndx_p = -1;
+ *flist_p = NULL;
+ return node->data;
+ }
/* The prior file must have been skipped. */
- F_HL_PREV(file) = prev_ndx = -1;
- *prev_ndx_p = prev_ndx;
- *flist_p = NULL;
- return NULL;
+ F_HL_PREV(file) = -1;
}
- *prev_ndx_p = prev_ndx;
- *flist_p = flist;
- return node->data;
+ *prev_ndx_p = -1;
+ *flist_p = NULL;
+ return NULL;
}
/* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
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;
}
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;
}
+ 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;
}
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;
}
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);
+ 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 (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));
continue;
statret = 1;
if (stdout_format_has_i == 0
- || (verbose < 2 && stdout_format_has_i < 2)) {
+ || (!INFO_GTE(NAME, 2) && stdout_format_has_i < 2)) {
itemizing = 0;
code = FNONE;
- if (verbose > 1 && maybe_ATTRS_REPORT)
+ if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
}
break;
if (do_link(oldname, fname) < 0) {
enum logcode code;
if (terse) {
- if (!verbose)
+ if (!INFO_GTE(NAME, 1))
return 0;
code = FINFO;
} else
{
stat_x prev_sx;
STRUCT_STAT st;
- char alt_name[MAXPATHLEN], *prev_name;
+ char prev_name[MAXPATHLEN], alt_name[MAXPATHLEN];
const char *our_name;
struct file_list *flist;
int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
while ((ndx = prev_ndx) >= 0) {
int val;
flist = flist_for_ndx(ndx);
- assert(flist != NULL);
+ if (flist == NULL) {
+ int start1 = first_flist ? first_flist->ndx_start : 0;
+ int start2 = first_flist ? first_flist->prev->ndx_start : 0;
+ int used = first_flist ? first_flist->prev->used : 0;
+ rprintf(FERROR,
+ "File index not found: %d (%d - %d)\n",
+ ndx, start1 - 1, start2 + used - 1);
+ exit_cleanup(RERR_PROTOCOL);
+ }
file = flist->files[ndx - flist->ndx_start];
file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
prev_ndx = F_HL_PREV(file);
F_HL_PREV(file) = fin_ndx;
- prev_name = f_name(file, NULL);
- prev_statret = link_stat(prev_name, &prev_sx.st, 0);
+ prev_statret = link_stat(f_name(file, prev_name), &prev_sx.st, 0);
val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
our_name, stp, fname, itemizing, code);
flist->in_progress--;