handle things more grecefully when one machine supports hard links and

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 6e7210c..5759ef2 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -20,12 +20,6 @@
 #define BLOCK_SIZE 700
 #define RSYNC_RSH_ENV "RSYNC_RSH"
 
-#if HAVE_REMSH
-#define RSYNC_RSH "remsh"
-#else
-#define RSYNC_RSH "rsh"
-#endif
-
 #define RSYNC_NAME "rsync"
 #define BACKUP_SUFFIX "~"
 
@@ -61,6 +55,12 @@
 
 #include "config.h"
 
+#if HAVE_REMSH
+#define RSYNC_RSH "remsh"
+#else
+#define RSYNC_RSH "rsh"
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -75,6 +75,10 @@
 #include <stdlib.h>
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -136,6 +140,17 @@
 #include <utime.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_SYS_MODE_H
+/* apparently AIX needs this for S_ISLNK */
+#ifndef S_ISLNK
+#include <sys/mode.h>
+#endif
+#endif
+
 #ifdef HAVE_FNMATCH
 #include <fnmatch.h>
 #else
@@ -148,6 +163,9 @@
 #include "lib/getopt.h"
 #endif
 
+#ifndef S_IFLNK
+#define S_IFLNK  0120000
+#endif
 
 #ifndef S_ISLNK
 #define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
@@ -272,17 +290,17 @@ extern int errno;
 #define bzero(buf,n) memset(buf,0,n)
 #endif
 
-#define SUPPORT_LINKS (HAVE_READLINK && defined(S_ISLNK))
+#define SUPPORT_LINKS HAVE_READLINK
 #define SUPPORT_HARD_LINKS HAVE_LINK
 
-#ifndef S_ISLNK
-#define S_ISLNK(x) 0
-#endif
-
 #if !SUPPORT_LINKS
 #define lstat stat
 #endif
 
+#ifndef HAVE_LCHOWN
+#define lchown chown
+#endif
+
 #define SIGNAL_CAST (RETSIGTYPE (*)())
 
 #ifndef EWOULDBLOCK