X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3bee67337d0491f55654cf8e926592365e5a8502..9486289ce452ab82ca8b3f16fae8c2ef5247a923:/rsync.h

diff --git a/rsync.h b/rsync.h
index 6034952c..e5206409 100644
--- a/rsync.h
+++ b/rsync.h
@@ -43,6 +43,8 @@
 #define MIN_PROTOCOL_VERSION 11
 #define MAX_PROTOCOL_VERSION 30
 
+#define RSYNC_PORT 873
+
 #define SPARSE_WRITE_SIZE (1024)
 #define WRITE_SIZE (32*1024)
 #define CHUNK_SIZE (32*1024)
@@ -50,8 +52,8 @@
 
 #define BLOCKING_TIMEOUT 10
 
-#define FERROR stderr
-#define FINFO (am_server?stderr:stdout)
+#define FERROR 1
+#define FINFO 2
 
 #include "config.h"
 
@@ -167,6 +169,8 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include <stdarg.h>
+
 #ifndef S_IFLNK
 #define S_IFLNK  0120000
 #endif
@@ -179,6 +183,12 @@
 #define uchar unsigned char
 #endif
 
+#if HAVE_UNSIGNED_CHAR
+#define schar signed char
+#else
+#define schar char
+#endif
+
 #ifndef int32
 #if (SIZEOF_INT == 4)
 #define int32 int
@@ -193,7 +203,17 @@
 #define uint32 unsigned int32
 #endif
 
-#if (SIZEOF_LONG == 8) 
+#if HAVE_OFF64_T
+#define OFF_T off64_t
+#define STRUCT_STAT struct stat64
+#else
+#define OFF_T off_t
+#define STRUCT_STAT struct stat
+#endif
+
+#if HAVE_OFF64_T
+#define int64 off64_t
+#elif (SIZEOF_LONG == 8) 
 #define int64 long
 #elif (SIZEOF_INT == 8) 
 #define int64 int
@@ -223,7 +243,7 @@
 struct file_struct {
 	unsigned flags;
 	time_t modtime;
-	off_t length;
+	OFF_T length;
 	mode_t mode;
 	ino_t inode;
 	dev_t dev;
@@ -244,7 +264,7 @@ struct file_list {
 };
 
 struct sum_buf {
-  off_t offset;			/* offset in file of this chunk */
+  OFF_T offset;			/* offset in file of this chunk */
   int len;			/* length of chunk of file */
   int i;			/* index of this chunk */
   uint32 sum1;	                /* simple checksum */
@@ -252,7 +272,7 @@ struct sum_buf {
 };
 
 struct sum_struct {
-  off_t flength;		/* total file length */
+  OFF_T flength;		/* total file length */
   int count;			/* how many chunks */
   int remainder;		/* flength % block_length */
   int n;			/* block_length */
@@ -262,7 +282,7 @@ struct sum_struct {
 struct map_struct {
 	char *map,*p;
 	int fd,p_size,p_len;
-	off_t size, p_offset;
+	OFF_T size, p_offset;
 };
 
 /* we need this function because of the silly way in which duplicate
@@ -274,6 +294,20 @@ static inline int flist_up(struct file_list *flist, int i)
 	return i;
 }
 
+#if HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
 
 #include "byteorder.h"
 #include "version.h"
@@ -290,21 +324,6 @@ extern char *sys_errlist[];
 # define strrchr                rindex
 #endif
 
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
 #ifndef HAVE_ERRNO_DECL
 extern int errno;
 #endif