Updated the FSF's address to an even newer one.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 518f49e..26970ce 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -1,25 +1,25 @@
-/* -*- 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"
 
@@ -703,9 +703,9 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                         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);
@@ -714,17 +714,34 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                        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) {
                                rsyserr(FERROR, errno,
                                        "failed to hard-link %s with %s",
@@ -959,15 +976,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                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,
@@ -1000,16 +1020,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
        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) {