Changeset 463 for trunk/server

Timestamp:

Jun 10, 2010, 11:16:45 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: included os2helper from 3.3 instead of os2ea & os2path

Location:

trunk/server/source3

Files:

• Makefile.in (modified) (1 diff)
• build.cmd (modified) (11 diffs)
• lib/os2helper.c (moved) (moved from trunk/server/source3/lib/os2ea.c ) (7 diffs)
• lib/os2path.c (deleted)
• lib/select.c (modified) (1 diff)

trunk/server/source3/Makefile.in

@@ -391 +391 @@
           $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
           lib/interface.o lib/pidfile.o \
-          lib/system.o lib/os2ea.o lib/os2path.o lib/sendfile.o lib/recvfile.o lib/time.o \
+          lib/system.o lib/os2helper.o lib/sendfile.o lib/recvfile.o lib/time.o \
           lib/username.o \
           ../libds/common/flag_mapping.o \

trunk/server/source3/build.cmd

@@ -16 +16 @@
     say "      BRAND - create a branded build"
     say "      MAKE  - just compile changed files"
-    say "      CLUT  - build command line utilities only (N/A)"
-    say "      WPI   - create WPI archive (N/A)"
-    say "      ZIP   - create ZIP archive "
-    say "      ALL   - do just everything (N/A)"
+    say "      CLUT  - build command line utilities only"
+    say "      WPI   - create WPI archive"
+    say "      ZIP   - create ZIP archive"
+    say "      ALL   - do just everything"
     say 
     exit 255
@@ -32 +32 @@
 
 /* defaults */
-make  = "CLEAN"
+make  = ""
 libc  = "064x"
 brand = "No"
 conf  = ""
+verstring = 'x.x.x-3.x.x.xxx-eCS-'date('S')  /* for packaging if branding is disabled */
 
 /* Read profile */
@@ -42 +43 @@
     opt_line = translate(linein(options))
     interpret opt_line
+    call charout , opt_line' '
 end
+say
 ok = stream(options,'c','close')
 
@@ -85 +88 @@
 if conf = "YES" then do
         address cmd 'SETLOCAL'
-/* we do not need that
         address cmd 'SET CFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
         address cmd 'SET CXXFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
@@ -91 +93 @@
         address cmd 'SET AR=emxomfar'
         address cmd 'SET LIBS=-lsocket -lsyslog'
-*/
     /* disabled options:
          --enable-developer --enable-socket-wrapper
@@ -105 +106 @@
 if brand = "YES" then do
     svninfo = ".\svninfo"
-    address cmd 'svn info | grep "^Revision:" | sed -e "s/Revision: *//">'svninfo
+    address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo
     revision = strip(translate(linein(svninfo)))
     ok = stream(svninfo,'c','close')
@@ -111 +112 @@
 end
 
-say build_parms
-'make 2>&1 | tee build.log'
+if make <> "" then do
+    say build_parms
+    address cmd 'make 2>&1 | tee build.log'
+end    
 
 if pos("ZIP", cmdline) > 0 then do
+    say 'Creating "samba-'translate(verstring,'-',' ')'.zip"'
+    ok = SysFileDelete('samba-'translate(verstring,'-',' ')'.zip')
     'cd .\bin'
     'md .\samba'
     'cd .\samba'
-    'move ..\*.exe'
-    'move ..\*.dll'
+    'move ..\*.exe >NUL'
+    'move ..\*.dll >NUL'
     'cd ..'
-    'zip -rpmo9 samba-NEW.zip .\samba\*.exe .\samba\*.dll'
+    'zip -rpo9 samba-'translate(verstring,'-',' ')'.zip .\samba\*.exe .\samba\*.dll'
+    'cd .\samba'
+    'move * .. >NUL'
+    'cd ..'
     'rd .\samba'
     say 'Created ZIP package'
@@ -129 +137 @@
 exit 0
 
-brand: procedure
+brand: procedure expose verstring
     parse arg revision
 
     /* eComStation Version file */
     VerFile = "VERSION.ECS"
