X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/38b02c13d0173fc4a1ee67d67ceefc7107eefdc0..b11b50bcd026a0a052bdfab7b96c97045b658d86:/rsync.h

diff --git a/rsync.h b/rsync.h
index 47943f30..21a19884 100644
--- a/rsync.h
+++ b/rsync.h
@@ -122,10 +122,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#else
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
 #endif
+
+#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H))
+#include <malloc.h>
 #endif
 
 #ifdef HAVE_SYS_SOCKET_H
@@ -196,10 +196,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>
@@ -420,9 +416,17 @@ struct sum_struct {
 };
 
 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 '?' */