-/* -*- c-file-style: "linux" -*-
-
- rsync -- fast file replication program
-
- Copyright (C) 1996-2000 by Andrew Tridgell
- 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 that are exclusive to the generator process.
+ *
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 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"
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
int maybe_ATTRS_REPORT, enum logcode code)
{
+ int save_ignore_times = ignore_times;
+ int save_size_only = size_only;
int best_match = -1;
int match_level = 0;
int j = 0;
+ /* We can't let these send-affecting options affect our checking
+ * for identical files in the alternate basis dirs. */
+ ignore_times = size_only = 0;
+
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
case 2:
if (!unchanged_attrs(file, stp))
continue;
- if ((always_checksum || ignore_times)
+ if (always_checksum
&& cmp_time(stp->st_mtime, file->modtime))
continue;
best_match = j;
break;
} while (basis_dir[++j] != NULL);
+ ignore_times = save_ignore_times;
+ size_only = save_size_only;
+
if (!match_level)
return -1;
if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode)
|| !unchanged_attrs(file, &st))
continue;
- if (IS_DEVICE(file->mode)) {
- if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
- continue;
- } else if (IS_SPECIAL(file->mode)) {
- if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev)
- continue;
-#ifdef CAN_HARDLINK_SYMLINK
- } else if (S_ISLNK(file->mode)) {
+ if (S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
char lnk[MAXPATHLEN];
int len;
if (strcmp(lnk, file->u.link) != 0)
#endif
continue;
-#endif
+ } else if (IS_SPECIAL(file->mode)) {
+ if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev)
+ continue;
+ } else if (IS_DEVICE(file->mode)) {
+ if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
+ continue;
} else {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
- file->mode);
+ (int)file->mode);
exit_cleanup(RERR_UNSUPPORTED);
}
- if (link_dest) {
- if (do_link(fnamebuf, fname) < 0) {
+ if (link_dest
+#ifndef CAN_HARDLINK_SYMLINK
+ && !S_ISLNK(file->mode)
+#endif
+#ifndef CAN_HARDLINK_SPECIAL
+ && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
+#endif
+ ) {
+#ifdef SUPPORT_HARD_LINKS
+ if (do_link(fnamebuf, fname) < 0)
+#endif
+ {
rsyserr(FERROR, errno,
"failed to hard-link %s with %s",
fnamebuf, fname);
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
- && do_stat(dn, &st) < 0
+ && safe_stat(dn, &st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
return;
if (!S_ISLNK(st.st_mode))
statret = -1;
-#ifdef CAN_HARDLINK_SYMLINK
} else if (basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
maybe_ATTRS_REPORT, code) == -2) {
+#ifndef CAN_HARDLINK_SYMLINK
+ if (link_dest) {
+ /* Resort to --copy-dest behavior. */
+ } else
+#endif
if (!copy_dest)
return;
itemizing = code = 0;
}
-#endif
}
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
-#ifdef CAN_HARDLINK_SPECIAL
if (statret != 0 && basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
maybe_ATTRS_REPORT, code) == -2) {
+#ifndef CAN_HARDLINK_SPECIAL
+ if (link_dest) {
+ /* Resort to --copy-dest behavior. */
+ } else
+#endif
if (!copy_dest)
return;
itemizing = code = 0;
}
}
-#endif
if (statret != 0
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff