X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e42c9458c2f1e3a78d6d45e99741d6edb38fc0cc..2b6b4d539b0aab98b1cbb9d8c639cb12473aae94:/util.c diff --git a/util.c b/util.c index cc39cdb4..f54acd2c 100644 --- a/util.c +++ b/util.c @@ -34,81 +34,127 @@ int num_waiting(int fd) struct map_struct *map_file(int fd,OFF_T len) { - 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); - if (ret->map == (char *)-1) { - ret->map = NULL; - } - } + 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 USE_MMAP + len = MIN(len, MAX_MAP_SIZE); + ret->map = (char *)do_mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0); + if (ret->map == (char *)-1) { + ret->map = NULL; + } else { + ret->p_len = len; + } #endif - return ret; + return ret; } char *map_ptr(struct map_struct *map,OFF_T offset,int len) { - int nread = -2; + int nread; - if (map->map) - return map->map+offset; + if (len == 0) + return NULL; - if (len == 0) - return NULL; + if (len > (map->size-offset)) + len = map->size-offset; - if (len > (map->size-offset)) - len = map->size-offset; +#ifdef USE_MMAP + if (map->map) { + if (offset >= map->p_offset && + offset+len <= map->p_offset+map->p_len) { + return (map->map + (offset - map->p_offset)); + } + if (munmap(map->map, map->p_len) != 0) { + rprintf(FERROR,"munmap failed : %s\n", strerror(errno)); + exit_cleanup(1); + } - if (offset >= map->p_offset && - offset+len <= map->p_offset+map->p_len) { - return (map->p + (offset - map->p_offset)); - } + /* align the mmap region on a nice boundary back a bit from + where it is asked for to allow for some seeking */ + if (offset > 2*CHUNK_SIZE) { + map->p_offset = offset - 2*CHUNK_SIZE; + map->p_offset &= ~((OFF_T)(CHUNK_SIZE-1)); + } else { + map->p_offset = 0; + } + + /* map up to MAX_MAP_SIZE */ + map->p_len = MAX(len, MAX_MAP_SIZE); + map->p_len = MIN(map->p_len, map->size - map->p_offset); + + map->map = (char *)do_mmap(NULL,map->p_len,PROT_READ, + MAP_SHARED,map->fd,map->p_offset); + + if (map->map == (char *)-1) { + map->map = NULL; + map->p_len = 0; + map->p_offset = 0; + } else { + return (map->map + (offset - map->p_offset)); + } + } +#endif - len = MAX(len,CHUNK_SIZE); - if (len > (map->size-offset)) - len = map->size-offset; + if (offset >= map->p_offset && + offset+len <= map->p_offset+map->p_len) { + return (map->p + (offset - map->p_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; - } + len = MAX(len,CHUNK_SIZE); + if (len > (map->size-offset)) + len = map->size-offset; - if (do_lseek(map->fd,offset,SEEK_SET) != offset || - (nread=read(map->fd,map->p,len)) != len) { - rprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n", - (int)offset, len, nread, errno); - exit_cleanup(1); - } + 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; + } - map->p_offset = offset; - map->p_len = len; + map->p_offset = offset; + map->p_len = len; - return map->p; + if (do_lseek(map->fd,offset,SEEK_SET) != offset) { + rprintf(FERROR,"lseek failed in map_ptr\n"); + exit_cleanup(1); + } + + if ((nread=read(map->fd,map->p,len)) != len) { + if (nread < 0) nread = 0; + /* the best we can do is zero the buffer - the file + has changed mid transfer! */ + memset(map->p+nread, 0, len - nread); + } + + return map->p; } void unmap_file(struct map_struct *map) { -#ifdef HAVE_MMAP - if (map->map) - munmap(map->map,map->size); +#ifdef USE_MMAP + if (map->map) { + munmap(map->map,map->p_len); + map->map = NULL; + } #endif - if (map->p) free(map->p); - free(map); + if (map->p) { + free(map->p); + map->p = NULL; + } + memset(map, 0, sizeof(*map)); + free(map); } @@ -553,10 +599,11 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs) #endif } -void glob_expand(char *base, char **argv, int *argc, int maxargs) +void glob_expand(char *base1, char **argv, int *argc, int maxargs) { char *s = argv[*argc]; char *p, *q; + char *base = base1; if (!s || !*s) return; @@ -567,21 +614,23 @@ void glob_expand(char *base, char **argv, int *argc, int maxargs) s = strdup(s); if (!s) out_of_memory("glob_expand"); + base = (char *)malloc(strlen(base1)+3); + if (!base) out_of_memory("glob_expand"); + + sprintf(base," %s/", base1); + q = s; while ((p = strstr(q,base)) && ((*argc) < maxargs)) { - if (p != q && *(p-1) == ' ' && p[strlen(base)] == '/') { - /* split it at this point */ - *(p-1) = 0; - glob_expand_one(q, argv, argc, maxargs); - q = p+strlen(base)+1; - } else { - q++; - } + /* split it at this point */ + *p = 0; + glob_expand_one(q, argv, argc, maxargs); + q = p+strlen(base); } if (*q && (*argc < maxargs)) glob_expand_one(q, argv, argc, maxargs); free(s); + free(base); } /******************************************************************* @@ -628,26 +677,19 @@ int vslprintf(char *str, int n, const char *format, va_list ap) buf = malloc(len); if (!buf) { /* can't call debug or we would recurse */ - exit(1); + exit_cleanup(1); } } - ret = vsprintf(buf, format, ap); - - if (ret < 0) { - str[0] = 0; - return -1; - } - - if (ret < n) { - n = ret; - } else if (ret > n) { - ret = -1; + vsprintf(buf, format, ap); + ret = strlen(buf); + if (ret > n) { + /* yikes! */ + exit_cleanup(1); } - - buf[n] = 0; + buf[ret] = 0; - memcpy(str, buf, n+1); + memcpy(str, buf, ret+1); return ret; #endif @@ -665,3 +707,4 @@ int slprintf(char *str, int n, char *format, ...) va_end(ap); return ret; } +