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
Fixed our supplied getnameinfo()'s ability to do a reverse lookup,
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
536b571
..
0581398
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-21,8
+21,8
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "inums.h"
-extern int verbose;
extern int dry_run;
extern int list_only;
extern int am_sender;
extern int dry_run;
extern int list_only;
extern int am_sender;
@@
-30,13
+30,14
@@
extern int inc_recurse;
extern int do_xfers;
extern int link_dest;
extern int preserve_acls;
extern int do_xfers;
extern int link_dest;
extern int preserve_acls;
+extern int preserve_xattrs;
extern int make_backups;
extern int protocol_version;
extern int remove_source_files;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern int unsort_ndx;
extern int make_backups;
extern int protocol_version;
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 char *basis_dir[
MAX_BASIS_DIRS+1
];
extern struct file_list *cur_flist;
#ifdef SUPPORT_HARD_LINKS
extern struct file_list *cur_flist;
#ifdef SUPPORT_HARD_LINKS
@@
-69,8
+70,14
@@
struct ht_int64_node *idev_find(int64 dev, int64 ino)
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 (!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);
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));
+ }
+ }
} else
tbl = dev_node->data;
} else
tbl = dev_node->data;
@@
-119,14
+126,15
@@
static void match_gnums(int32 *ndx_list, int ndx_count)
if (inc_recurse) {
node = hashtable_find(prior_hlinks, gnum, 1);
if (!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;
} else if (CVAL(node->data, 0) == 0) {
struct file_list *flist;
prev = IVAL(node->data, 1);
assert(gnum >= hlink_flist->ndx_start);
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);
+ flist = flist_for_ndx(prev
, NULL
);
if (flist)
flist->files[prev - flist->ndx_start]->flags &= ~FLAG_HLINK_LAST;
else {
if (flist)
flist->files[prev - flist->ndx_start]->flags &= ~FLAG_HLINK_LAST;
else {
@@
-179,7
+187,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;
@@
-215,7
+223,7
@@
static int maybe_hard_link(struct file_struct *file, int ndx,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
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;
rprintf(FCLIENT, "%s is uptodate\n", fname);
file->flags |= FLAG_HLINK_DONE;
return 0;
@@
-236,7
+244,7
@@
static int maybe_hard_link(struct file_struct *file, int ndx,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
realname);
}
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;
}
rprintf(code, "%s => %s\n", fname, realname);
return 0;
}
@@
-249,17
+257,13
@@
static char *check_prior(struct file_struct *file, int gnum,
int *prev_ndx_p, struct file_list **flist_p)
{
struct file_struct *fp;
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) {
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)) == NULL)
break;
fp = flist->files[prev_ndx - flist->ndx_start];
if (!(fp->flags & FLAG_SKIP_HLINK)) {
break;
fp = flist->files[prev_ndx - flist->ndx_start];
if (!(fp->flags & FLAG_SKIP_HLINK)) {
@@
-270,20
+274,21
@@
static char *check_prior(struct file_struct *file, int gnum,
F_HL_PREV(file) = prev_ndx = F_HL_PREV(fp);
}
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. */
/* 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:
}
/* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
@@
-307,6
+312,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;
}
@@
-323,8
+332,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;
}
@@
-332,7
+349,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;
}
@@
-340,9
+356,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],
@@
-356,6
+377,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));
@@
-369,6
+395,9
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
int j = 0;
#ifdef SUPPORT_ACLS
alt_sx.acc_acl = alt_sx.def_acl = NULL;
int j = 0;
#ifdef SUPPORT_ACLS
alt_sx.acc_acl = alt_sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+ alt_sx.xattr = NULL;
#endif
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
#endif
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@
-380,10
+409,10
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
continue;
statret = 1;
if (stdout_format_has_i == 0
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;
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;
rprintf(FCLIENT, "%s is uptodate\n", fname);
}
break;
@@
-398,19
+427,37
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
sxp->st = alt_sx.st;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
sxp->st = alt_sx.st;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
- if (!ACL_READY(*sxp))
+ free_acl(sxp);
+ if (!ACL_READY(alt_sx))
get_acl(cmpbuf, sxp);
else {
sxp->acc_acl = alt_sx.acc_acl;
sxp->def_acl = alt_sx.def_acl;
get_acl(cmpbuf, sxp);
else {
sxp->acc_acl = alt_sx.acc_acl;
sxp->def_acl = alt_sx.def_acl;
+ alt_sx.acc_acl = alt_sx.def_acl = NULL;
}
}
#endif
}
}
#endif
- }
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs) {
+ free_xattr(sxp);
+ if (!XATTR_READY(alt_sx))
+ get_xattr(cmpbuf, sxp);
+ else {
+ sxp->xattr = alt_sx.xattr;
+ alt_sx.xattr = NULL;
+ }
+ }
+#endif
+ } else {
#ifdef SUPPORT_ACLS
#ifdef SUPPORT_ACLS
- else if (preserve_acls)
- free_acl(&alt_sx);
+ if (preserve_acls)
+ free_acl(&alt_sx);
+#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ free_xattr(&alt_sx);
#endif
#endif
+ }
}
if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
}
if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
@@
-429,7
+476,7
@@
int hard_link_one(struct file_struct *file, const char *fname,
if (do_link(oldname, fname) < 0) {
enum logcode code;
if (terse) {
if (do_link(oldname, fname) < 0) {
enum logcode code;
if (terse) {
- if (!
verbose
)
+ if (!
INFO_GTE(NAME, 1)
)
return 0;
code = FINFO;
} else
return 0;
code = FINFO;
} else
@@
-450,7
+497,7
@@
void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
{
stat_x prev_sx;
STRUCT_STAT st;
{
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);
const char *our_name;
struct file_list *flist;
int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
@@
-477,23
+524,28
@@
void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
#ifdef SUPPORT_ACLS
prev_sx.acc_acl = prev_sx.def_acl = NULL;
#endif
#ifdef SUPPORT_ACLS
prev_sx.acc_acl = prev_sx.def_acl = NULL;
#endif
+#ifdef SUPPORT_XATTRS
+ prev_sx.xattr = NULL;
+#endif
while ((ndx = prev_ndx) >= 0) {
int val;
while ((ndx = prev_ndx) >= 0) {
int val;
- flist = flist_for_ndx(ndx);
- assert(flist != NULL);
+ flist = flist_for_ndx(ndx, "finish_hard_link");
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;
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--;
#ifdef SUPPORT_ACLS
if (preserve_acls)
free_acl(&prev_sx);
val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
our_name, stp, fname, itemizing, code);
flist->in_progress--;
#ifdef SUPPORT_ACLS
if (preserve_acls)
free_acl(&prev_sx);
+#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ free_xattr(&prev_sx);
#endif
if (val < 0)
continue;
#endif
if (val < 0)
continue;