extern struct filter_list_struct server_filter_list;
static int deletion_count = 0; /* used to implement --max-delete */
-static int can_link_symlinks = 1; /* start out optimistic */
-static int can_link_devices = 1;
/* For calling delete_file() */
#define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
/* This is only called for non-regular files. We return -2 if we've finished
* handling the file, or -1 if no dest-linking occurred. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
- int itemizing, int *possible_ptr,
- int maybe_ATTRS_REPORT, enum logcode code)
+ int itemizing, int maybe_ATTRS_REPORT,
+ enum logcode code)
{
- char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
+ char fnamebuf[MAXPATHLEN];
STRUCT_STAT st;
- int len, i = 0;
+ int i = 0;
do {
pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname);
continue;
if (S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
+ char lnk[MAXPATHLEN];
+ int len;
if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
lnk[len] = '\0';
if (strcmp(lnk, file->u.link) != 0)
#endif
continue;
- } else {
+ } 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);
+ exit_cleanup(RERR_UNSUPPORTED);
}
- if (link_dest) {
+ 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
+ ) {
if (do_link(fnamebuf, fname) < 0) {
- /* TODO improve this to be based on errno? */
- *possible_ptr = 0;
+ rsyserr(FERROR, errno,
+ "failed to hard-link %s with %s",
+ fnamebuf, fname);
break;
}
if (preserve_hard_links && file->link_u.links)
return;
if (!S_ISLNK(st.st_mode))
statret = -1;
- } else if (basis_dir[0] != NULL && can_link_symlinks) {
+ } else if (basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
- &can_link_symlinks,
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;
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
- if (statret != 0
- && (basis_dir[0] != NULL && can_link_devices)) {
+ if (statret != 0 && basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
- &can_link_devices,
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;
int save_ignore_non_existing = ignore_non_existing;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
+ int dir_tweaking = !(list_only || local_name || dry_run);
if (protocol_version >= 29) {
itemizing = 1;
* them. This is then fixed after the transfer is done. */
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
- && !list_only) {
+ && dir_tweaking) {
mode_t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
- if ((need_retouch_dir_perms || need_retouch_dir_times)
- && !list_only && !local_name && !dry_run) {
+ if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) {
int j = 0;
/* Now we need to fix any directory permissions that were
* modified during the transfer and/or re-set any tweaked