X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/720b47f2611d277684b2ec35d11dc3feedb207fe..70d794dce9ba8fbf978185ea36f2ad4198b269ee:/util.c diff --git a/util.c b/util.c index df60d0a0..f9985ef2 100644 --- a/util.c +++ b/util.c @@ -31,16 +31,73 @@ int num_waiting(int fd) return(len); } +static int map_fd = -1; +static off_t map_size = 0; +static char *p = NULL; +static int p_size = 0; +static int p_offset = 0; +static int p_len = 0; + + char *map_file(int fd,off_t len) { - char *ret = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0); + char *ret = NULL; +#ifdef HAVE_MMAP + if (len < MAX_MAP_SIZE) + ret = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0); +#endif + map_fd = fd; + map_size = len; return ret; } +char *map_ptr(char *buf,off_t offset,int len) +{ + if (buf) + return buf+offset; + + if (len == 0) + return NULL; + + len = MIN(len,map_size-offset); + + if (offset >= p_offset && + offset+len <= p_offset+p_len) { + return (p + (offset - p_offset)); + } + + len = MAX(len,CHUNK_SIZE); + len = MIN(len,map_size - offset); + + if (len > p_size) { + if (p) free(p); + p = (char *)malloc(len); + if (!p) out_of_memory("map_ptr"); + p_size = len; + } + + if (lseek(map_fd,offset,SEEK_SET) != offset || + read(map_fd,p,len) != len) { + fprintf(FERROR,"EOF in map_ptr!\n"); + exit_cleanup(1); + } + + p_offset = offset; + p_len = len; + + return p; +} + + void unmap_file(char *buf,off_t len) { +#ifdef HAVE_MMAP if (len > 0 && buf) munmap(buf,len); +#endif + map_fd = -1; + map_size = 0; + p_len = 0; } @@ -53,15 +110,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 +127,19 @@ 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); } 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 +151,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); }