Made the types used in the sum_buf and sum_struct structures consistent

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 52b3e70..73ba1d9 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>
 
@@ -124,6 +126,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #include <stdlib.h>
 #endif
 
+#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H))
+#include <malloc.h>
+#endif
+
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -132,10 +138,6 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #include <string.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
@@ -196,10 +198,6 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #include <glob.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-#endif
-
 /* these are needed for the uid/gid mapping code */
 #include <pwd.h>
 #include <grp.h>
@@ -364,6 +362,8 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #define IN_LOOPBACKNET 127
 #endif
 
+#define GID_NONE (gid_t) -1
+
 struct file_struct {
        unsigned flags;
        time_t modtime;
@@ -404,7 +404,7 @@ struct file_list {
 
 struct sum_buf {
        OFF_T offset;           /**< offset in file of this chunk */
-       int len;                /**< length of chunk of file */
+       unsigned int len;       /**< length of chunk of file */
        int i;                  /**< index of this chunk */
        uint32 sum1;            /**< simple checksum */
        char sum2[SUM_LENGTH];  /**< checksum  */
@@ -413,22 +413,30 @@ struct sum_buf {
 struct sum_struct {
        OFF_T flength;          /**< total file length */
        size_t count;           /**< how many chunks */
-       size_t remainder;       /**< flength % block_length */
-       size_t blength;         /**< block_length */
-       size_t s2length;        /**< sum2_length */
+       unsigned int blength;   /**< block_length */
+       unsigned int remainder; /**< flength % block_length */
+       int s2length;           /**< sum2_length */
        struct sum_buf *sums;   /**< points to info for each chunk */
 };
 
 struct map_struct {
-       char *p;
-       int fd,p_size,p_len;
-       OFF_T file_size, p_offset, p_fd_offset;
+       char *p;                /* Window pointer                       */
+       int fd;                 /* File Descriptor                      */
+       int p_size;             /* Window size at allocation            */
+       int p_len;              /* Window size after fill               */
+                               /*    p_size and p_len could be
+                                *    consolodated by using a local
+                                *    variable in map_ptr()             */
+       int status;             /* first errno from read errors         */
+       OFF_T file_size;        /* File size (from stat)                */
+       OFF_T p_offset;         /* Window start                         */
+       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;
@@ -622,6 +630,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 *, ...)