Changeset 2299

Timestamp:

26/09/2008 21:24:11 (3 years ago)

Author:

chris

Message:

Fix compilation of open64() intercept.

Location:

box/trunk/lib/intercept

Files:

• intercept.cpp (modified) (5 diffs)
• intercept.h (modified) (1 diff)

box/trunk/lib/intercept/intercept.cpp

@@ -23 +23 @@
 
 #include <errno.h>
+#include <stdarg.h>
 
 #ifdef HAVE_DLFCN_H
@@ -233 +234 @@
 
 extern "C" int
-open(const char *path, int flags, mode_t mode)
+#ifdef DEFINE_ONLY_OPEN64
+        open64(const char *path, int flags, ...)
+#else
+        open(const char *path, int flags, ...)
+#endif // DEFINE_ONLY_OPEN64
 {
         if(intercept_count > 0)
@@ -246 +251 @@
         }
 
+        mode_t mode = 0;
+        if (flags & O_CREAT)
+        {
+                va_list ap;
+                va_start(ap, flags);
+                mode = va_arg(ap, mode_t);
+                va_end(ap);
+        }
+
 #ifdef PLATFORM_NO_SYSCALL
         int r = TEST_open(path, flags, mode);
@@ -267 +281 @@
 }
 
+#ifndef DEFINE_ONLY_OPEN64
 extern "C" int
-open64(const char *path, int flags, mode_t mode)
-{
+// open64(const char *path, int flags, mode_t mode)
+// open64(const char *path, int flags, ...)
+open64 (__const char *path, int flags, ...)
+{
+        mode_t mode = 0;
+        if (flags & O_CREAT)
+        {
+                va_list ap;
+                va_start(ap, flags);
+                mode = va_arg(ap, mode_t);
+                va_end(ap);
+        }
+
         // With _FILE_OFFSET_BITS set to 64 this should really use (flags |
         // O_LARGEFILE) here, but not actually necessary for the tests and not
@@ -275 +301 @@
         return open(path, flags, mode);
 }
+#endif // !DEFINE_ONLY_OPEN64
 
 extern "C" int

box/trunk/lib/intercept/intercept.h

@@ -24 +24 @@
         typedef int            (closedir_t)(DIR *dir);
 #if defined __GNUC__ && __GNUC__ >= 2
-#define LINUX_WEIRD_LSTAT
-#define STAT_STRUCT struct stat /* should be stat64 */
-        typedef int            (lstat_t)   (int ver, const char *file_name, 
-                                            STAT_STRUCT *buf);
+        #if _FILE_OFFSET_BITS == 64
+                #define DEFINE_ONLY_OPEN64
+        #endif
+        #define LINUX_WEIRD_LSTAT
+        #define STAT_STRUCT struct stat /* should be stat64 */
+                typedef int    (lstat_t)   (int ver, const char *file_name, 
+                                            STAT_STRUCT *buf);
 #else
-#define STAT_STRUCT struct stat
-        typedef int            (lstat_t)   (const char *file_name, 
-                                            STAT_STRUCT *buf);
+        #define STAT_STRUCT struct stat
+                typedef int    (lstat_t)   (const char *file_name, 
+                                            STAT_STRUCT *buf);
 #endif
 }