Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetic changes only
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
34792fc
..
b9bca21
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-20,12
+20,6
@@
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
#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 "~"
#define RSYNC_NAME "rsync"
#define BACKUP_SUFFIX "~"
@@
-61,6
+55,12
@@
#include "config.h"
#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>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@
-75,6
+75,10
@@
#include <stdlib.h>
#endif
#include <stdlib.h>
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@
-140,6
+144,13
@@
#include <sys/select.h>
#endif
#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
#ifdef HAVE_FNMATCH
#include <fnmatch.h>
#else
@@
-152,6
+163,9
@@
#include "lib/getopt.h"
#endif
#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)
#ifndef S_ISLNK
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
@@
-276,17
+290,9
@@
extern int errno;
#define bzero(buf,n) memset(buf,0,n)
#endif
#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
#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
#ifndef HAVE_LCHOWN
#define lchown chown
#endif