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
removed spurious error message
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
9e7775c
..
588219f
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-47,8
+47,8
@@
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 2
2
-#define MIN_PROTOCOL_VERSION 1
1
+#define PROTOCOL_VERSION 2
4
+#define MIN_PROTOCOL_VERSION 1
5
#define MAX_PROTOCOL_VERSION 30
#define RSYNC_PORT 873
#define MAX_PROTOCOL_VERSION 30
#define RSYNC_PORT 873
@@
-62,9
+62,8
@@
#define MAX_ARGS 1000
#define MPLEX_BASE 7
#define MAX_ARGS 1000
#define MPLEX_BASE 7
-#define FERROR 1
-#define FINFO 2
-#define FLOG 3
+
+enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3};
#include "errcode.h"
#include "errcode.h"
@@
-284,10
+283,6
@@
#define MAXPATHLEN 1024
#endif
#define MAXPATHLEN 1024
#endif
-#ifndef PIPE_BUF
-#define PIPE_BUF 512
-#endif
-
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
#endif
#ifndef INADDR_NONE
#define INADDR_NONE 0xffffffff
#endif
@@
-310,10
+305,20
@@
struct file_struct {
};
};
+#define ARENA_SIZE (32 * 1024)
+
+struct string_area {
+ char *base;
+ char *end;
+ char *current;
+ struct string_area *next;
+};
+
struct file_list {
int count;
int malloced;
struct file_struct **files;
struct file_list {
int count;
int malloced;
struct file_struct **files;
+ struct string_area *string_area;
};
struct sum_buf {
};
struct sum_buf {
@@
-462,6
+467,15
@@
extern int errno;
#define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG))
#endif
#define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG))
#endif
+/* work out what fcntl flag to use for non-blocking */
+#ifdef O_NONBLOCK
+# define NONBLOCK_FLAG O_NONBLOCK
+#elif defined(SYSV)
+# define NONBLOCK_FLAG O_NDELAY
+#else
+# define NONBLOCK_FLAG FNDELAY
+#endif
+
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
@@
-477,7
+491,7
@@
extern int errno;
#define NS(s) ((s)?(s):"<NULL>")
/* use magic gcc attributes to catch format errors */
#define NS(s) ((s)?(s):"<NULL>")
/* use magic gcc attributes to catch format errors */
- void rprintf(
int
, const char *, ...)
+ void rprintf(
enum logcode
, const char *, ...)
#ifdef __GNUC__
__attribute__ ((format (printf, 2, 3)))
#endif
#ifdef __GNUC__
__attribute__ ((format (printf, 2, 3)))
#endif
@@
-496,4
+510,8
@@
size_t strlcpy(char *d, const char *s, size_t bufsize);
size_t strlcat(char *d, const char *s, size_t bufsize);
#endif
size_t strlcat(char *d, const char *s, size_t bufsize);
#endif
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(stat) ((int)(((stat)>>8)&0xFF))
+#endif
+
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)