COMP/CMSDIST/dcap-macosx-workarounds.patch

diff --git a/Makefile b/Makefile
index c9ee4ca..0bf0bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,9 @@ all $(TARGET):
                CYGWIN*) \
                        $(MAKE) -f Makefile.w32 $@ ;\
                        ;; \
+               Darwin) \
+                       $(MAKE) -f Makefile.darwin $@ ;\
+                       ;; \
                *) \
                        echo "Don't know your machine type" \
                        echo "Have a look in Porting file" \
diff --git a/dc_hack.h b/dc_hack.h
index f1e95d4..547d5a3 100644
--- a/dc_hack.h
+++ b/dc_hack.h
@@ -40,6 +40,17 @@
 #define access     dc_access
 #define unlink     dc_unlink
 
+#ifdef __APPLE__
+#define lseek    dc_lseek64
+#define stat     dc_stat64
+#define lstat    dc_lstat64
+#define fstat    dc_fstat64
+#define readdir  dc_readdir64
+#define ftello   dc_ftello64
+#define fseeko   dc_fseeko64
+#define pread    dc_pread64
+#define pwrite   dc_pwrite64
+#else
 #define lseek64    dc_lseek64
 #define stat64     dc_stat64
 #define lstat64    dc_lstat64
@@ -49,7 +60,7 @@
 #define fseeko64   dc_fseeko64
 #define pread64    dc_pread64
 #define pwrite64   dc_pwrite64
-
+#endif
 #define lseek      dc_lseek
 #define stat       dc_stat
 #define lstat      dc_lstat
diff --git a/dcap_dirent.c b/dcap_dirent.c
index 5055f92..bcc35d5 100644
--- a/dcap_dirent.c
+++ b/dcap_dirent.c
@@ -18,18 +18,23 @@
 
 #include "dcap_shared.h"
 #include <sys/types.h>
+#ifdef __APPLE__
+#include <sys/dir.h>
+#endif
 #include <dirent.h>
 
 #define RD_SEPARATOR ':'
 
+#ifdef __APPLE__
+#define dirent64 dirent
+#endif
+
 ssize_t dc_real_read( struct vsp_node *node, void *buff, size_t buflen);
 struct dirent64 *dc_readdir64( DIR *dir);
 int char2dirent64(const char *, struct dirent64 *);
 int char2dirent(const char *, struct dirent *);
 
-
 #ifdef linux
