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
fixed a bug in test suite that I introduced yesterday
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
af76aac
..
3c5b7dc
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-17,18
+17,22
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define False 0
+#define True 1
+
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
+#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define URL_PREFIX "rsync://"
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
#define URL_PREFIX "rsync://"
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
- i
m
compatible with older versions :-( */
+ i
n
compatible with older versions :-( */
#define CHAR_OFFSET 0
#define CHAR_OFFSET 0
@@
-43,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
19
-#define MIN_PROTOCOL_VERSION 1
1
+#define PROTOCOL_VERSION
23
+#define MIN_PROTOCOL_VERSION 1
5
#define MAX_PROTOCOL_VERSION 30
#define RSYNC_PORT 873
#define MAX_PROTOCOL_VERSION 30
#define RSYNC_PORT 873
@@
-54,14
+58,12
@@
#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (256*1024)
#define IO_BUFFER_SIZE (4092)
#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (256*1024)
#define IO_BUFFER_SIZE (4092)
-#define MAX_READ_BUFFER (1024*1024)
#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 {FERROR=1, FINFO=2, FLOG=3};
#include "errcode.h"
#include "errcode.h"
@@
-269,6
+271,10
@@
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 256
+#endif
+
/* the length of the md4 checksum */
#define MD4_SUM_LENGTH 16
#define SUM_LENGTH 16
/* the length of the md4 checksum */
#define MD4_SUM_LENGTH 16
#define SUM_LENGTH 16
@@
-277,6
+283,10
@@
#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
@@
-331,6
+341,7
@@
struct exclude_struct {
char *orig;
char *pattern;
int regular_exp;
char *orig;
char *pattern;
int regular_exp;
+ int fnmatch_flags;
int include;
int directory;
int local;
int include;
int directory;
int local;
@@
-456,12
+467,16
@@
extern int errno;
#ifndef ACCESSPERMS
#define ACCESSPERMS 0777
#endif
#ifndef ACCESSPERMS
#define ACCESSPERMS 0777
#endif
+/* Initial mask on permissions given to temporary files. Mask off setuid
+ bits and group access because of potential race-condition security
+ holes, and mask other access because mode 707 is bizarre */
+#define INITACCESSPERMS 0700
/* handler for null strings in printf format */
#define NS(s) ((s)?(s):"<NULL>")
/* use magic gcc attributes to catch format errors */
/* handler for null strings in printf format */
#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