View | Details | Raw Unified
Collapse All | Expand All

(-) mc-4.6.0-gentoo/src/view.c (-1 / +10 lines)
 Lines 81-86    Link Here 
#define vwidth (view->widget.cols - (view->have_frame ? 2 : 0))
#define vwidth (view->widget.cols - (view->have_frame ? 2 : 0))
#define vheight (view->widget.lines - (view->have_frame ? 2 : 0))
#define vheight (view->widget.lines - (view->have_frame ? 2 : 0))
#if GLIB_MAJOR_VERSION >= 2
#  define my_g_malloc g_try_malloc
#else
#  define my_g_malloc g_malloc
#endif
/* The growing buffers data types */
/* The growing buffers data types */
typedef struct block_ptr_t {
typedef struct block_ptr_t {
    unsigned char *data;
    unsigned char *data;
 Lines 580-586    Link Here 
    view->data =
    view->data =
	mc_mmap (0, view->s.st_size, PROT_READ, MAP_FILE | MAP_SHARED,
	mc_mmap (0, view->s.st_size, PROT_READ, MAP_FILE | MAP_SHARED,
		 view->file, 0);
		 view->file, 0);
    if ((caddr_t) view->data != (caddr_t) - 1) {
    if (view->data != (void *)-1) {
	/* mmap worked */
	/* mmap worked */
	view->first = 0;
	view->first = 0;
	view->bytes_read = view->s.st_size;
	view->bytes_read = view->s.st_size;
 Lines 593-598    Link Here 
     * file into memory (alex@bcs.zaporizhzhe.ua). Also, mmap can fail
     * file into memory (alex@bcs.zaporizhzhe.ua). Also, mmap can fail
     * for any reason, so we use this as fallback (pavel@ucw.cz) */
     * for any reason, so we use this as fallback (pavel@ucw.cz) */
    /* If large file support is enabled, st_size is a 64 bit value and
     * will thus on 32 bit platforms possibly be beyond the range of gulong */
    if ((gulong) view->s.st_size == view->s.st_size)
    if ((gulong) view->s.st_size == view->s.st_size)
      view->data = (unsigned char *) g_try_malloc (view->s.st_size);
      view->data = (unsigned char *) g_try_malloc (view->s.st_size);
    else
    else
(-) mc-4.6.0-gentoo/vfs/local.c (-3 / +3 lines)
 Lines 282-289    Link Here 
}
}
#ifdef HAVE_MMAP
#ifdef HAVE_MMAP
caddr_t
void *
local_mmap (vfs *me, caddr_t addr, size_t len, int prot, int flags, void *data, off_t offset)
local_mmap (vfs *me, void *addr, size_t len, int prot, int flags, void *data, off_t offset)
{
{
    int fd = * (int *)data;
    int fd = * (int *)data;
 Lines 291-297    Link Here 
}
}
int
int
local_munmap (vfs *me, caddr_t addr, size_t len, void *data)
local_munmap (vfs *me, void *addr, size_t len, void *data)
{
{
    return munmap (addr, len);
    return munmap (addr, len);
}
}
(-) mc-4.6.0-gentoo/vfs/local.h (-2 / +2 lines)
 Lines 7-14    Link Here 
extern int local_errno (vfs *me);
extern int local_errno (vfs *me);
extern int local_lseek (void *data, off_t offset, int whence);
extern int local_lseek (void *data, off_t offset, int whence);
#ifdef HAVE_MMAP
#ifdef HAVE_MMAP
extern caddr_t local_mmap (vfs *me, caddr_t addr, size_t len, int prot, int flags, void *data, off_t offset);
extern void *local_mmap (vfs *me, void *addr, size_t len, int prot, int flags, void *data, off_t offset);
extern int local_munmap (vfs *me, caddr_t addr, size_t len, void *data);
extern int local_munmap (vfs *me, void *addr, size_t len, void *data);
#endif
#endif
#endif
#endif
(-) mc-4.6.0-gentoo/vfs/samba/lib/util.c (-1 / +1 lines)
 Lines 1830-1836    Link Here 
	
	
  /* Look up the host address in the address list we just got. */
  /* Look up the host address in the address list we just got. */
  for (i = 0; hp->h_addr_list[i]; i++) {
  for (i = 0; hp->h_addr_list[i]; i++) {
    if (memcmp(hp->h_addr_list[i], (caddr_t) & addr, sizeof(addr)) == 0)
    if (memcmp(hp->h_addr_list[i], &addr, sizeof(addr)) == 0)
      return True;
      return True;
  }
  }
(-) mc-4.6.0-gentoo/vfs/vfs.c (-9 / +9 lines)
 Lines 995-1021    Link Here 
#ifdef HAVE_MMAP
#ifdef HAVE_MMAP
static struct mc_mmapping {
static struct mc_mmapping {
    caddr_t addr;
    void *addr;
    void *vfs_info;
    void *vfs_info;
    vfs *vfs;
    vfs *vfs;
    struct mc_mmapping *next;
    struct mc_mmapping *next;
} *mc_mmaparray = NULL;
} *mc_mmaparray = NULL;
caddr_t
void *
mc_mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
mc_mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
{
{
    vfs *vfs;
    vfs *vfs;
    caddr_t result;
    void *result;
    struct mc_mmapping *mcm;
    struct mc_mmapping *mcm;
    if (fd == -1)
    if (fd == -1)
	return (caddr_t) -1;
	return (void *)-1;
    
    
    vfs = vfs_op (fd);
    vfs = vfs_op (fd);
    result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info (fd), offset) : (caddr_t)-1;
    result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info (fd), offset) : (void *)-1;
    if (result == (caddr_t)-1){
    if (result == (void *)-1){
	errno = ferrno (vfs);
	errno = ferrno (vfs);
	return (caddr_t)-1;
	return (void *)-1;
    }
    }
    mcm =g_new (struct mc_mmapping, 1);
    mcm =g_new (struct mc_mmapping, 1);
    mcm->addr = result;
    mcm->addr = result;
 Lines 1027-1033    Link Here 
}
}
int
int
mc_munmap (caddr_t addr, size_t len)
mc_munmap (void *addr, size_t len)
{
{
    struct mc_mmapping *mcm, *mcm2 = NULL;
    struct mc_mmapping *mcm, *mcm2 = NULL;
    
    
(-) mc-4.6.0-gentoo/vfs/vfs.h (-5 / +5 lines)
 Lines 88-96    Link Here 
	int  (*ctl)            (void *vfs_info, int ctlop, int arg);
	int  (*ctl)            (void *vfs_info, int ctlop, int arg);
	int  (*setctl)         (vfs *me, char *path, int ctlop, char *arg);
	int  (*setctl)         (vfs *me, char *path, int ctlop, char *arg);
#ifdef HAVE_MMAP
#ifdef HAVE_MMAP
	caddr_t (*mmap)        (vfs *me, caddr_t addr, size_t len, int prot,
	void *(*mmap)          (vfs *me, void *addr, size_t len, int prot,
				int flags, void *vfs_info, off_t offset);
				int flags, void *vfs_info, off_t offset);
	int (*munmap)          (vfs *me, caddr_t addr, size_t len,
	int (*munmap)          (vfs *me, void *addr, size_t len,
				void *vfs_info);
				void *vfs_info);
#endif	
#endif	
    };
    };
 Lines 208-216    Link Here 
        int mc_ctl (int fd, int ctlop, int arg);
        int mc_ctl (int fd, int ctlop, int arg);
        int mc_setctl (char *path, int ctlop, char *arg);
        int mc_setctl (char *path, int ctlop, char *arg);
#ifdef HAVE_MMAP
#ifdef HAVE_MMAP
	caddr_t mc_mmap (caddr_t, size_t, int, int, int, off_t);
	void *mc_mmap (void *, size_t, int, int, int, off_t);
	int mc_unmap (caddr_t, size_t);
	int mc_unmap (void *, size_t);
        int mc_munmap (caddr_t addr, size_t len);
        int mc_munmap (void *addr, size_t len);
#endif /* HAVE_MMAP */
#endif /* HAVE_MMAP */
#else
#else