X-Git-Url: http://git.samba.org/samba.git/?p=rsync.git;a=blobdiff_plain;f=rsync.h;h=5091a9e5696a5a8b59f14611e3fb51ccac67d89e;hp=258695f82bd77feb58221ae6e46a4d1301c84e27;hb=1d54358e5207f5f5326dc9e9f362671275c86b22;hpb=d41c7d025c1725b921ef51c70a705a51b5c36332 diff --git a/rsync.h b/rsync.h index 258695f8..5091a9e5 100644 --- a/rsync.h +++ b/rsync.h @@ -1,6 +1,7 @@ /* - Copyright (C) Andrew Tridgell 1996 + Copyright (C) by Andrew Tridgell 1996, 2000 Copyright (C) Paul Mackerras 1996 + Copyright (C) 2001 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #define False 0 #define True 1 @@ -32,7 +34,7 @@ #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is - imcompatible with older versions :-( */ + incompatible with older versions :-( */ #define CHAR_OFFSET 0 @@ -47,8 +49,19 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 19 -#define MIN_PROTOCOL_VERSION 11 +#define PROTOCOL_VERSION 25 + +/* We refuse to interoperate with versions that are not in this range. + * Note that we assume we'll work with later versions: the onus is on + * people writing them to make sure that they don't send us anything + * we won't understand. + * + * There are two possible explanations for the limit at thirty: either + * to allow new major-rev versions that do not interoperate with us, + * and (more likely) so that we can detect an attempt to connect rsync + * to a non-rsync server, which is unlikely to begin by sending a byte + * between 15 and 30. */ +#define MIN_PROTOCOL_VERSION 15 #define MAX_PROTOCOL_VERSION 30 #define RSYNC_PORT 873 @@ -58,14 +71,15 @@ #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 FERROR 1 -#define FINFO 2 -#define FLOG 3 + +/* Log values. I *think* what these mean is: FLOG goes to the server + * logfile; FERROR and FINFO try to end up on the client, with + * different levels of filtering. */ +enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include "errcode.h" @@ -79,12 +93,6 @@ #include -#ifdef HAVE_GETOPT_LONG -#include -#else -#include "lib/getopt.h" -#endif - #ifdef HAVE_UNISTD_H #include #endif @@ -260,9 +268,11 @@ #endif #if HAVE_SHORT_INO_T -#define INO_T uint32 +# define INO_T uint32 +#elif HAVE_INO_T +# define INO_T ino_t #else -#define INO_T ino_t +# define INO_T unsigned #endif #ifndef MIN @@ -307,10 +317,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 string_area *string_area; }; struct sum_buf { @@ -336,9 +356,9 @@ struct map_struct { }; struct exclude_struct { - char *orig; char *pattern; int regular_exp; + int fnmatch_flags; int include; int directory; int local; @@ -371,6 +391,25 @@ static inline int flist_up(struct file_list *flist, int i) #include "proto.h" #include "lib/mdfour.h" + +/* We have replacement versions of these if they're missing. */ +#ifndef HAVE_ASPRINTF +int asprintf(char **ptr, const char *format, ...); +#endif + +#ifndef HAVE_VASPRINTF +int vasprintf(char **ptr, const char *format, va_list ap); +#endif + +#if !defined(HAVE_VSNPRINTF) && !defined(HAVE_C99_VSNPRINTF) +int vsnprintf (char *str, size_t count, const char *fmt, va_list args); +#endif + +#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_VSNPRINTF) +int snprintf(char *str,size_t count,const char *fmt,...); +#endif + + #if !HAVE_STRERROR extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] @@ -458,23 +497,51 @@ extern int errno; #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 + +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK 0x7f000001 +#endif + +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode)) #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):"") /* 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 ; +/* This is just like rprintf, but it also tries to print some + * representation of the error code. Normally errcode = errno. */ +void rsyserr(enum logcode, int, const char *, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 3, 4))) +#endif + ; + #ifdef REPLACE_INET_NTOA #define inet_ntoa rep_inet_ntoa #endif @@ -488,4 +555,11 @@ size_t strlcpy(char *d, const char *s, size_t bufsize); 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__) + + +extern int verbose;