extern int remove_source_files;
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;
-#ifdef ICONV_OPTION
-extern int ic_ndx;
-#endif
#ifdef SUPPORT_HARD_LINKS
if (!node->data) {
node->data = new_array0(char, 5);
assert(gnum >= hlink_flist->ndx_start);
- }
- }
- if (gnum >= hlink_flist->ndx_start) {
+ file->flags |= FLAG_HLINK_FIRST;
+ prev = -1;
+ } else if (CVAL(node->data, 0) == 0) {
+ struct file_list *flist;
+ struct file_struct *fp;
+ prev = IVAL(node->data, 1);
+ flist = flist_for_ndx(prev);
+ assert(flist != NULL);
+ fp = flist->files[prev - flist->ndx_start];
+ fp->flags &= ~FLAG_HLINK_LAST;
+ } else
+ prev = -1;
+ } else {
file->flags |= FLAG_HLINK_FIRST;
prev = -1;
- } else if (CVAL(node->data, 0) == 0) {
- struct file_list *flist;
- prev = IVAL(node->data, 1);
- flist = flist_for_ndx(prev);
- assert(flist != NULL);
- file_next = flist->files[prev - flist->ndx_start];
- file_next->flags &= ~FLAG_HLINK_LAST;
- } else
- prev = -1;
+ }
for ( ; from < ndx_count-1; file = file_next, gnum = gnum_next, from++) { /*SHARED ITERATOR*/
file_next = hlink_flist->sorted[ndx_list[from+1]];
gnum_next = F_HL_GNUM(file_next);
break;
F_HL_PREV(file) = prev;
/* The linked list must use raw ndx values. */
-#ifdef ICONV_OPTION
- if (ic_ndx)
+ if (unsort_ndx)
prev = F_NDX(file);
else
-#endif
prev = ndx_list[from] + hlink_flist->ndx_start;
}
if (prev < 0 && !inc_recurse) {
+ /* Disable hard-link bit and set DONE so that
+ * HLINK_BUMP()-dependent values are unaffected. */
file->flags &= ~(FLAG_HLINKED | FLAG_HLINK_FIRST);
+ file->flags |= FLAG_HLINK_DONE;
continue;
}
file->flags |= FLAG_HLINK_LAST;
F_HL_PREV(file) = prev;
if (inc_recurse && CVAL(node->data, 0) == 0) {
-#ifdef ICONV_OPTION
- if (ic_ndx)
+ if (unsort_ndx)
prev = F_NDX(file);
else
-#endif
prev = ndx_list[from] + hlink_flist->ndx_start;
SIVAL(node->data, 1, prev);
}
}
static int maybe_hard_link(struct file_struct *file, int ndx,
- const char *fname, int statret, statx *sxp,
+ const char *fname, int statret, stat_x *sxp,
const char *oldname, STRUCT_STAT *old_stp,
const char *realname, int itemizing, enum logcode code)
{
if (!make_backup(fname))
return -1;
} else if (robust_unlink(fname)) {
- rsyserr(FERROR, errno, "unlink %s failed",
+ rsyserr(FERROR_XFER, errno, "unlink %s failed",
full_fname(fname));
return -1;
}
/* Figure out if a prior entry is still there or if we just have a
* cached name for it. Never called with a FLAG_HLINK_FIRST entry. */
-static char *check_prior(int prev_ndx, int gnum)
+static char *check_prior(int prev_ndx, int gnum, struct file_list **flist_p)
{
struct file_list *flist = flist_for_ndx(prev_ndx);
struct ht_int32_node *node;
if (flist) {
- hlink_flist = flist;
+ *flist_p = flist;
return NULL;
}
/* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
* 0 = process the file, 1 = skip the file, -1 = error occurred. */
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
- int statret, statx *sxp, int itemizing,
+ int statret, stat_x *sxp, int itemizing,
enum logcode code)
{
STRUCT_STAT prev_st;
char namebuf[MAXPATHLEN], altbuf[MAXPATHLEN];
char *realname, *prev_name;
- int gnum = F_HL_GNUM(file);
+ struct file_list *flist;
+ int gnum = inc_recurse ? F_HL_GNUM(file) : -1;
int prev_ndx = F_HL_PREV(file);
- prev_name = realname = check_prior(prev_ndx, gnum);
+ prev_name = realname = check_prior(prev_ndx, gnum, &flist);
if (!prev_name) {
- struct file_struct *prev_file = hlink_flist->files[prev_ndx - hlink_flist->ndx_start];
+ struct file_struct *prev_file = flist->files[prev_ndx - flist->ndx_start];
/* Is the previous link is not complete yet? */
if (!(prev_file->flags & FLAG_HLINK_DONE)) {
/* There is a finished file to link with! */
if (!(prev_file->flags & FLAG_HLINK_FIRST)) {
- /* The previous previous will be marked with FIRST. */
+ /* The previous previous is FIRST when prev is not. */
prev_ndx = F_HL_PREV(prev_file);
- prev_name = realname = check_prior(prev_ndx, gnum);
- /* Update our previous pointer to point to the first. */
+ prev_name = realname = check_prior(prev_ndx, gnum, &flist);
+ /* Update our previous pointer to point to the FIRST. */
F_HL_PREV(file) = prev_ndx;
}
- }
- if (!prev_name) {
- struct file_struct *prev_file = hlink_flist->files[prev_ndx - hlink_flist->ndx_start];
- int alt_dest = F_HL_PREV(prev_file); /* alternate value when DONE && FIRST */
-
- if (alt_dest >= 0 && dry_run) {
- pathjoin(namebuf, MAXPATHLEN, basis_dir[alt_dest],
- f_name(prev_file, NULL));
- prev_name = namebuf;
- realname = f_name(prev_file, altbuf);
- } else {
- prev_name = f_name(prev_file, namebuf);
- realname = prev_name;
+
+ if (!prev_name) {
+ int alt_dest;
+
+ 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 (alt_dest >= 0 && dry_run) {
+ pathjoin(namebuf, MAXPATHLEN, basis_dir[alt_dest],
+ f_name(prev_file, NULL));
+ prev_name = namebuf;
+ realname = f_name(prev_file, altbuf);
+ } else {
+ prev_name = f_name(prev_file, namebuf);
+ realname = prev_name;
+ }
}
}
if (link_stat(prev_name, &prev_st, 0) < 0) {
- rsyserr(FERROR, errno, "stat %s failed",
+ rsyserr(FERROR_XFER, errno, "stat %s failed",
full_fname(prev_name));
return -1;
}
if (statret < 0 && basis_dir[0] != NULL) {
/* If we match an alt-dest item, we don't output this as a change. */
char cmpbuf[MAXPATHLEN];
- statx alt_sx;
+ stat_x alt_sx;
int j = 0;
#ifdef SUPPORT_ACLS
alt_sx.acc_acl = alt_sx.def_acl = NULL;
|| prev_st.st_ino != alt_sx.st.st_ino)
continue;
statret = 1;
- if (verbose < 2 || !stdout_format_has_i) {
+ if (stdout_format_has_i == 0
+ || (verbose < 2 && stdout_format_has_i < 2)) {
itemizing = 0;
code = FNONE;
if (verbose > 1 && maybe_ATTRS_REPORT)
return -1;
code = FINFO;
} else
- code = FERROR;
+ code = FERROR_XFER;
rsyserr(code, errno, "link %s => %s failed",
full_fname(fname), oldname);
return 0;
return 1;
}
-void finish_hard_link(struct file_struct *file, const char *fname,
+void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
STRUCT_STAT *stp, int itemizing, enum logcode code,
int alt_dest)
{
- statx prev_sx;
+ stat_x prev_sx;
STRUCT_STAT st;
char alt_name[MAXPATHLEN], *prev_name;
const char *our_name;
if (stp == NULL && prev_ndx >= 0) {
if (link_stat(fname, &st, 0) < 0) {
- rsyserr(FERROR, errno, "stat %s failed",
+ rsyserr(FERROR_XFER, errno, "stat %s failed",
full_fname(fname));
return;
}
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);
val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff