X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/195bd906a2bacbce7455405180bfecf60819a60d..1c8162a921cbae803b3bf375fda4aa7916bcfc68:/rsync.h

diff --git a/rsync.h b/rsync.h
index e3cbe570..83919915 100644
--- a/rsync.h
+++ b/rsync.h
@@ -85,6 +85,16 @@
 
 #define MPLEX_BASE 7
 
+#define NO_EXCLUDES	0
+#define SERVER_EXCLUDES	1
+#define ALL_EXCLUDES	2
+
+#define MISSING_OK    0
+#define MISSING_FATAL 1
+
+#define ADD_INCLUDE 1
+#define ADD_EXCLUDE 0
+
 /* 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. */
@@ -421,13 +431,16 @@ struct map_struct {
 	OFF_T file_size, p_offset, p_fd_offset;
 };
 
+#define MATCHFLG_WILD		0x0001 /* pattern has '*', '[', and/or '?' */
+#define MATCHFLG_WILD2		0x0002 /* pattern has '**' */
+#define MATCHFLG_WILD2_PREFIX	0x0004 /* pattern starts with '**' */
+#define MATCHFLG_ABS_PATH	0x0008 /* path-match on absolute path */
 struct exclude_struct {
 	char *pattern;
-	int regular_exp;
-	int fnmatch_flags;
+	int match_flags;
 	int include;
 	int directory;
-	int local;
+	int slash_cnt;
 };
 
 struct stats {
@@ -468,11 +481,13 @@ int asprintf(char **ptr, const char *format, ...);
 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);
+#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define vsnprintf rsync_vsnprintf
+int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 #endif
 
-#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_VSNPRINTF)
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define snprintf rsync_snprintf
 int snprintf(char *str,size_t count,const char *fmt,...);
 #endif