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
Document the --no-motd option.
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
cd0941f
..
2ef998c
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-55,14
+55,14
@@
static int hlink_compare(int *int1, int *int2)
return f_name_cmp(f1, f2);
}
return f_name_cmp(f1, f2);
}
-static int *hlink_list;
-static int hlink_count;
+static int
32
*hlink_list;
+static int
32
hlink_count;
/* Analyze the data in the hlink_list[], remove items that aren't multiply
* linked, and replace the dev+inode data with the hlindex+next linked list. */
static void link_idev_data(void)
{
/* Analyze the data in the hlink_list[], remove items that aren't multiply
* linked, and replace the dev+inode data with the hlindex+next linked list. */
static void link_idev_data(void)
{
- int cur, from, to, start;
+ int
32
cur, from, to, start;
alloc_pool_t hlink_pool;
alloc_pool_t idev_pool = the_file_list->hlink_pool;
alloc_pool_t hlink_pool;
alloc_pool_t idev_pool = the_file_list->hlink_pool;
@@
-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;
@@
-106,7
+108,7
@@
static void link_idev_data(void)
hlink_pool = NULL;
} else {
hlink_count = to;
hlink_pool = NULL;
} else {
hlink_count = to;
- hlink_list = realloc_array(hlink_list, int, hlink_count);
+ hlink_list = realloc_array(hlink_list, int
32
, hlink_count);
if (!hlink_list)
out_of_memory("init_hard_links");
}
if (!hlink_list)
out_of_memory("init_hard_links");
}
@@
-123,7
+125,7
@@
void init_hard_links(void)
if (hlink_list)
free(hlink_list);
if (hlink_list)
free(hlink_list);
- if (!(hlink_list = new_array(int, the_file_list->count)))
+ if (!(hlink_list = new_array(int
32
, the_file_list->count)))
out_of_memory("init_hard_links");
hlink_count = 0;
out_of_memory("init_hard_links");
hlink_count = 0;
@@
-191,7
+193,13
@@
int hard_link_check(struct file_struct *file, int ndx, char *fname,
}
if (head_file->F_HLINDEX == FINISHED_LINK) {
STRUCT_STAT st2, st3;
}
if (head_file->F_HLINDEX == FINISHED_LINK) {
STRUCT_STAT st2, st3;
- char *toname = f_name(head_file, NULL);
+ char toname[MAXPATHLEN];
+ int ldu = head_file->link_u.links->link_dest_used;
+ if (ldu) {
+ pathjoin(toname, MAXPATHLEN, basis_dir[ldu-1],
+ f_name(head_file, NULL));
+ } else
+ f_name(head_file, toname);
if (link_stat(toname, &st2, 0) < 0) {
rsyserr(FERROR, errno, "stat %s failed",
full_fname(toname));
if (link_stat(toname, &st2, 0) < 0) {
rsyserr(FERROR, errno, "stat %s failed",
full_fname(toname));
@@
-210,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))
@@
-260,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;
}