added some more debug info to the "EOF in map_ptr" error message to

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index df60d0a..3ecd812 100644 (file)
--- a/util.c
+++ b/util.c
@@ -31,16 +31,77 @@ int num_waiting(int fd)
   return(len);
 }
 
-char *map_file(int fd,off_t len)
+
+struct map_struct *map_file(int fd,off_t len)
 {
-  char *ret = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0);
+  struct map_struct *ret;
+  ret = (struct map_struct *)malloc(sizeof(*ret));
+  if (!ret) out_of_memory("map_file");
+
+  ret->map = NULL;
+  ret->fd = fd;
+  ret->size = len;
+  ret->p = NULL;
+  ret->p_size = 0;
+  ret->p_offset = 0;
+  ret->p_len = 0;
+
+#ifdef HAVE_MMAP
+  if (len < MAX_MAP_SIZE)
+    ret->map = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0);
+#endif
   return ret;
 }
 
-void unmap_file(char *buf,off_t len)
+char *map_ptr(struct map_struct *map,off_t offset,int len)
 {
-  if (len > 0 && buf)
-    munmap(buf,len);
+  int nread = -2;
+
+  if (map->map)
+    return map->map+offset;
+
+  if (len == 0) 
+    return NULL;
+
+  len = MIN(len,map->size-offset);
+
+  if (offset >= map->p_offset && 
+      offset+len <= map->p_offset+map->p_len) {
+    return (map->p + (offset - map->p_offset));
+  }
+
+  len = MAX(len,CHUNK_SIZE);
+  len = MIN(len,map->size - offset);  
+
+  if (len > map->p_size) {
+    if (map->p) free(map->p);
+    map->p = (char *)malloc(len);
+    if (!map->p) out_of_memory("map_ptr");
+    map->p_size = len;
+  }
+
+  if (lseek(map->fd,offset,SEEK_SET) != offset ||
+      (nread=read(map->fd,map->p,len)) != len) {
+    fprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
+           (int)offset, len, nread, errno);
+    exit_cleanup(1);
+  }
+
+  map->p_offset = offset;
+  map->p_len = len;
+
+  return map->p; 
+}
+
+
+void unmap_file(struct map_struct *map)
+{
+#ifdef HAVE_MMAP
+  if (map->map)
+    munmap(map->map,map->size);
+#endif
+  if (map->p) free(map->p);
+  free(map);
 }
 
 
@@ -53,15 +114,15 @@ int piped_child(char **command,int *f_in,int *f_out)
 
   if (pipe(to_child_pipe) < 0 ||
       pipe(from_child_pipe) < 0) {
-    fprintf(stderr,"pipe: %s\n",strerror(errno));
-    exit(1);
+    fprintf(FERROR,"pipe: %s\n",strerror(errno));
+    exit_cleanup(1);
   }
 
 
   pid = fork();
   if (pid < 0) {
-    fprintf(stderr,"fork: %s\n",strerror(errno));
-    exit(1);
+    fprintf(FERROR,"fork: %s\n",strerror(errno));
+    exit_cleanup(1);
   }
 
   if (pid == 0)
@@ -70,19 +131,21 @@ int piped_child(char **command,int *f_in,int *f_out)
          close(to_child_pipe[1]) < 0 ||
          close(from_child_pipe[0]) < 0 ||
          dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
-       fprintf(stderr,"Failed to dup/close : %s\n",strerror(errno));
-       exit(1);
+       fprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno));
+       exit_cleanup(1);
       }
+      if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]);
+      if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]);
       execvp(command[0], command);
-      fprintf(stderr,"Failed to exec %s : %s\n",
+      fprintf(FERROR,"Failed to exec %s : %s\n",
              command[0],strerror(errno));
-      exit(1);
+      exit_cleanup(1);
     }
 
   if (close(from_child_pipe[1]) < 0 ||
       close(to_child_pipe[0]) < 0) {
-    fprintf(stderr,"Failed to close : %s\n",strerror(errno));   
-    exit(1);
+    fprintf(FERROR,"Failed to close : %s\n",strerror(errno));   
+    exit_cleanup(1);
   }
 
   *f_in = from_child_pipe[0];
@@ -94,8 +157,8 @@ int piped_child(char **command,int *f_in,int *f_out)
 
 void out_of_memory(char *str)
 {
-  fprintf(stderr,"out of memory in %s\n",str);
-  exit(1);
+  fprintf(FERROR,"out of memory in %s\n",str);
+  exit_cleanup(1);
 }