-
-    /* is the file available */
-    ok = stream(VerFile, 'c', 'QUERY EXISTS')
-    if ok = "" then do
-        say 'Please create a VERSION.ECS based on VERSION.EC_'
-        exit 0
-    end
 
     /* Samba Version file */
@@ -151 +152 @@
         I = I + 1
         eCSVer.I = linein(VerFile)
+        if left(eCSVer.I,28) = "SAMBA_VERSION_VENDOR_SUFFIX=" then do
+                    parse var eCSver.I . '='vendor_suffix
+                    vendor_suffix = strip(vendor_suffix,,'"')
+                    parse var vendor_suffix vendor suffix
+        end
     end
     ok = stream(VerFile, 'c', 'close')
@@ -161 +167 @@
     do until lines(VERSION) = 0
         verline = linein(VERSION)
+        if left(Verline,20) = "SAMBA_VERSION_MAJOR=" then do
+            parse var verline . '='Major
+        end
+        if left(Verline,20) = "SAMBA_VERSION_MINOR=" then do
+            parse var verline . '='Minor
+        end
+        if left(Verline,22) = "SAMBA_VERSION_RELEASE=" then do
+            parse var verline . '='release
+        end
+        
         do I = 1 to eCSVer.0
             parse var eCSVer.I tag'='strvalue
@@ -173 +189 @@
     ok = stream(Version,'c','close')
     ok = stream(NewVersion,'c','close')
-    address cmd "ksh ./script/mkversion.sh "NewVersion
+    address cmd "ksh ./script/mkversion.sh "NewVersion" >NUL"
     ok = SysFileDelete(NewVersion)
-return
+    verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
+    say "Samba "verstring
+return 

trunk/server/source3/lib/os2helper.c

@@ -1 @@
-/* This file contains helper functions for OS/2 - don't try and compile on other platforms */
+/* This file contains helper functions for OS/2 - 
+   do not try to compile on other platforms! */
 
 #ifdef __OS2__
@@ -10 +11 @@
 #define INCL_DOSMODULEMGR
 #define INCL_DOSERRORS
-//_SMB_H
+
 #include <os2.h>
 #include <stdio.h>
@@ -16 +17 @@
 #include <errno.h>
 #include <types.h>
-
+#include <string.h>
 //YD for tmalloc
 #include <malloc.h>
@@ -42 +43 @@
 #endif
 
-#include <string.h>
-
 #ifndef ENOATTR
 #define ENOATTR 22
@@ -50 +49 @@
 int os2_ftruncate(int fd, off_t size)
 {
-        // We call there __libc_Back_ioFileSizeSet directly instead of 
-        // ftruncate to force it not to zero expanding files to optimize
-        // samba performance when copying files
+        /* We call __libc_Back_ioFileSizeSet directly instead of 
+           ftruncate to force it not to zero expanding files to optimize
+           samba performance when copying files */
+
         int rc = __libc_Back_ioFileSizeSet(fd, size, 0);
         if (rc < 0)
@@ -90 +90 @@
          rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
        return 1;
-
     } else {
          rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
         return 0;
-
     } /* endif */
-
-}
-
-/* Functions below are based on APR random code */
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+}
+
+// we search the path of the .exe and return it
+int os2_GetExePath(char *buff)
+{
+        APIRET rc = NO_ERROR;
+        PPIB ppib = NULL;
+        char sExePath [_MAX_PATH];
+        char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
+
+        // we search for the infoblock to get the module name
+        rc = DosGetInfoBlocks(NULL, &ppib);
+        if (rc != NO_ERROR)
+        {
+                return -1;
+        }
+
+        // with the module name we get the path (including the exe name)
+        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(sExePath), sExePath);
+        if (rc != NO_ERROR)
+        {
+                return -1;
+        }
+
+        // we split to the different values
+        _splitpath(sExePath, sDrive, sDir, NULL, NULL);
+        // strcat(sDrive, sDir);
+        strncat(sDrive, sDir, strlen(sDir) -1);
+        strcpy(buff, sDrive);
+
+        return 0;
+}
+
+/* OS/2-specific random functions. these functions used to be based on APR 
+   random code, but we discovered some nasty problems with it on fast hardware
+   (especially on quadcore) and decided to rewrite it with libc random() */
+ 
 void os2_randget(char * buffer, int length)
 {
@@ -126 +141 @@
 }
 
