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
Added backup_dir_buf and backup_dir_remainder.
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
a043550
..
f42df53
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-45,28
+45,42
@@
int hlink_count;
&& (p1)->F_INODE == (p2)->F_INODE)
/* Analyze the data in the hlink_list[], remove items that aren't multiply
&& (p1)->F_INODE == (p2)->F_INODE)
/* Analyze the data in the hlink_list[], remove items that aren't multiply
- * linked, and replace the dev+inode data with the h
ead
+next linked list. */
-static void link_idev_data(
void
)
+ * linked, and replace the dev+inode data with the h
lindex
+next linked list. */
+static void link_idev_data(
struct file_list *flist
)
{
struct file_struct *head;
int from, to, start;
{
struct file_struct *head;
int from, to, start;
+ alloc_pool_t hlink_pool;
+ alloc_pool_t idev_pool = flist->hlink_pool;
+
+ hlink_pool = pool_create(128 * 1024, sizeof (struct hlink),
+ out_of_memory, POOL_INTERN);
+
for (from = to = 0; from < hlink_count; from++) {
start = from;
head = hlink_list[start];
while (from < hlink_count-1
&& LINKED(hlink_list[from], hlink_list[from+1])) {
for (from = to = 0; from < hlink_count; from++) {
start = from;
head = hlink_list[start];
while (from < hlink_count-1
&& LINKED(hlink_list[from], hlink_list[from+1])) {
+ pool_free(idev_pool, 0, hlink_list[from]->link_u.idev);
+ hlink_list[from]->link_u.links = pool_talloc(hlink_pool,
+ struct hlink, 1, "hlink_list");
+
hlink_list[from]->F_HLINDEX = to;
hlink_list[from]->F_NEXT = hlink_list[from+1];
from++;
}
if (from > start) {
hlink_list[from]->F_HLINDEX = to;
hlink_list[from]->F_NEXT = hlink_list[from+1];
from++;
}
if (from > start) {
+ pool_free(idev_pool, 0, hlink_list[from]->link_u.idev);
+ hlink_list[from]->link_u.links = pool_talloc(hlink_pool,
+ struct hlink, 1, "hlink_list");
+
hlink_list[from]->F_HLINDEX = to;
hlink_list[from]->F_NEXT = head;
hlink_list[from]->flags |= FLAG_HLINK_EOL;
hlink_list[to++] = head;
} else {
hlink_list[from]->F_HLINDEX = to;
hlink_list[from]->F_NEXT = head;
hlink_list[from]->flags |= FLAG_HLINK_EOL;
hlink_list[to++] = head;
} else {
-
free((char*)
head->link_u.idev);
+
pool_free(idev_pool, 0,
head->link_u.idev);
head->link_u.idev = NULL;
}
}
head->link_u.idev = NULL;
}
}
@@
-74,12
+88,16
@@
static void link_idev_data(void)
if (!to) {
free(hlink_list);
hlink_list = NULL;
if (!to) {
free(hlink_list);
hlink_list = NULL;
+ pool_destroy(hlink_pool);
+ hlink_pool = NULL;
} else {
hlink_count = to;
if (!(hlink_list = realloc_array(hlink_list,
} else {
hlink_count = to;
if (!(hlink_list = realloc_array(hlink_list,
-
struct file_struct *, hlink_count)))
+ struct file_struct *, hlink_count)))
out_of_memory("init_hard_links");
}
out_of_memory("init_hard_links");
}
+ flist->hlink_pool = hlink_pool;
+ pool_destroy(idev_pool);
}
#endif
}
#endif
@@
-104,13
+122,13
@@
void init_hard_links(struct file_list *flist)
}
qsort(hlink_list, hlink_count,
}
qsort(hlink_list, hlink_count,
-
sizeof(hlink_list[0])
, (int (*)()) hlink_compare);
+
sizeof hlink_list[0]
, (int (*)()) hlink_compare);
if (!hlink_count) {
free(hlink_list);
hlink_list = NULL;
} else
if (!hlink_count) {
free(hlink_list);
hlink_list = NULL;
} else
- link_idev_data();
+ link_idev_data(
flist
);
#endif
}
#endif
}
@@
-123,7
+141,7
@@
int hard_link_check(struct file_struct *file, int skip)
if (hlink_list[file->F_HLINDEX] != file) {
if (verbose > 1) {
rprintf(FINFO, "\"%s\" is a hard link\n",
if (hlink_list[file->F_HLINDEX] != file) {
if (verbose > 1) {
rprintf(FINFO, "\"%s\" is a hard link\n",
-
f_name(file));
+ f_name(file));
}
return 1;
}
}
return 1;
}
@@
-134,12
+152,12
@@
int hard_link_check(struct file_struct *file, int skip)
static void hard_link_one(char *hlink1, char *hlink2)
{
if (do_link(hlink1, hlink2)) {
static void hard_link_one(char *hlink1, char *hlink2)
{
if (do_link(hlink1, hlink2)) {
- if (verbose
> 0
) {
+ if (verbose) {
rprintf(FINFO, "link %s => %s failed: %s\n",
rprintf(FINFO, "link %s => %s failed: %s\n",
-
hlink2, hlink1, strerror(errno));
+ hlink2, hlink1, strerror(errno));
}
}
}
}
- else if (verbose
> 0
)
+ else if (verbose)
rprintf(FINFO, "%s => %s\n", hlink2, hlink1);
}
#endif
rprintf(FINFO, "%s => %s\n", hlink2, hlink1);
}
#endif
@@
-175,9
+193,9
@@
void do_hard_links(void)
if (robust_unlink(hlink2)) {
if (verbose > 0) {
rprintf(FINFO,
if (robust_unlink(hlink2)) {
if (verbose > 0) {
rprintf(FINFO,
-
"unlink %s failed: %s\n",
-
full_fname(hlink2),
-
strerror(errno));
+ "unlink %s failed: %s\n",
+ full_fname(hlink2),
+ strerror(errno));
}
continue;
}
}
continue;
}