* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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;
} 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
&& !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
#endif
) {
- if (do_link(fnamebuf, fname) < 0) {
+#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",