preparing for release of 2.0.14

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index f54acd2..6470bf9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,131 +32,6 @@ 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 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;
-}
-
-
-char *map_ptr(struct map_struct *map,OFF_T offset,int len)
-{
-       int nread;
-
-       if (len == 0) 
-               return NULL;
-
-       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);
-               }
-
-               /* 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
-
-       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);
-       if (len > (map->size-offset))
-               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;
-       }
-
-       map->p_offset = offset;
-       map->p_len = len;
-
-       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 USE_MMAP
-       if (map->map) {
-               munmap(map->map,map->p_len);
-               map->map = NULL;
-       }
-#endif
-       if (map->p) {
-               free(map->p);
-               map->p = NULL;
-       }
-       memset(map, 0, sizeof(*map));
-       free(map);
-}
-
 
 /* this is taken from CVS */
 int piped_child(char **command,int *f_in,int *f_out)
@@ -302,36 +177,6 @@ int set_modtime(char *fname,time_t modtime)
 }
 
 
-
-/****************************************************************************
-Set a fd into blocking/nonblocking mode. Uses POSIX O_NONBLOCK if available,
-else
-if SYSV use O_NDELAY
-if BSD use FNDELAY
-****************************************************************************/
-int set_blocking(int fd, int set)
-{
-  int val;
-#ifdef O_NONBLOCK
-#define FLAG_TO_SET O_NONBLOCK
-#else
-#ifdef SYSV
-#define FLAG_TO_SET O_NDELAY
-#else /* BSD */
-#define FLAG_TO_SET FNDELAY
-#endif
-#endif
-
-  if((val = fcntl(fd, F_GETFL, 0)) == -1)
-       return -1;
-  if(set) /* Turn blocking on - ie. clear nonblock flag */
-       val &= ~FLAG_TO_SET;
-  else
-    val |= FLAG_TO_SET;
-  return fcntl( fd, F_SETFL, val);
-#undef FLAG_TO_SET
-}
-
 /****************************************************************************
 create any necessary directories in fname. Unfortunately we don't know
 what perms to give the directory when this is called so we need to rely
@@ -708,3 +553,9 @@ int slprintf(char *str, int n, char *format, ...)
        return ret;
 }
 
+
+void *Realloc(void *p, int size)
+{
+       if (!p) return (void *)malloc(size);
+       return (void *)realloc(p, size);
+}