Changeset 656 for trunk/server/source3/lib

Timestamp:

Nov 8, 2011, 6:50:31 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Some more work to get high-mem working

Location:

trunk/server/source3/lib

Files:

• os2helper.c (modified) (6 diffs)
• recvfile.c (modified) (2 diffs)
• select.c (modified) (1 diff)

trunk/server/source3/lib/os2helper.c

@@ -1 @@
-/* This file contains helper functions for OS/2 - 
-   do not try to compile on other platforms! */
+/*  This file contains Samba helper functions for eComStation (OS/2) - 
+ *  do not try to compile on other platforms!
+ *  
+ *  Copyright (C) 2007-2011
+ *                Silvan Scherrer 
+ *                Yuri Dario
+ *                Paul Smedley
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifdef __OS2__
@@ -51 +70 @@
 {
         /* We call __libc_Back_ioFileSizeSet directly instead of 
-           ftruncate to force it not to zero expanding files to optimize
-           samba performance when copying files */
+           ftruncate to force it not to zero expanding files to 
+           optimize Samba performance when copying files */
 
         int rc = __libc_Back_ioFileSizeSet(fd, size, 0);
@@ -65 +84 @@
 int os2_isattribute(char *path, unsigned short attr)
 {
-    HDIR          hdirFindHandle = HDIR_CREATE;
-    FILEFINDBUF3  FindBuffer     = {0};      /* Returned from FindFirst/Next */
-    USHORT        dosattr;                      /* attribute to search for */
-    ULONG         ulResultBufLen = sizeof(FILEFINDBUF3);
-    ULONG         ulFindCount    = 1;        /* Look for 1 file at a time    */
-    APIRET        rc             = NO_ERROR; /* Return code                  */
-    if (attr==aARCH) 
+        HDIR          hdirFindHandle = HDIR_CREATE;
+        FILEFINDBUF3  FindBuffer     = {0};      /* Returned from FindFirst/Next */
+        USHORT        dosattr;                   /* attribute to search for */
+        ULONG         ulResultBufLen = sizeof(FILEFINDBUF3);
+        ULONG         ulFindCount    = 1;        /* Look for 1 file at a time    */
+        APIRET        rc             = NO_ERROR; /* Return code                  */
+        if (attr == aARCH) 
                         dosattr=MUST_HAVE_ARCHIVED;
-    else if (attr==aRONLY)
+        else if (attr == aRONLY)
                         dosattr=MUST_HAVE_READONLY;
-    else if (attr==aSYSTEM)
+        else if (attr == aSYSTEM)
                         dosattr=MUST_HAVE_SYSTEM;
-    else if (attr==aHIDDEN)
+        else if (attr == aHIDDEN)
                         dosattr=MUST_HAVE_HIDDEN;
 
-    rc = DosFindFirst( path,                /* File pattern - all files     */
+        rc = DosFindFirst( path,                 /* File pattern - all files     */
                        &hdirFindHandle,      /* Directory search handle      */
-                        dosattr,
+                       dosattr,
                        &FindBuffer,          /* Result buffer                */
                        ulResultBufLen,       /* Result buffer length         */
@@ -88 +107 @@
                        FIL_STANDARD);        /* Return Level 1 file info     */
 
-   if (rc != NO_ERROR) {
-         rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
-       return 1;
-    } else {
-         rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
+        if (rc != NO_ERROR) {
+                rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
+                return 1;
+        } else {
+                rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
         return 0;
-    } /* endif */
+        } /* endif */
 }
 
@@ -157 +176 @@
 }
 */
+
 // OS/2 specific socketpair() implementation, as it only works in low mem
 int os2_socketpair(int fds[2])
 {
         int mypair[2];
-        int rc = 0;
+        int rc = 0;
 
         rc = socketpair(AF_UNIX, SOCK_STREAM, 0, mypair);
-        if (rc >= 0) {
-                fds[0] = mypair[0];
-                fds[1] = mypair[1];
-        }
+        if (rc >= 0) {
+                fds[0] = mypair[0];
+                fds[1] = mypair[1];
+        }
 
         return rc;
@@ -178 +198 @@
 void os2_randget(char * buffer, int length)
 {
-    UCHAR randbyte();
-    unsigned int idx;
-
-    for (idx=0; idx<length; idx++)
+        UCHAR randbyte();
+        unsigned int idx;
+
+        for (idx=0; idx<length; idx++)
         buffer[idx] = randbyte();
 

trunk/server/source3/lib/recvfile.c

@@ -25 +25 @@
 
 #include "includes.h"
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
 
 /* Do this on our own in TRANSFER_BUF_SIZE chunks.
@@ -174 +177 @@
         }
 
-#ifndef __OS2__
         if ((pipefd[0] == -1) && (pipe(pipefd) == -1)) {
-#else
-        if ((pipefd[0] == -1) && (socketpair(AF_UNIX, SOCK_STREAM,0, pipefd) == -1)) {
-#endif
                 try_splice_call = false;
                 return default_sys_recvfile(fromfd, tofd, offset, count);

trunk/server/source3/lib/select.c

@@ -28 +28 @@
    This means all Samba signal handlers should call sys_select_signal().
 */
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
 
 static pid_t initialised;