Added RSYNC_RSH_IO_ENV.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 21a1988..cf018bb 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -24,6 +24,7 @@
 
 #define BLOCK_SIZE 700
 #define RSYNC_RSH_ENV "RSYNC_RSH"
+#define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
 
 #define RSYNC_NAME "rsync"
 #define RSYNCD_SYSCONF "/etc/rsyncd.conf"
@@ -81,6 +82,9 @@
 #define MAX_MAP_SIZE (256*1024)
 #define IO_BUFFER_SIZE (4092)
 
+#define IOERR_GENERAL  (1<<0) /* For backward compatibility, this must == 1 */
+#define IOERR_VANISHED (1<<1)
+
 #define MAX_ARGS 1000
 
 #define MPLEX_BASE 7
@@ -104,9 +108,7 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 
 #include "config.h"
 
-/* The default RSYNC_RSH is always set in config.h, either to "remsh",
- * "rsh", or otherwise something specified by the user.  HAVE_REMSH
- * controls parameter munging for HP/UX, etc. */
+/* The default RSYNC_RSH is always set in config.h. */
 
 #include <sys/types.h>
 
@@ -429,10 +431,10 @@ struct map_struct {
        OFF_T p_fd_offset;      /* offset of cursor in fd ala lseek     */
 };
 
-#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 */
+#define MATCHFLG_WILD          (1<<0) /* pattern has '*', '[', and/or '?' */
+#define MATCHFLG_WILD2         (1<<1) /* pattern has '**' */
+#define MATCHFLG_WILD2_PREFIX  (1<<2) /* pattern starts with '**' */
+#define MATCHFLG_ABS_PATH      (1<<3) /* path-match on absolute path */
 struct exclude_struct {
        char *pattern;
        int match_flags;
@@ -626,6 +628,10 @@ extern int errno;
 
 #endif
 
+/* Convenient wrappers for malloc and realloc.  Use them. */
+#define new(type) ((type *)malloc(sizeof(type)))
+#define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
+#define realloc_array(ptr, type, num) ((type *)_realloc_array((ptr), sizeof(type), (num)))
 
 /* use magic gcc attributes to catch format errors */
  void rprintf(enum logcode , const char *, ...)