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 a problem with the last change.
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
a043550
..
350c5de
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-22,8
+22,9
@@
extern int dry_run;
extern int verbose;
extern int dry_run;
extern int verbose;
+extern int make_backups;
-#if SUPPORT_HARD_LINKS
+#if
def
SUPPORT_HARD_LINKS
static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
{
struct file_struct *f1 = *file1;
static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
{
struct file_struct *f1 = *file1;
@@
-35,38
+36,52
@@
static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
if (f1->F_INODE != f2->F_INODE)
return (int) (f1->F_INODE > f2->F_INODE ? 1 : -1);
if (f1->F_INODE != f2->F_INODE)
return (int) (f1->F_INODE > f2->F_INODE ? 1 : -1);
- return f
ile_compare(file1, file
2);
+ return f
_name_cmp(f1, f
2);
}
}
-struct file_struct **hlink_list;
-int hlink_count;
+st
atic st
ruct file_struct **hlink_list;
+
static
int hlink_count;
#define LINKED(p1,p2) ((p1)->F_DEV == (p2)->F_DEV \
&& (p1)->F_INODE == (p2)->F_INODE)
/* Analyze the data in the hlink_list[], remove items that aren't multiply
#define LINKED(p1,p2) ((p1)->F_DEV == (p2)->F_DEV \
&& (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,18
+89,22
@@
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
void init_hard_links(struct file_list *flist)
{
}
#endif
void init_hard_links(struct file_list *flist)
{
-#if SUPPORT_HARD_LINKS
+#if
def
SUPPORT_HARD_LINKS
int i;
if (flist->count < 2)
int i;
if (flist->count < 2)
@@
-104,43
+123,45
@@
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
}
int hard_link_check(struct file_struct *file, int skip)
{
#endif
}
int hard_link_check(struct file_struct *file, int skip)
{
- if (!file->link_u.links)
+#ifdef SUPPORT_HARD_LINKS
+ if (!hlink_list || !file->link_u.links)
return 0;
if (skip && !(file->flags & FLAG_HLINK_EOL))
hlink_list[file->F_HLINDEX] = file->F_NEXT;
if (hlink_list[file->F_HLINDEX] != file) {
if (verbose > 1) {
rprintf(FINFO, "\"%s\" is a hard link\n",
return 0;
if (skip && !(file->flags & FLAG_HLINK_EOL))
hlink_list[file->F_HLINDEX] = file->F_NEXT;
if (hlink_list[file->F_HLINDEX] != file) {
if (verbose > 1) {
rprintf(FINFO, "\"%s\" is a hard link\n",
-
f_name(file
));
+
safe_fname(f_name(file)
));
}
return 1;
}
}
return 1;
}
+#endif
return 0;
}
return 0;
}
-#if SUPPORT_HARD_LINKS
+#if
def
SUPPORT_HARD_LINKS
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
) {
- r
printf(FINFO, "link %s => %s failed: %s\n
",
-
hlink2, hlink1, strerror(errno
));
+ if (verbose) {
+ r
syserr(FINFO, errno, "link %s => %s failed
",
+
full_fname(hlink2), safe_fname(hlink1
));
}
}
}
}
- else if (verbose
> 0
)
- rprintf(FINFO, "%s => %s\n",
hlink2, hlink1
);
+ else if (verbose)
+ rprintf(FINFO, "%s => %s\n",
safe_fname(hlink2), safe_fname(hlink1)
);
}
#endif
}
#endif
@@
-152,7
+173,7
@@
static void hard_link_one(char *hlink1, char *hlink2)
**/
void do_hard_links(void)
{
**/
void do_hard_links(void)
{
-#if SUPPORT_HARD_LINKS
+#if
def
SUPPORT_HARD_LINKS
struct file_struct *file, *first;
char hlink1[MAXPATHLEN];
char *hlink2;
struct file_struct *file, *first;
char hlink1[MAXPATHLEN];
char *hlink2;
@@
-164,20
+185,22
@@
void do_hard_links(void)
for (i = 0; i < hlink_count; i++) {
first = file = hlink_list[i];
for (i = 0; i < hlink_count; i++) {
first = file = hlink_list[i];
- if (link_stat(f_name_to(first, hlink1), &st1
) !=
0)
+ if (link_stat(f_name_to(first, hlink1), &st1
, 0) <
0)
continue;
while ((file = file->F_NEXT) != first) {
hlink2 = f_name(file);
continue;
while ((file = file->F_NEXT) != first) {
hlink2 = f_name(file);
- if (link_stat(hlink2, &st2) == 0) {
+ if (link_stat(hlink2, &st2
, 0
) == 0) {
if (st2.st_dev == st1.st_dev
&& st2.st_ino == st1.st_ino)
continue;
if (st2.st_dev == st1.st_dev
&& st2.st_ino == st1.st_ino)
continue;
- if (robust_unlink(hlink2)) {
+ if (make_backups) {
+ if (!make_backup(hlink2))
+ continue;
+ } else if (robust_unlink(hlink2)) {
if (verbose > 0) {
if (verbose > 0) {
- rprintf(FINFO,
- "unlink %s failed: %s\n",
- full_fname(hlink2),
- strerror(errno));
+ rsyserr(FINFO, errno,
+ "unlink %s failed",
+ full_fname(hlink2));
}
continue;
}
}
continue;
}