-/* A bunch of system information like memory & process stats.
- * Not highly random but every bit helps....
- */
-static UCHAR randbyte_sysinfo()
-{
-    UCHAR byte = 0;
-    UCHAR SysVars[100];
-    int b;
-
-    DosQuerySysInfo(1, QSV_FOREGROUND_PROCESS, SysVars, sizeof(SysVars));
-
-    for (b = 0; b < 100; b++) {
-        byte ^= SysVars[b];
-    }
-
-    return byte;
-}
-
-
-
-/* Similar in concept to randbyte_hrtimer() but accesses the CPU's internal
- * counters which run at the CPU's MHz speed. We get separate 
- * idle / busy / interrupt cycle counts which should provide very good 
- * randomness due to interference of hardware events.
- * This only works on newer CPUs (at least PPro or K6) and newer OS/2 versions
- * which is why it's run-time linked.
- */
-
-static HMODULE hDoscalls = 0;
-#define   CMD_KI_RDCNT    (0x63)
-
-typedef struct _CPUUTIL {
-    ULONG ulTimeLow;            /* Low 32 bits of time stamp      */
-    ULONG ulTimeHigh;           /* High 32 bits of time stamp     */
-    ULONG ulIdleLow;            /* Low 32 bits of idle time       */
-    ULONG ulIdleHigh;           /* High 32 bits of idle time      */
-    ULONG ulBusyLow;            /* Low 32 bits of busy time       */
-    ULONG ulBusyHigh;           /* High 32 bits of busy time      */
-    ULONG ulIntrLow;            /* Low 32 bits of interrupt time  */
-    ULONG ulIntrHigh;           /* High 32 bits of interrupt time */
-} CPUUTIL;
-
-APIRET APIENTRY(*pfnDosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, ULONG ulParm2, ULONG ulParm3) = NULL;
-APIRET APIENTRY(*pfnDosQuerySysState) (ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz) = NULL;
-
-static UCHAR randbyte_perf()
-{
-    UCHAR byte = 0;
-    CPUUTIL util;
-    int c;
-
-    if (hDoscalls == 0) {
-        char failed_module[20];
-        ULONG rc;
-
-        rc = DosLoadModule(failed_module, sizeof(failed_module), "DOSCALLS",
-                           &hDoscalls);
-
-        if (rc == 0) {
-            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&pfnDosPerfSysCall);
-
-            if (rc) {
-                pfnDosPerfSysCall = NULL;
-            }
-        }
-    }
-
-    if (pfnDosPerfSysCall) {
-        if ((*pfnDosPerfSysCall) (CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
-            for (c = 0; c < sizeof(util); c++) {
-                byte ^= ((UCHAR *)&util)[c];
-            }
-        }
-        else {
-            pfnDosPerfSysCall = NULL;
-        }
-    }
-
-    return byte;
-}
-
-
-
 UCHAR randbyte()
 {
-    return randbyte_sysinfo() ^ randbyte_perf();
+        int c;
+        UCHAR byte;
+        ULONG ulrandom;
+        ulrandom = random();
+        
+        for (c = 0; c < sizeof(ulrandom); c++) {
+                byte ^= ((UCHAR *)&ulrandom)[c];
+        }
+
+        return byte;
 }
 

trunk/server/source3/lib/select.c

@@ -110 +110 @@
         errno = 0;
         ret = select(maxfd,readfds2,writefds,errorfds,tval);
-
+// @todo why are the above fd_set broken
         if (ret <= 0) {
                 FD_ZERO(readfds2);