/*
- Copyright (C) Andrew Tridgell 1996
- Copyright (C) Paul Mackerras 1996
- Copyright (C) 2002 by Martin Pool <mbp@samba.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Routines to support hard-linking.
+ *
+ * Copyright (C) 1996 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
#include "rsync.h"
-extern int dry_run;
extern int verbose;
+extern int do_xfers;
+extern int link_dest;
extern int make_backups;
-extern int log_format_has_i;
+extern int remove_source_files;
+extern int stdout_format_has_i;
+extern char *basis_dir[];
extern struct file_list *the_file_list;
#ifdef SUPPORT_HARD_LINKS
return f_name_cmp(f1, f2);
}
-static int *hlink_list;
-static int hlink_count;
+static int32 *hlink_list;
+static int32 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)
{
- int cur, from, to, start;
+ int32 cur, from, to, start;
alloc_pool_t hlink_pool;
alloc_pool_t idev_pool = the_file_list->hlink_pool;
- hlink_pool = pool_create(128 * 1024, sizeof (struct hlink),
- out_of_memory, POOL_INTERN);
+ hlink_pool = pool_create(128 * 1024, sizeof (struct hlink), out_of_memory, POOL_INTERN);
for (from = to = 0; from < hlink_count; from++) {
start = 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) {
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_pool = NULL;
} else {
hlink_count = to;
- hlink_list = realloc_array(hlink_list, int, hlink_count);
+ hlink_list = realloc_array(hlink_list, int32, hlink_count);
if (!hlink_list)
out_of_memory("init_hard_links");
}
if (hlink_list)
free(hlink_list);
- if (!(hlink_list = new_array(int, the_file_list->count)))
+ if (!(hlink_list = new_array(int32, the_file_list->count)))
out_of_memory("init_hard_links");
hlink_count = 0;
{
#ifdef SUPPORT_HARD_LINKS
int head;
- if (!file->link_u.links)
- return 0;
if (skip && !(file->flags & FLAG_HLINK_EOL))
head = hlink_list[file->F_HLINDEX] = file->F_NEXT;
else
head = hlink_list[file->F_HLINDEX];
if (ndx != head) {
struct file_struct *head_file = FPTR(head);
- if (!log_format_has_i && verbose > 1) {
+ if (!stdout_format_has_i && verbose > 1) {
rprintf(FINFO, "\"%s\" is a hard link\n",
- safe_fname(f_name(file)));
+ f_name(file, NULL));
}
if (head_file->F_HLINDEX == FINISHED_LINK) {
- STRUCT_STAT st2;
- char *toname = f_name(head_file);
+ STRUCT_STAT st2, st3;
+ 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));
return -1;
}
+ if (statret < 0 && basis_dir[0] != NULL) {
+ char cmpbuf[MAXPATHLEN];
+ int j = 0;
+ do {
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, &st3, 0) < 0)
+ continue;
+ if (link_dest) {
+ if (st2.st_dev != st3.st_dev
+ || st2.st_ino != st3.st_ino)
+ continue;
+ statret = 1;
+ st = &st3;
+ if (verbose < 2 || !stdout_format_has_i) {
+ itemizing = 0;
+ code = FNONE;
+ }
+ break;
+ }
+ if (!unchanged_file(cmpbuf, file, &st3))
+ continue;
+ statret = 1;
+ st = &st3;
+ if (unchanged_attrs(file, &st3))
+ break;
+ } while (basis_dir[++j] != NULL);
+ }
maybe_hard_link(file, ndx, fname, statret, st,
toname, &st2, itemizing, code);
+ if (remove_source_files == 1 && do_xfers) {
+ char numbuf[4];
+ SIVAL(numbuf, 0, ndx);
+ send_msg(MSG_SUCCESS, numbuf, 4);
+ }
file->F_HLINDEX = FINISHED_LINK;
} else
file->F_HLINDEX = SKIPPED_LINK;
} else
code = FERROR;
rsyserr(code, errno, "link %s => %s failed",
- full_fname(fname), safe_fname(toname));
+ full_fname(fname), toname);
return -1;
}
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
terse ? "" : toname);
}
- if (code && verbose && !terse) {
- rprintf(code, "%s => %s\n",
- safe_fname(fname), safe_fname(toname));
- }
+ if (code != FNONE && verbose && !terse)
+ rprintf(code, "%s => %s\n", fname, toname);
return 0;
}
#endif
int statret, ndx = master;
file->F_HLINDEX = FINISHED_LINK;
- if (link_stat(f_name_to(file, hlink1), &st1, 0) < 0)
+ if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
return;
if (!(file->flags & FLAG_HLINK_TOL)) {
while (!(file->flags & FLAG_HLINK_EOL)) {
file = FPTR(ndx);
if (file->F_HLINDEX != SKIPPED_LINK)
continue;
- hlink2 = f_name(file);
+ hlink2 = f_name(file, NULL);
statret = link_stat(hlink2, &st2, 0);
maybe_hard_link(file, ndx, hlink2, statret, &st2,
hlink1, &st1, itemizing, code);
+ if (remove_source_files == 1 && do_xfers) {
+ char numbuf[4];
+ SIVAL(numbuf, 0, ndx);
+ send_msg(MSG_SUCCESS, numbuf, 4);
+ }
file->F_HLINDEX = FINISHED_LINK;
} while (!(file->flags & FLAG_HLINK_EOL));
#endif
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff