Changeset 902 for trunk/server/source3

Timestamp:

Apr 1, 2016, 8:48:05 PM (9 years ago)

Author:

Silvan Scherrer

Message:

samba server: remove -Zbin-files, more bin work done

File:

• trunk/server/source3/lib/system.c (modified) (2 diffs)

trunk/server/source3/lib/system.c

@@ -817 +817 @@
 int sys_open(const char *path, int oflag, mode_t mode)
 {
+        int oflagNew = 0;
+#ifdef __OS2__
+        oflagNew = oflag | O_BINARY;
+#else
+        oflagNew = oflag;
+#endif
 #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OPEN64)
-        return open64(path, oflag, mode);
-#else
-        return open(path, oflag, mode);
+        return open64(path, oflagNew, mode);
+#else
+        return open(path, oflagNew, mode);
 #endif
 }
@@ -830 +836 @@
 FILE *sys_fopen(const char *path, const char *type)
 {
+#ifdef __OS2__
+        FILE *fd = NULL;
+        char *typeNew = malloc(strlen(type) +2);
+        if (typeNew == NULL)
+           return fopen(path, type);
+
+        memset(typeNew, '\0', sizeof(typeNew));
+        strncpy(typeNew, type, strlen(type));
+        strncat (typeNew, (const char*)'b', 1);
+        fd = fopen(path, typeNew);
+        free(typeNew);
+        return fd;
+#else
+
 #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_FOPEN64)
         return fopen64(path, type);
 #else
         return fopen(path, type);
+#endif
+
 #endif
 }