COMP/CMSDIST/dcap-2.47.5.0-macosx.patch

diff --git a/src/dcap_dirent.c b/src/dcap_dirent.c
index b5adf46..a44041e 100644
--- a/src/dcap_dirent.c
+++ b/src/dcap_dirent.c
@@ -58,13 +58,17 @@ struct __dirstream   {
 
 #endif
 
-#ifdef sun
+#if defined(sun)
 
 #define DIRENT_FD(x) x->dd_fd
 #define DIRENT_DATA(x) x->dd_buf
 
 #endif
 
+#if defined(__APPLE__)
+#define DIRENT_FD(x) x->__dd_fd
+#define DIRENT_DATA(x) x->__dd_buf
+#endif
 
 DIR * dc_opendir(const char *path)
 {
@@ -156,11 +160,11 @@ struct dirent *dc_readdir( DIR *dir)
        }
 
        memcpy(ent.d_name, ep->d_name, 256);
-#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
        ent.d_type = ep->d_type;
 #endif
        ent.d_reclen = ep->d_reclen;
-#if !defined(__GNU__) && !defined(__FreeBSD_kernel__)
+#if !defined(__GNU__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__)
        ent.d_off = (off_t)ep->d_off;
 #endif
        ent.d_ino = (ino_t)ep->d_ino;
diff --git a/src/dcap_open.c b/src/dcap_open.c
index 61ccb20..9069234 100644
--- a/src/dcap_open.c
+++ b/src/dcap_open.c
@@ -123,7 +123,9 @@ dc_open(const char *fname, int flags,...)
                                                                 * with Disk Cache */
                                free(path);
                                dc_debug(DC_INFO, "Using system native open for %s.", fname);
+#ifdef O_LARGEFILE
                            flags |= O_LARGEFILE ;
+#endif
                                return system_open(fname, flags, mode);
                }
 
@@ -210,7 +212,9 @@ dc_open(const char *fname, int flags,...)
         * dCache always has LARGE FILE SUPPORT,
         * remove extra flag, while it makes trouble in ascii open
         */
+#ifdef O_LARGEFILE
        node->flags =  flags & ~O_LARGEFILE;
