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
some large systematic changes to make socket conversion easier. The
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
3418b81
..
e520640
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-43,6
+43,8
@@
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
#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)
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
@@
-50,8
+52,8
@@
#define BLOCKING_TIMEOUT 10
#define BLOCKING_TIMEOUT 10
-#define FERROR
stderr
-#define FINFO
(am_server?stderr:stdout)
+#define FERROR
1
+#define FINFO
2
#include "config.h"
#include "config.h"
@@
-167,6
+169,8
@@
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
+#include <stdarg.h>
+
#ifndef S_IFLNK
#define S_IFLNK 0120000
#endif
#ifndef S_IFLNK
#define S_IFLNK 0120000
#endif
@@
-290,6
+294,20
@@
static inline int flist_up(struct file_list *flist, int i)
return 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"
#include "byteorder.h"
#include "version.h"
@@
-306,21
+324,6
@@
extern char *sys_errlist[];
# define strrchr rindex
#endif
# 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
#ifndef HAVE_ERRNO_DECL
extern int errno;
#endif