In clean_flist(), if a duplicate is found for a dir and a non-dir,

[rsync/rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index f498547..4a31970 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -72,7 +72,7 @@ int do_lchown(const char *path, uid_t owner, gid_t group)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-#ifdef HAVE_LCHOWN
+#if !HAVE_LCHOWN
 #define lchown chown
 #endif
        return lchown(path, owner, group);
@@ -212,27 +212,29 @@ int do_mkstemp(char *template, mode_t perms)
 
 int do_stat(const char *fname, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#if USE_STAT64_FUNCS
        return stat64(fname, st);
 #else
        return stat(fname, st);
 #endif
 }
 
-#if SUPPORT_LINKS
 int do_lstat(const char *fname, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#if SUPPORT_LINKS
+# if USE_STAT64_FUNCS
        return lstat64(fname, st);
-#else
+# else
        return lstat(fname, st);
+# endif
+#else
+       return do_stat(fname, st);
 #endif
 }
-#endif
 
 int do_fstat(int fd, STRUCT_STAT *st)
 {
-#if HAVE_OFF64_T
+#if USE_STAT64_FUNCS
        return fstat64(fd, st);
 #else
        return fstat(fd, st);
@@ -241,7 +243,7 @@ int do_fstat(int fd, STRUCT_STAT *st)
 
 OFF_T do_lseek(int fd, OFF_T offset, int whence)
 {
-#if HAVE_OFF64_T
+#if SIZEOF_OFF64_T
        off64_t lseek64();
        return lseek64(fd, offset, whence);
 #else
@@ -249,17 +251,6 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
 #endif
 }
 
-#ifdef USE_MMAP
-void *do_mmap(void *start, int len, int prot, int flags, int fd, OFF_T offset)
-{
-#if HAVE_OFF64_T
-       return mmap64(start, len, prot, flags, fd, offset);
-#else
-       return mmap(start, len, prot, flags, fd, offset);
-#endif
-}
-#endif
-
 char *d_name(struct dirent *di)
 {
 #if HAVE_BROKEN_READDIR