+#endif
        node->mode = mode;
 
        if(url == NULL) {
diff --git a/src/dcap_preload64.c b/src/dcap_preload64.c
index 9d90d4c..8565a8d 100644
--- a/src/dcap_preload64.c
+++ b/src/dcap_preload64.c
@@ -30,8 +30,10 @@
 #include "dcap.h"
 #include "debug_level.h"
 
-/* Replacing system calls with our if we are PRELOAD library */
+// MacosX does not have a special API for 64bit.
+#ifndef __APPLE__
 
+/* Replacing system calls with our if we are PRELOAD library */
 
 /*
  *  work around linux glibc header files mess:
@@ -41,12 +43,12 @@
 
 int open64(const char *path, int flags,...)
 {
-       mode_t mode = 0;
+       int mode = 0;
        va_list    args;
 
        if (flags & O_CREAT) {
                va_start(args, flags);
-               mode = va_arg(args, mode_t);
+               mode = va_arg(args, int);
                va_end(args);
        }
 
@@ -147,3 +149,4 @@ off64_t ftello64 (FILE *stream )
        dc_debug(DC_TRACE, "Running preloaded ftello64");
        return dc_ftello64( stream );
 }
+#endif
\ No newline at end of file
diff --git a/src/dcap_stream.c b/src/dcap_stream.c
index d13a7e0..4f1fc88 100644
--- a/src/dcap_stream.c
+++ b/src/dcap_stream.c
@@ -83,7 +83,7 @@ int dc_feof(FILE *fp)
                return system_feof(fp);
        }
 
-#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__) || defined(__APPLE__)
        if ( ((FILE *)fp)->_flags & _IO_EOF_SEEN ) {
 #else
        if ( ((FILE *)fp)->_flag & _IOEOF ) {
@@ -140,6 +140,8 @@ FILE   *dc_fopen64(const char *file, const char *mode)
                fp->_IO_write_base = NULL;
                fp->_lock = NULL;
                fp->_flags = 0;
+        #elif defined(__APPLE__)
+                fp->_flags = 0;
        #else
                fp->_flag = 0;
        #endif
@@ -182,6 +184,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 = 0;
 #else
        fp->_flag = 0;
 #endif
@@ -207,7 +211,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(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__) || defined(__APPLE__)
                        ((FILE *)fp)->_flags |= _IO_EOF_SEEN;
 #else
                        ((FILE *)fp)->_flag |= _IOEOF;
@@ -308,7 +312,7 @@ size_t dc_fwrite(const void *ptr, size_t size, size_t items, FILE *fp)
 
        switch(rc) {
                case -1:
-#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__) || defined(__APPLE__)
                        ((FILE *)fp)->_flags |= _IO_ERR_SEEN ;
 #else
                        ((FILE *)fp)->_flag |= _IOERR ;
@@ -316,7 +320,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(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__) || defined(__APPLE__)
                        ((FILE *)fp)->_flags |= _IO_EOF_SEEN ;
 #else
                        ((FILE *)fp)->_flag |= _IOEOF ;
diff --git a/src/dcap_types.h b/src/dcap_types.h
index 142b57d..a8c8393 100644
--- a/src/dcap_types.h
+++ b/src/dcap_types.h
@@ -36,6 +36,10 @@ typedef int int32_t;
 typedef long int64_t;
 #endif /* alpha */
 
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
+
 typedef struct {
 
        int32_t         code;
diff --git a/src/print_size.h b/src/print_size.h
index cc4b7ee..919beac 100644
--- a/src/print_size.h
+++ b/src/print_size.h
@@ -16,0 +16,3 @@
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
diff --git a/src/system_io.c b/src/system_io.c
index 6619b3e..67d00a0 100644
--- a/src/system_io.c
+++ b/src/system_io.c
@@ -34,6 +34,10 @@
 static MUTEX(gLock);
 static void *handle;
 
+#ifdef __APPLE__
+#define off64_t off_t
+#endif
+
 /*
  *  Convert from (void *) to different function pointer
  *  types.  For details why this is necessary, please
diff --git a/src/system_io.h b/src/system_io.h
index e6fc01d..34ab6e6 100644
--- a/src/system_io.h
+++ b/src/system_io.h
@@ -28,6 +28,12 @@
 
 #include <stdio.h>
 
+#ifdef __APPLE__
+/* MACOSX API is 64 bit clean. No need for "64" suffix. */
+typedef off_t off64_t;
+#define stat64 stat
+#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/src/dcap.h.in b/src/dcap.h.in
index c1ed276..06a6155 100644
--- a/src/dcap.h.in
+++ b/src/dcap.h.in
@@ -33,6 +33,11 @@
 #endif /* WIN32 */
 #include <dcap_errno.h>
 
+#ifdef __APPLE__
+#define stat64 stat
+#define off64_t off_t
+#define dirent64 dirent
+#endif
 
 #ifdef  __cplusplus
 extern "C" {
#	Content
1	diff --git a/src/dcap_dirent.c b/src/dcap_dirent.c
2	index b5adf46..a44041e 100644
3	--- a/src/dcap_dirent.c
4	+++ b/src/dcap_dirent.c
5	@@ -58,13 +58,17 @@ struct __dirstream {
6
7	#endif
8
9	-#ifdef sun
10	+#if defined(sun)
11
12	#define DIRENT_FD(x) x->dd_fd
13	#define DIRENT_DATA(x) x->dd_buf
14
15	#endif
16
17	+#if defined(__APPLE__)
18	+#define DIRENT_FD(x) x->__dd_fd
19	+#define DIRENT_DATA(x) x->__dd_buf
20	+#endif
21
22	DIR * dc_opendir(const char *path)
23	{
24	@@ -156,11 +160,11 @@ struct dirent dc_readdir( DIR dir)
25	}
26
27	memcpy(ent.d_name, ep->d_name, 256);
28	-#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__)
29	+#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__APPLE__)
30	ent.d_type = ep->d_type;
31	#endif
32	ent.d_reclen = ep->d_reclen;
33	-#if !defined(__GNU__) && !defined(__FreeBSD_kernel__)
34	+#if !defined(__GNU__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__)
35	ent.d_off = (off_t)ep->d_off;
36	#endif
37	ent.d_ino = (ino_t)ep->d_ino;
38	diff --git a/src/dcap_open.c b/src/dcap_open.c
39	index 61ccb20..9069234 100644
40	--- a/src/dcap_open.c
41	+++ b/src/dcap_open.c
42	@@ -123,7 +123,9 @@ dc_open(const char *fname, int flags,...)
43	* with Disk Cache */
44	free(path);
45	dc_debug(DC_INFO, "Using system native open for %s.", fname);
46	+#ifdef O_LARGEFILE
47	flags \|= O_LARGEFILE ;
48	+#endif
49	return system_open(fname, flags, mode);
50	}
51
52	@@ -210,7 +212,9 @@ dc_open(const char *fname, int flags,...)
53	* dCache always has LARGE FILE SUPPORT,
54	* remove extra flag, while it makes trouble in ascii open
55	*/
56	+#ifdef O_LARGEFILE
57	node->flags = flags & ~O_LARGEFILE;
58	+#endif
59	node->mode = mode;
60
61	if(url == NULL) {
62	diff --git a/src/dcap_preload64.c b/src/dcap_preload64.c
63	index 9d90d4c..8565a8d 100644
64	--- a/src/dcap_preload64.c
65	+++ b/src/dcap_preload64.c
66	@@ -30,8 +30,10 @@
67	#include "dcap.h"
68	#include "debug_level.h"
69
70	-/* Replacing system calls with our if we are PRELOAD library */
71	+// MacosX does not have a special API for 64bit.
72	+#ifndef __APPLE__
73
74	+/* Replacing system calls with our if we are PRELOAD library */
75
76	/*
77	* work around linux glibc header files mess:
78	@@ -41,12 +43,12 @@
79
80	int open64(const char *path, int flags,...)
81	{
82	- mode_t mode = 0;
83	+ int mode = 0;
84	va_list args;
85
86	if (flags & O_CREAT) {
87	va_start(args, flags);
88	- mode = va_arg(args, mode_t);
89	+ mode = va_arg(args, int);
90	va_end(args);
91	}
92
93	@@ -147,3 +149,4 @@ off64_t ftello64 (FILE *stream )
94	dc_debug(DC_TRACE, "Running preloaded ftello64");
95	return dc_ftello64( stream );
96	}
97	+#endif
98	\ No newline at end of file
99	diff --git a/src/dcap_stream.c b/src/dcap_stream.c
100	index d13a7e0..4f1fc88 100644
101	--- a/src/dcap_stream.c
102	+++ b/src/dcap_stream.c
103	@@ -83,7 +83,7 @@ int dc_feof(FILE *fp)
104	return system_feof(fp);
105	}
106
107	-#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__)
108	+#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
109	if ( ((FILE *)fp)->_flags & _IO_EOF_SEEN ) {
110	#else
111	if ( ((FILE *)fp)->_flag & _IOEOF ) {
112	@@ -140,6 +140,8 @@ FILE dc_fopen64(const char file, const char *mode)
113	fp->_IO_write_base = NULL;
114	fp->_lock = NULL;
115	fp->_flags = 0;
116	+ #elif defined(__APPLE__)
117	+ fp->_flags = 0;
118	#else
119	fp->_flag = 0;
120	#endif
121	@@ -182,6 +184,8 @@ FILE dc_fdopen(int fd, const char mode)
122	fp->_IO_write_ptr = NULL;
123	fp->_IO_write_base = NULL;
124	fp->_flags = 0;
125	+#elif defined(__APPLE__)
126	+ fp->_flags = 0;
127	#else
128	fp->_flag = 0;
129	#endif
130	@@ -207,7 +211,7 @@ size_t dc_fread(void ptr, size_t size, size_t items, FILE fp)
131	switch(rc) {
132	case -1:
133	case 0:
134	-#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__)
135	+#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
136	((FILE *)fp)->_flags \|= _IO_EOF_SEEN;
137	#else
138	((FILE *)fp)->_flag \|= _IOEOF;
139	@@ -308,7 +312,7 @@ size_t dc_fwrite(const void ptr, size_t size, size_t items, FILE fp)
140
141	switch(rc) {
142	case -1:
143	-#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__)
144	+#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
145	((FILE *)fp)->_flags \|= _IO_ERR_SEEN ;
146	#else
147	((FILE *)fp)->_flag \|= _IOERR ;
148	@@ -316,7 +320,7 @@ size_t dc_fwrite(const void ptr, size_t size, size_t items, FILE fp)
149	rc= 0 ;
150	break ;
151	case 0:
152	-#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__)
153	+#if defined(__linux__) \|\| defined(__GNU__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
154	((FILE *)fp)->_flags \|= _IO_EOF_SEEN ;
155	#else
156	((FILE *)fp)->_flag \|= _IOEOF ;
157	diff --git a/src/dcap_types.h b/src/dcap_types.h
158	index 142b57d..a8c8393 100644
159	--- a/src/dcap_types.h
160	+++ b/src/dcap_types.h
161	@@ -36,6 +36,10 @@ typedef int int32_t;
162	typedef long int64_t;
163	#endif /* alpha */
164
165	+#ifdef __APPLE__
166	+#define off64_t off_t
167	+#endif
168	+
169	typedef struct {
170
171	int32_t code;
172	diff --git a/src/print_size.h b/src/print_size.h
173	index cc4b7ee..919beac 100644
174	--- a/src/print_size.h
175	+++ b/src/print_size.h
176	@@ -16,0 +16,3 @@
177	+#ifdef __APPLE__
178	+#define off64_t off_t
179	+#endif
180	diff --git a/src/system_io.c b/src/system_io.c
181	index 6619b3e..67d00a0 100644
182	--- a/src/system_io.c
183	+++ b/src/system_io.c
184	@@ -34,6 +34,10 @@
185	static MUTEX(gLock);
186	static void *handle;
187
188	+#ifdef __APPLE__
189	+#define off64_t off_t
190	+#endif
191	+
192	/*
193	* Convert from (void *) to different function pointer
194	* types. For details why this is necessary, please
195	diff --git a/src/system_io.h b/src/system_io.h
196	index e6fc01d..34ab6e6 100644
197	--- a/src/system_io.h
198	+++ b/src/system_io.h
199	@@ -28,6 +28,12 @@
200
201	#include <stdio.h>
202
203	+#ifdef __APPLE__
204	+/* MACOSX API is 64 bit clean. No need for "64" suffix. */
205	+typedef off_t off64_t;
206	+#define stat64 stat
207	+#endif
208	+
209	extern int system_open(const char *, int, mode_t);
210	extern int system_read(int, void *, size_t);
211	extern int system_readv(int, const struct iovec *vector, int count);
212	diff --git a/src/dcap.h.in b/src/dcap.h.in
213	index c1ed276..06a6155 100644
214	--- a/src/dcap.h.in
215	+++ b/src/dcap.h.in
216	@@ -33,6 +33,11 @@
217	#endif /* WIN32 */
218	#include <dcap_errno.h>
219
220	+#ifdef __APPLE__
221	+#define stat64 stat
222	+#define off64_t off_t
223	+#define dirent64 dirent
224	+#endif
225
226	#ifdef __cplusplus
227	extern "C" {