-
 struct __dirstream   {
     int fd;         /* File descriptor.  */
                                                                                 
@@ -54,6 +59,11 @@ struct __dirstream   {
 
 #endif
 
+#ifdef __APPLE__
+#define DIRENT_FD(x) x->__dd_fd
+#define DIRENT_DATA(x) x->__dd_buf
+#endif
+
 
 DIR * dc_opendir(const char *path)
 {
@@ -134,7 +144,10 @@ DIR * dc_opendir(const char *path)
 
 struct dirent *dc_readdir( DIR *dir)
 {
-
+#ifdef __APPLE__
+       abort();
+       return 0;
+#else
        static struct dirent ent;
        struct dirent64 *ep;
        
@@ -145,16 +158,14 @@ struct dirent *dc_readdir( DIR *dir)
        }
                        
        memcpy(ent.d_name, ep->d_name, 256);
-#ifdef linux   
+#ifdef linux 
        ent.d_type = ep->d_type;
 #endif
        ent.d_reclen = ep->d_reclen;
-       ent.d_off = (off_t)ep->d_off;
        ent.d_ino = (ino_t)ep->d_ino;
        
        return &ent;    
-       
-
+#endif
 }
 
 struct dirent64 *dc_readdir64( DIR *dir)
diff --git a/dcap_open.c b/dcap_open.c
index 93bbe9e..1fb363e 100644
--- a/dcap_open.c
+++ b/dcap_open.c
@@ -16,6 +16,7 @@
  */
 
 #include "dcap_shared.h"
+#include <stdio.h>
 
 
 #define DC_STAGE (O_RDONLY | O_NONBLOCK)
@@ -47,6 +48,8 @@ dc_open(const char *fname, int flags,...)
        int tmpIndex;
 #ifdef WIN32
        struct _stati64 sbuf;
+#elif defined(__APPLE__)
+       struct stat sbuf;
 #else
        struct stat64 sbuf;
 #endif
@@ -68,7 +71,7 @@ dc_open(const char *fname, int flags,...)
                
        if (flags & O_CREAT) {
                va_start(args, flags);
-               mode = va_arg(args, mode_t);
+               mode = va_arg(args, int);
                va_end(args);
                isTrunc = ( (flags & O_TRUNC) == O_TRUNC );
        }
@@ -103,7 +106,9 @@ dc_open(const char *fname, int flags,...)
                                                                 * with Disk Cache */
                                free(path);                              
                                dc_debug(DC_INFO, "Using system native open for %s.", fname);           
+#ifndef __APPLE__
                            flags |= O_LARGEFILE ;
+#endif
                                return system_open(fname, flags, mode);
                }
        
@@ -190,7 +195,10 @@ dc_open(const char *fname, int flags,...)
         * dCache always has LARGE FILE SUPPORT,
         * remove extra flag, while it makes trouble in ascii open
         */
-       node->flags =  flags & ~O_LARGEFILE;
+       node->flags =  flags;
+#ifndef __APPLE__
+       node->flags &= ~O_LARGEFILE;
+#endif
        node->mode = mode;
        
        if(url == NULL) {
diff --git a/dcap_poll.c b/dcap_poll.c
index e2148cf..7bdc04f 100644
--- a/dcap_poll.c
+++ b/dcap_poll.c
@@ -21,7 +21,9 @@
 #include <sys/types.h>
 #ifndef WIN32
 #    ifndef __CYGWIN__
+#    ifndef __APPLE__
 #         include <stropts.h>
+#    endif
 #    endif /* __CYGWIN__ */
 #    include <poll.h>
 #    include <unistd.h>
diff --git a/dcap_signal.c b/dcap_signal.c
index e2f517c..266e3ec 100644
--- a/dcap_signal.c
+++ b/dcap_signal.c
@@ -18,7 +18,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifndef __CYGWIN__
+#if !defined(__CYGWIN__) && !defined(__APPLE__)
 #    include <stropts.h>
 #endif /* __CYGWIN__ */
 
diff --git a/dcap_stat.c b/dcap_stat.c
index 3cc0a19..e63b808 100644
--- a/dcap_stat.c
+++ b/dcap_stat.c
@@ -18,6 +18,9 @@
 #include <stdio.h>
 #include "dcap_shared.h"
 
+#ifdef __APPLE__
+#define stat64 stat
+#endif
 off64_t dc_real_lseek(struct vsp_node *node, off64_t offset, int whence);
 #ifdef WIN32
 int dc_stat64(const char *path, struct _stati64 *buf);
diff --git a/dcap_stream.c b/dcap_stream.c
index 60dcb78..32f1d21 100644
--- a/dcap_stream.c
+++ b/dcap_stream.c
@@ -79,7 +79,7 @@ int dc_feof(FILE *fp)
                return system_feof(fp);
        }
        
-#if defined(linux) || defined(__CYGWIN__)
+#if defined(linux) || defined(__CYGWIN__) || defined(__APPLE__)
        if ( ((FILE *)fp)->_flags & _IO_EOF_SEEN ) {
 #else
        if ( ((FILE *)fp)->_flag & _IOEOF ) {
@@ -130,12 +130,14 @@ FILE   *dc_fopen64(const char *file, const char *mode)
                }
 
                /* break FILE chain */
-       #ifdef linux
+       #if defined(linux)
                fp->_chain = NULL;
                fp->_IO_write_ptr = NULL;
                fp->_IO_write_base = NULL;
                fp->_lock = NULL;
                fp->_flags = 0;
+       #elif defined(__APPLE__)
+               fp->_flags = 0;
        #else
                fp->_flag = 0;
        #endif
@@ -178,6 +180,8 @@ FILE   *dc_fdopen(int fd, const char *mode)
        fp->_IO_write_ptr = NULL;
        fp->_IO_write_base = NULL;
        fp->_flags = 0;
+#elif defined(__APPLE__)
+       fp->_flags;
 #else
        fp->_flag = 0;
 #endif
@@ -203,7 +207,7 @@ size_t dc_fread(void *ptr, size_t size, size_t items, FILE *fp)
        switch(rc) {
                case -1:
                case 0:
-#if defined(linux) || defined(__CYGWIN__)
+#if defined(linux) || defined(__CYGWIN__) || defined(__APPLE__)
                        ((FILE *)fp)->_flags |= _IO_EOF_SEEN;
 #else
                        ((FILE *)fp)->_flag |= _IOEOF;
@@ -304,7 +308,7 @@ size_t dc_fwrite(const void *ptr, size_t size, size_t items, FILE *fp)
 
        switch(rc) {
                case -1:
-#if defined(linux) || defined(__CYGWIN__)
+#if defined(linux) || defined(__CYGWIN__) || defined(__APPLE__)
                        ((FILE *)fp)->_flags |= _IO_ERR_SEEN ;
 #else
                        ((FILE *)fp)->_flag |= _IOERR ;
@@ -312,7 +316,7 @@ size_t dc_fwrite(const void *ptr, size_t size, size_t items, FILE *fp)
                        rc= 0 ; 
                        break ; 
                case 0:
-#if defined(linux) || defined(__CYGWIN__)
+#if defined(linux) || defined(__CYGWIN__) || defined(__APPLE__)
                        ((FILE *)fp)->_flags |= _IO_EOF_SEEN ; 
 #else
                        ((FILE *)fp)->_flag |= _IOEOF ; 
diff --git a/dcap_types.h b/dcap_types.h
index e860173..dbaed16 100644
--- a/dcap_types.h
+++ b/dcap_types.h
@@ -64,6 +64,10 @@ typedef struct {
 #endif /* NOT_THREAD_SAFE */
 } messageQueue;
 
+#ifdef __APPLE__
+typedef off_t off64_t;
+#endif
+
 typedef struct {
        char *buffer;
        off64_t base;
diff --git a/system_io.c b/system_io.c
index 48d8480..8f91894 100644
--- a/system_io.c
+++ b/system_io.c
@@ -214,7 +214,11 @@ static int initIfNeeded()
        s_rename = (int (*)(const char *, const char *))dlsym(handle, RENAME_SYM);
                
        s_fopen = (FILE * (*)(const char * , const char *))dlsym(handle, "fopen");
+#ifdef __APPLE__
+       s_fopen64 = s_fopen;
+#else
        s_fopen64 = (FILE * (*)(const char * , const char *))dlsym(handle, "fopen64");
+#endif
        s_fdopen = (FILE * (*)(int , const char *))dlsym(handle, "fdopen");
        s_fread = (size_t (*)(void *, size_t, size_t, FILE * ))dlsym(handle, "fread");
        s_fwrite = (size_t (*)(const void *, size_t, size_t, FILE * ))dlsym(handle, "fwrite");
diff --git a/system_io.h b/system_io.h
index 54347a4..0b665a8 100644
--- a/system_io.h
+++ b/system_io.h
@@ -27,6 +27,7 @@
 #ifdef LIBC_SYSCALLS
 
 #include <stdio.h>
+#include <unistd.h>
 
 extern int system_open(const char *, int, mode_t);
 extern int system_read(int, void *, size_t);
@@ -79,6 +80,7 @@ extern int system_fgetc( FILE *);
 
 #ifndef WIN32
 #    include <unistd.h>
+#    define system_access(a,b) access(a,b)
 #    define system_open(a,b,c) open(a,b,c)
 #    define system_read(a,b,c) read(a,b,c)
 #    ifdef DCAP_NO_PREAD
@@ -102,16 +104,27 @@ extern int system_fgetc( FILE *);
 #    define system_lseek(a,b,c) lseek(a,b,c)
 #    define system_stat(a,b) stat(a,b)
 #    define system_lstat(a,b) lstat(a,b)
+/* MACOSX is 64 bit clean */
+#ifdef __APPLE__
+#    define system_stat64(a,b) stat(a,b)
+#    define system_lstat64(a,b) lstat(a,b)
+#    define system_fstat64(a,b) fstat(a,b)
+#else
 #    define system_stat64(a,b) stat64(a,b)
 #    define system_lstat64(a,b) lstat64(a,b)
+#    define system_fstat64(a,b) fstat64(a,b)
+#endif
 #    define system_stat(a,b) stat(a,b)
 #    define system_fstat(a,b) fstat(a,b)
-#    define system_fstat64(a,b) fstat64(a,b)
 #    define system_fsync(a) fsync(a)
 #    define system_dup(a) dup(a)
 #    define system_opendir(a) opendir(a)
 #    define system_readdir(a) readdir(a)
+#if __APPLE__
+#    define system_readdir64(a) readdir(a)
+#else
 #    define system_readdir64(a) readdir64(a)
+#endif
 #    define system_closedir(a) closedir(a)
 #    define system_telldir(a) telldir(a)
 #    define system_seekdir(a,b) seekdir(a,b)
commit a53bdf775d70e61e2c0eb6f5ebc5f461505aeca3
Author: Giulio Eulisse <giulio.eulisse@cern.ch>
Date:   Thu Sep 9 17:39:57 2010 +0200

    Macosx makefile.

diff --git a/Makefile.darwin b/Makefile.darwin
new file mode 100644
index 0000000..40bc8ea
--- /dev/null
+++ b/Makefile.darwin
@@ -0,0 +1,49 @@
+#
+# $Id: Makefile.linux,v 1.51.2.1 2006-10-11 08:46:36 tigran Exp $
+#
+
+#
+# Makefile for Linux
+#
+
+CC = gcc
+
+#
+# libc dynamic symbols for simple IO operations
+#
+IO_SYM = -DOPEN_SYM=\"open\" -DCLOSE_SYM=\"close\" \
+       -DREAD_SYM=\"read\" -DWRITE_SYM=\"write\" \
+       -DLSEEK_SYM=\"lseek\" -DLSEEK64_SYM=\"lseek\" \
+       -DPREAD_SYM=\"pread\" -DPREAD64_SYM=\"pread\" \
+       -DPWRITE_SYM=\"pwrite\" -DPWRITE64_SYM=\"pwrite\" -DSTAT_SYM=\"__xstat\" \
+       -DSTAT64_SYM=\"__xstat64\" -DFSTAT64_SYM=\"__fxstat\" \
+       -DLSTAT_SYM=\"__lxstat\" -DLSTAT64_SYM=\"__lxstat\" \
+       -DFSTAT_SYM=\"__fxstat\" -DFSYNC_SYM=\"fsync\" \
+       -DDUP_SYM=\"dup\" \
+       -DOPENDIR_SYM=\"opendir\" -DCLOSEDIR_SYM=\"closedir\" \
+       -DREADDIR_SYM=\"readdir\" -DREADDIR64_SYM=\"readdir\" \
+       -DTELLDIR_SYM=\"telldir\" -DSEEKDIR_SYM=\"seekdir\" \
+       -DUNLINK_SYM=\"unlink\" -DRMDIR_SYM=\"rmdir\" -DMKDIR_SYM=\"mkdir\" \
+       -DCHMOD_SYM=\"chmod\" -DACCESS_SYM=\"access\" -DRENAME_SYM=\"rename\" \
+       -DCHOWN_SYM=\"chown\" -DWRITEV_SYM=\"writev\" -DREADV_SYM=\"readv\"
+
+CFLAGS = -g -I. -fPIC -Wall -pedantic -pipe -D_REENTRANT -DLIBC_SYSCALLS $(IO_SYM) -D_GNU_SOURCE 
+
+CPP = cpp
+
+
+SO_EXT = .dylib
+A_EXT = .a
+EXE_EXT =
+
+
+RANLIB = ranlib
+ARFLAGS = rv
+
+MAKEDEP = $(CC) -M -I.
+#MAP = --version-script=mapfile
+LIBS = -ldl -lpthread -lc
+LDFLAGS = -shared
+
+include Makefile.inc
+
diff --git a/system_io.c b/system_io.c
index 8f91894..a2cda2e 100644
--- a/system_io.c
+++ b/system_io.c
@@ -31,6 +31,10 @@
 #include "sysdep.h"
 #include <signal.h>
 
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
+
 static MUTEX(gLock);
 static void *handle;
 
diff --git a/dcap/system_io.h b/dcap/system_io.h
index 0b665a8..ff9129e 100644
--- a/system_io.h
+++ b/system_io.h
@@ -29,6 +29,11 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
+
+
 extern int system_open(const char *, int, mode_t);
 extern int system_read(int, void *, size_t);
 extern int system_readv(int, const struct iovec *vector, int count);
diff --git a/dcap/dcap.h.in b/dcap/dcap.h.in
index 11f9e06..edeea3f 100644
--- a/dcap.h.in
+++ b/dcap.h.in
@@ -33,6 +33,9 @@
 #endif /* WIN32 */
 #include <dcap_errno.h>
 
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/dcap/dcap_preload.c b/dcap/dcap_preload.c
index 6df8d0c..a0ef075 100644
--- a/dcap_preload.c
+++ b/dcap_preload.c
@@ -26,6 +26,9 @@
 #include <dcap_debug.h>
 #include <sys/mman.h>
 
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
 
 /* 
  * some applications do not close the file, which they have opned
diff --git a/Makefile b/Makefile
index 0bf0bf4..a3fab7b 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ CP    = cp
 RM    = rm -f
 LINK  = ln -s
 MV    = mv
+SONAME = so
 
 TARGET = libdcap libpdcap dccp dcap_test depend mapfile wdccp cflags
 
@@ -72,14 +73,14 @@ release:
 
 install: rebuild dirs
        @VER=`./version.sh`; \
-       $(MV) libdcap.so libdcap$$VER.so; \
-       $(RM) $(BIN_PATH)/lib/libdcap.so; \
-       $(LINK) libdcap$$VER.so $(BIN_PATH)/lib/libdcap.so; \
-       $(CP) libdcap$$VER.so $(BIN_PATH)/lib/; \
-       $(MV) libpdcap.so libpdcap$$VER.so; \
-       $(RM) $(BIN_PATH)/lib/libpdcap.so; \
-       $(LINK) libpdcap$$VER.so $(BIN_PATH)/lib/libpdcap.so; \
-       $(CP) libpdcap$$VER.so $(BIN_PATH)/lib/; \
+       $(MV) libdcap.$(SONAME) libdcap$$VER.$(SONAME); \
+       $(RM) $(BIN_PATH)/lib/libdcap.$(SONAME); \
+       $(LINK) libdcap$$VER.$(SONAME) $(BIN_PATH)/lib/libdcap.$(SONAME); \
+       $(CP) libdcap$$VER.$(SONAME) $(BIN_PATH)/lib/; \
+       $(MV) libpdcap.$(SONAME) libpdcap$$VER.$(SONAME); \
+       $(RM) $(BIN_PATH)/lib/libpdcap.$(SONAME); \
+       $(LINK) libpdcap$$VER.$(SONAME) $(BIN_PATH)/lib/libpdcap.$(SONAME); \
+       $(CP) libpdcap$$VER.$(SONAME) $(BIN_PATH)/lib/; \
        $(CP) dccp $(BIN_PATH)/bin/; \
        $(CP) dcap.h $(BIN_PATH)/include/; \
        $(CP) dcap_errno.h $(BIN_PATH)/include/; \
@@ -110,5 +111,5 @@ clean:
        @rm -f *.o *.BAK core
 
 cleanall: clean        
-       @rm -f $(TARGET) libdcap*.so libdcap*.a libpdcap*.so dcap.h \
+       @rm -f $(TARGET) libdcap*.$(SONAME) libdcap*.a libpdcap*.$(SONAME) dcap.h \
        .depend debug_map.h  debug_level.h mapfile
#	User	Rev	Content
1	eulisse	1.1	diff --git a/Makefile b/Makefile
2			index c9ee4ca..0bf0bf4 100644
3			--- a/Makefile
4			+++ b/Makefile
5			@@ -37,6 +37,9 @@ all $(TARGET):
6			CYGWIN*) \
7			$(MAKE) -f Makefile.w32 $@ ;\
8			;; \
9			+ Darwin) \
10			+ $(MAKE) -f Makefile.darwin $@ ;\
11			+ ;; \
12			*) \
13			echo "Don't know your machine type" \
14			echo "Have a look in Porting file" \
15			diff --git a/dc_hack.h b/dc_hack.h
16			index f1e95d4..547d5a3 100644
17			--- a/dc_hack.h
18			+++ b/dc_hack.h
19			@@ -40,6 +40,17 @@
20			#define access dc_access
21			#define unlink dc_unlink
22
23			+#ifdef __APPLE__
24			+#define lseek dc_lseek64
25			+#define stat dc_stat64
26			+#define lstat dc_lstat64
27			+#define fstat dc_fstat64
28			+#define readdir dc_readdir64
29			+#define ftello dc_ftello64
30			+#define fseeko dc_fseeko64
31			+#define pread dc_pread64
32			+#define pwrite dc_pwrite64
33			+#else
34			#define lseek64 dc_lseek64
35			#define stat64 dc_stat64
36			#define lstat64 dc_lstat64
37			@@ -49,7 +60,7 @@
38			#define fseeko64 dc_fseeko64
39			#define pread64 dc_pread64
40			#define pwrite64 dc_pwrite64
41			-
42			+#endif
43			#define lseek dc_lseek
44			#define stat dc_stat
45			#define lstat dc_lstat
46			diff --git a/dcap_dirent.c b/dcap_dirent.c
47			index 5055f92..bcc35d5 100644
48			--- a/dcap_dirent.c
49			+++ b/dcap_dirent.c
50			@@ -18,18 +18,23 @@
51
52			#include "dcap_shared.h"
53			#include <sys/types.h>
54			+#ifdef __APPLE__
55			+#include <sys/dir.h>
56			+#endif
57			#include <dirent.h>
58
59			#define RD_SEPARATOR ':'
60
61			+#ifdef __APPLE__
62			+#define dirent64 dirent
63			+#endif
64			+
65			ssize_t dc_real_read( struct vsp_node node, void buff, size_t buflen);
66			struct dirent64 dc_readdir64( DIR dir);
67			int char2dirent64(const char , struct dirent64 );
68			int char2dirent(const char , struct dirent );
69
70			-
71			#ifdef linux
72			-
73			struct __dirstream {
74			int fd; /* File descriptor. */
75
76			@@ -54,6 +59,11 @@ struct __dirstream {
77
78			#endif
79
80			+#ifdef __APPLE__
81			+#define DIRENT_FD(x) x->__dd_fd
82			+#define DIRENT_DATA(x) x->__dd_buf
83			+#endif
84			+
85
86			DIR * dc_opendir(const char *path)
87			{
88			@@ -134,7 +144,10 @@ DIR * dc_opendir(const char *path)
89
90			struct dirent dc_readdir( DIR dir)
91			{
92			-
93			+#ifdef __APPLE__
94			+ abort();
95			+ return 0;
96			+#else
97			static struct dirent ent;
98			struct dirent64 *ep;
99
100			@@ -145,16 +158,14 @@ struct dirent dc_readdir( DIR dir)
101			}
102
103			memcpy(ent.d_name, ep->d_name, 256);
104			-#ifdef linux
105			+#ifdef linux
106			ent.d_type = ep->d_type;
107			#endif
108			ent.d_reclen = ep->d_reclen;
109			- ent.d_off = (off_t)ep->d_off;
110			ent.d_ino = (ino_t)ep->d_ino;
111
112			return &ent;
113			-
114			-
115			+#endif
116			}
117
118			struct dirent64 dc_readdir64( DIR dir)
119			diff --git a/dcap_open.c b/dcap_open.c
120			index 93bbe9e..1fb363e 100644
121			--- a/dcap_open.c
122			+++ b/dcap_open.c
123			@@ -16,6 +16,7 @@
124			*/
125
126			#include "dcap_shared.h"
127			+#include <stdio.h>
128
129
130			#define DC_STAGE (O_RDONLY \| O_NONBLOCK)
131			@@ -47,6 +48,8 @@ dc_open(const char *fname, int flags,...)
132			int tmpIndex;
133			#ifdef WIN32
134			struct _stati64 sbuf;
135			+#elif defined(__APPLE__)
136			+ struct stat sbuf;
137			#else
138			struct stat64 sbuf;
139			#endif
140			@@ -68,7 +71,7 @@ dc_open(const char *fname, int flags,...)
141
142			if (flags & O_CREAT) {
143			va_start(args, flags);
144			- mode = va_arg(args, mode_t);
145			+ mode = va_arg(args, int);
146			va_end(args);
147			isTrunc = ( (flags & O_TRUNC) == O_TRUNC );
148			}
149			@@ -103,7 +106,9 @@ dc_open(const char *fname, int flags,...)
150			* with Disk Cache */
151			free(path);
152			dc_debug(DC_INFO, "Using system native open for %s.", fname);
153			+#ifndef __APPLE__
154			flags \|= O_LARGEFILE ;
155			+#endif
156			return system_open(fname, flags, mode);
157			}
158
159			@@ -190,7 +195,10 @@ dc_open(const char *fname, int flags,...)
160			* dCache always has LARGE FILE SUPPORT,
161			* remove extra flag, while it makes trouble in ascii open
162			*/
163			- node->flags = flags & ~O_LARGEFILE;
164			+ node->flags = flags;
165			+#ifndef __APPLE__
166			+ node->flags &= ~O_LARGEFILE;
167			+#endif
168			node->mode = mode;
169
170			if(url == NULL) {
171			diff --git a/dcap_poll.c b/dcap_poll.c
172			index e2148cf..7bdc04f 100644
173			--- a/dcap_poll.c
174			+++ b/dcap_poll.c
175			@@ -21,7 +21,9 @@
176			#include <sys/types.h>
177			#ifndef WIN32
178			# ifndef __CYGWIN__
179			+# ifndef __APPLE__
180			# include <stropts.h>
181			+# endif
182			# endif /* __CYGWIN__ */
183			# include <poll.h>
184			# include <unistd.h>
185			diff --git a/dcap_signal.c b/dcap_signal.c
186			index e2f517c..266e3ec 100644
187			--- a/dcap_signal.c
188			+++ b/dcap_signal.c
189			@@ -18,7 +18,7 @@
190			#include <signal.h>
191			#include <stdlib.h>
192			#include <unistd.h>
193			-#ifndef __CYGWIN__
194			+#if !defined(__CYGWIN__) && !defined(__APPLE__)
195			# include <stropts.h>
196			#endif /* __CYGWIN__ */
197
198			diff --git a/dcap_stat.c b/dcap_stat.c
199			index 3cc0a19..e63b808 100644
200			--- a/dcap_stat.c
201			+++ b/dcap_stat.c
202			@@ -18,6 +18,9 @@
203			#include <stdio.h>
204			#include "dcap_shared.h"
205
206			+#ifdef __APPLE__
207			+#define stat64 stat
208			+#endif
209			off64_t dc_real_lseek(struct vsp_node *node, off64_t offset, int whence);
210			#ifdef WIN32
211			int dc_stat64(const char path, struct _stati64 buf);
212			diff --git a/dcap_stream.c b/dcap_stream.c
213			index 60dcb78..32f1d21 100644
214			--- a/dcap_stream.c
215			+++ b/dcap_stream.c
216			@@ -79,7 +79,7 @@ int dc_feof(FILE *fp)
217			return system_feof(fp);
218			}
219
220			-#if defined(linux) \|\| defined(__CYGWIN__)
221			+#if defined(linux) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
222			if ( ((FILE *)fp)->_flags & _IO_EOF_SEEN ) {
223			#else
224			if ( ((FILE *)fp)->_flag & _IOEOF ) {
225			@@ -130,12 +130,14 @@ FILE dc_fopen64(const char file, const char *mode)
226			}
227
228			/* break FILE chain */
229			- #ifdef linux
230			+ #if defined(linux)
231			fp->_chain = NULL;
232			fp->_IO_write_ptr = NULL;
233			fp->_IO_write_base = NULL;
234			fp->_lock = NULL;
235			fp->_flags = 0;
236			+ #elif defined(__APPLE__)
237			+ fp->_flags = 0;
238			#else
239			fp->_flag = 0;
240			#endif
241			@@ -178,6 +180,8 @@ FILE dc_fdopen(int fd, const char mode)
242			fp->_IO_write_ptr = NULL;
243			fp->_IO_write_base = NULL;
244			fp->_flags = 0;
245			+#elif defined(__APPLE__)
246			+ fp->_flags;
247			#else
248			fp->_flag = 0;
249			#endif
250			@@ -203,7 +207,7 @@ size_t dc_fread(void ptr, size_t size, size_t items, FILE fp)
251			switch(rc) {
252			case -1:
253			case 0:
254			-#if defined(linux) \|\| defined(__CYGWIN__)
255			+#if defined(linux) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
256			((FILE *)fp)->_flags \|= _IO_EOF_SEEN;
257			#else
258			((FILE *)fp)->_flag \|= _IOEOF;
259			@@ -304,7 +308,7 @@ size_t dc_fwrite(const void ptr, size_t size, size_t items, FILE fp)
260
261			switch(rc) {
262			case -1:
263			-#if defined(linux) \|\| defined(__CYGWIN__)
264			+#if defined(linux) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
265			((FILE *)fp)->_flags \|= _IO_ERR_SEEN ;
266			#else
267			((FILE *)fp)->_flag \|= _IOERR ;
268			@@ -312,7 +316,7 @@ size_t dc_fwrite(const void ptr, size_t size, size_t items, FILE fp)
269			rc= 0 ;
270			break ;
271			case 0:
272			-#if defined(linux) \|\| defined(__CYGWIN__)
273			+#if defined(linux) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
274			((FILE *)fp)->_flags \|= _IO_EOF_SEEN ;
275			#else
276			((FILE *)fp)->_flag \|= _IOEOF ;
277			diff --git a/dcap_types.h b/dcap_types.h
278			index e860173..dbaed16 100644
279			--- a/dcap_types.h
280			+++ b/dcap_types.h
281			@@ -64,6 +64,10 @@ typedef struct {
282			#endif /* NOT_THREAD_SAFE */
283			} messageQueue;
284
285			+#ifdef __APPLE__
286			+typedef off_t off64_t;
287			+#endif
288			+
289			typedef struct {
290			char *buffer;
291			off64_t base;
292			diff --git a/system_io.c b/system_io.c
293			index 48d8480..8f91894 100644
294			--- a/system_io.c
295			+++ b/system_io.c
296			@@ -214,7 +214,11 @@ static int initIfNeeded()
297			s_rename = (int ()(const char , const char *))dlsym(handle, RENAME_SYM);
298
299			s_fopen = (FILE * ()(const char , const char *))dlsym(handle, "fopen");
300			+#ifdef __APPLE__
301			+ s_fopen64 = s_fopen;
302			+#else
303			s_fopen64 = (FILE * ()(const char , const char *))dlsym(handle, "fopen64");
304			+#endif
305			s_fdopen = (FILE * ()(int , const char ))dlsym(handle, "fdopen");
306			s_fread = (size_t ()(void , size_t, size_t, FILE * ))dlsym(handle, "fread");
307			s_fwrite = (size_t ()(const void , size_t, size_t, FILE * ))dlsym(handle, "fwrite");
308			diff --git a/system_io.h b/system_io.h
309			index 54347a4..0b665a8 100644
310			--- a/system_io.h
311			+++ b/system_io.h
312			@@ -27,6 +27,7 @@
313			#ifdef LIBC_SYSCALLS
314
315			#include <stdio.h>
316			+#include <unistd.h>
317
318			extern int system_open(const char *, int, mode_t);
319			extern int system_read(int, void *, size_t);
320			@@ -79,6 +80,7 @@ extern int system_fgetc( FILE *);
321
322			#ifndef WIN32
323			# include <unistd.h>
324			+# define system_access(a,b) access(a,b)
325			# define system_open(a,b,c) open(a,b,c)
326			# define system_read(a,b,c) read(a,b,c)
327			# ifdef DCAP_NO_PREAD
328			@@ -102,16 +104,27 @@ extern int system_fgetc( FILE *);
329			# define system_lseek(a,b,c) lseek(a,b,c)
330			# define system_stat(a,b) stat(a,b)
331			# define system_lstat(a,b) lstat(a,b)
332			+/* MACOSX is 64 bit clean */
333			+#ifdef __APPLE__
334			+# define system_stat64(a,b) stat(a,b)
335			+# define system_lstat64(a,b) lstat(a,b)
336			+# define system_fstat64(a,b) fstat(a,b)
337			+#else
338			# define system_stat64(a,b) stat64(a,b)
339			# define system_lstat64(a,b) lstat64(a,b)
340			+# define system_fstat64(a,b) fstat64(a,b)
341			+#endif
342			# define system_stat(a,b) stat(a,b)
343			# define system_fstat(a,b) fstat(a,b)
344			-# define system_fstat64(a,b) fstat64(a,b)
345			# define system_fsync(a) fsync(a)
346			# define system_dup(a) dup(a)
347			# define system_opendir(a) opendir(a)
348			# define system_readdir(a) readdir(a)
349			+#if __APPLE__
350			+# define system_readdir64(a) readdir(a)
351			+#else
352			# define system_readdir64(a) readdir64(a)
353			+#endif
354			# define system_closedir(a) closedir(a)
355			# define system_telldir(a) telldir(a)
356			# define system_seekdir(a,b) seekdir(a,b)
357			commit a53bdf775d70e61e2c0eb6f5ebc5f461505aeca3
358			Author: Giulio Eulisse <giulio.eulisse@cern.ch>
359			Date: Thu Sep 9 17:39:57 2010 +0200
360
361			Macosx makefile.
362
363			diff --git a/Makefile.darwin b/Makefile.darwin
364			new file mode 100644
365			index 0000000..40bc8ea
366			--- /dev/null
367			+++ b/Makefile.darwin
368			@@ -0,0 +1,49 @@
369			+#
370			+# $Id: Makefile.linux,v 1.51.2.1 2006-10-11 08:46:36 tigran Exp $
371			+#
372			+
373			+#
374			+# Makefile for Linux
375			+#
376			+
377			+CC = gcc
378			+
379			+#
380			+# libc dynamic symbols for simple IO operations
381			+#
382			+IO_SYM = -DOPEN_SYM=\"open\" -DCLOSE_SYM=\"close\" \
383			+ -DREAD_SYM=\"read\" -DWRITE_SYM=\"write\" \
384			+ -DLSEEK_SYM=\"lseek\" -DLSEEK64_SYM=\"lseek\" \
385			+ -DPREAD_SYM=\"pread\" -DPREAD64_SYM=\"pread\" \
386			+ -DPWRITE_SYM=\"pwrite\" -DPWRITE64_SYM=\"pwrite\" -DSTAT_SYM=\"__xstat\" \
387			+ -DSTAT64_SYM=\"__xstat64\" -DFSTAT64_SYM=\"__fxstat\" \
388			+ -DLSTAT_SYM=\"__lxstat\" -DLSTAT64_SYM=\"__lxstat\" \
389			+ -DFSTAT_SYM=\"__fxstat\" -DFSYNC_SYM=\"fsync\" \
390			+ -DDUP_SYM=\"dup\" \
391			+ -DOPENDIR_SYM=\"opendir\" -DCLOSEDIR_SYM=\"closedir\" \
392			+ -DREADDIR_SYM=\"readdir\" -DREADDIR64_SYM=\"readdir\" \
393			+ -DTELLDIR_SYM=\"telldir\" -DSEEKDIR_SYM=\"seekdir\" \
394			+ -DUNLINK_SYM=\"unlink\" -DRMDIR_SYM=\"rmdir\" -DMKDIR_SYM=\"mkdir\" \
395			+ -DCHMOD_SYM=\"chmod\" -DACCESS_SYM=\"access\" -DRENAME_SYM=\"rename\" \
396			+ -DCHOWN_SYM=\"chown\" -DWRITEV_SYM=\"writev\" -DREADV_SYM=\"readv\"
397			+
398			+CFLAGS = -g -I. -fPIC -Wall -pedantic -pipe -D_REENTRANT -DLIBC_SYSCALLS $(IO_SYM) -D_GNU_SOURCE
399			+
400			+CPP = cpp
401			+
402			+
403			+SO_EXT = .dylib
404			+A_EXT = .a
405			+EXE_EXT =
406			+
407			+
408			+RANLIB = ranlib
409			+ARFLAGS = rv
410			+
411			+MAKEDEP = $(CC) -M -I.
412			+#MAP = --version-script=mapfile
413			+LIBS = -ldl -lpthread -lc
414			+LDFLAGS = -shared
415			+
416			+include Makefile.inc
417			+
418			diff --git a/system_io.c b/system_io.c
419			index 8f91894..a2cda2e 100644
420			--- a/system_io.c
421			+++ b/system_io.c
422			@@ -31,6 +31,10 @@
423			#include "sysdep.h"
424			#include <signal.h>
425
426			+#ifdef __APPLE__
427			+#define off64_t off_t
428			+#endif
429			+
430			static MUTEX(gLock);
431			static void *handle;
432
433			diff --git a/dcap/system_io.h b/dcap/system_io.h
434			index 0b665a8..ff9129e 100644
435			--- a/system_io.h
436			+++ b/system_io.h
437			@@ -29,6 +29,11 @@
438			#include <stdio.h>
439			#include <unistd.h>
440
441			+#ifdef __APPLE__
442			+#define off64_t off_t
443			+#endif
444			+
445			+
446			extern int system_open(const char *, int, mode_t);
447			extern int system_read(int, void *, size_t);
448			extern int system_readv(int, const struct iovec *vector, int count);
449			diff --git a/dcap/dcap.h.in b/dcap/dcap.h.in
450			index 11f9e06..edeea3f 100644
451			--- a/dcap.h.in
452			+++ b/dcap.h.in
453			@@ -33,6 +33,9 @@
454			#endif /* WIN32 */
455			#include <dcap_errno.h>
456
457			+#ifdef __APPLE__
458			+#define off64_t off_t
459			+#endif
460
461			#ifdef __cplusplus
462			extern "C" {
463			diff --git a/dcap/dcap_preload.c b/dcap/dcap_preload.c
464			index 6df8d0c..a0ef075 100644
465			--- a/dcap_preload.c
466			+++ b/dcap_preload.c
467			@@ -26,6 +26,9 @@
468			#include <dcap_debug.h>
469			#include <sys/mman.h>
470
471			+#ifdef __APPLE__
472			+#define off64_t off_t
473			+#endif
474
475			/*
476			* some applications do not close the file, which they have opned
477			diff --git a/Makefile b/Makefile
478			index 0bf0bf4..a3fab7b 100644
479			--- a/Makefile
480			+++ b/Makefile
481			@@ -11,6 +11,7 @@ CP = cp
482			RM = rm -f
483			LINK = ln -s
484			MV = mv
485			+SONAME = so
486
487			TARGET = libdcap libpdcap dccp dcap_test depend mapfile wdccp cflags
488
489			@@ -72,14 +73,14 @@ release:
490
491			install: rebuild dirs
492			@VER=`./version.sh`; \
493			- $(MV) libdcap.so libdcap$$VER.so; \
494			- $(RM) $(BIN_PATH)/lib/libdcap.so; \
495			- $(LINK) libdcap$$VER.so $(BIN_PATH)/lib/libdcap.so; \
496			- $(CP) libdcap$$VER.so $(BIN_PATH)/lib/; \
497			- $(MV) libpdcap.so libpdcap$$VER.so; \
498			- $(RM) $(BIN_PATH)/lib/libpdcap.so; \
499			- $(LINK) libpdcap$$VER.so $(BIN_PATH)/lib/libpdcap.so; \
500			- $(CP) libpdcap$$VER.so $(BIN_PATH)/lib/; \
501			+ $(MV) libdcap.$(SONAME) libdcap$$VER.$(SONAME); \
502			+ $(RM) $(BIN_PATH)/lib/libdcap.$(SONAME); \
503			+ $(LINK) libdcap$$VER.$(SONAME) $(BIN_PATH)/lib/libdcap.$(SONAME); \
504			+ $(CP) libdcap$$VER.$(SONAME) $(BIN_PATH)/lib/; \
505			+ $(MV) libpdcap.$(SONAME) libpdcap$$VER.$(SONAME); \
506			+ $(RM) $(BIN_PATH)/lib/libpdcap.$(SONAME); \
507			+ $(LINK) libpdcap$$VER.$(SONAME) $(BIN_PATH)/lib/libpdcap.$(SONAME); \
508			+ $(CP) libpdcap$$VER.$(SONAME) $(BIN_PATH)/lib/; \
509			$(CP) dccp $(BIN_PATH)/bin/; \
510			$(CP) dcap.h $(BIN_PATH)/include/; \
511			$(CP) dcap_errno.h $(BIN_PATH)/include/; \
512			@@ -110,5 +111,5 @@ clean:
513			@rm -f .o .BAK core
514
515			cleanall: clean
516			- @rm -f $(TARGET) libdcap.so libdcap.a libpdcap*.so dcap.h \
517			+ @rm -f $(TARGET) libdcap.$(SONAME) libdcap.a libpdcap*.$(SONAME) dcap.h \
518			.depend debug_map.h debug_level.h mapfile