Changeset 147

Timestamp:

08/19/08 15:26:53 (4 months ago)

Author:

ydario

Message:

Map errno smb errors to OS/2 error codes. Minor build system rework.

Location:

branches/client-1.5/src

Files:

• Config.km_ (modified) (1 diff)
• Makefile.kmk (modified) (4 diffs)
• ndpsmb.c (modified) (1 diff)
• smbwrp.c (modified) (3 diffs)
• util.c (added)
• util.h (added)

branches/client-1.5/src/Config.km_

@@ -5 +5 @@
 VERSION = 1.4.9
 BUILD   = Alpha_1
-SAMBA   = ../../samba-3.0/source
+SAMBA   = ../../samba-3.0
 TOOLKIT = f:/dev/toolkit452

branches/client-1.5/src/Makefile.kmk

@@ -2 +2 @@
 # please define (as env variables or kmk command line) the following variables before starting:
 # BUILD_PLATFORM = os2
-# BUILD_MODE = release|debug
+# BUILD_TYPE = release|debug
 #
 # Copy Config.km_ to Config.kmk and edit it to match your installation.
@@ -13 +13 @@
 DLLS = ndpsmb
 
-#ndpsmb_INST = $(DEPTH)/bin
 ndpsmb_SOURCES = \
         rc/rc.rc \
@@ -20 +19 @@
         debug.c \
         printf.c \
+        util.c \
         smbwrp.c
 
-ndpsmb_CFLAGS = -s -Zomf -O3 -march=pentium -mcpu=pentium4
-ndpsmb_LDFLAGS = -s -Zomf -Zno-fork -Zmap -Zbin-files
-ndpsmb_CFLAGS.debug = -g -Zomf -O0 -march=pentium -mcpu=pentium4 -DDEBUG_PRINTF
-ndpsmb_LDFLAGS.debug = -g -Zomf -Zno-fork -Zmap -Zbin-files
+ndpsmb_CFLAGS = -Zomf
+ndpsmb_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium4
+ndpsmb_CFLAGS.debug = -g -O0 -DDEBUG_PRINTF
+ndpsmb_LDFLAGS = -Zomf -Zno-fork -Zmap -Zbin-files
+ndpsmb_LDFLAGS.release = -s
+ndpsmb_LDFLAGS.debug = -g
 
 ndpsmb_DEFS = 
 ndpsmb_INCS = ./h ./rc \
-                $(SAMBA) \
-                $(SAMBA)/include \
-                $(SAMBA)/lib/replace \
-                $(SAMBA)/popt \
-                $(SAMBA)/lib/talloc \
-                $(SAMBA)/librpc \
-                $(SAMBA)/tdb/include
+                $(SAMBA)/source \
+                $(SAMBA)/source/include \
+                $(SAMBA)/source/lib/replace \
+                $(SAMBA)/source/popt \
+                $(SAMBA)/source/lib/talloc \
+                $(SAMBA)/source/librpc \
+                $(SAMBA)/source/tdb/include
 
 ndpsmb_LIBS = libsmbclient.a socket.a
-ndpsmb_LIBPATH = $(SAMBA)/bin
+ndpsmb_LIBPATH = $(SAMBA)/source/bin
 
-ndpsmb_CLEAN = rc/description.rc ndpsmb.hlp
+ndpsmb_CLEAN = rc/description.rc $(PATH_BIN)/ndpsmb.hlp
 
 #build other files (e.g. help)
-OTHERS = ndpsmb.hlp
+OTHERS = $(PATH_BIN)/ndpsmb.hlp
 
-# without this rule, kmk will fail!
-PROGRAMS =
-
+# now include standard code
 include $(PATH_KBUILD)/rules.kMk
 
@@ -60 +60 @@
         @BldLevelInf0.cmd $(VERSION) $(BUILD)
 
-ndpsmb.hlp: ./rc/rc.ipf ./rc/rc.h ./H/hmacros.h config.kmk
+$(PATH_BIN)/ndpsmb.hlp: ./rc/rc.ipf ./rc/rc.h ./H/hmacros.h config.kmk
         -gcc -E -I./h -I./rc -x c ./rc/rc.ipf > rc.i
-        $(TOOLKIT)\bin\ipfc.exe rc.i ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
+        -@mkdir $(PATH_BIN)
+        $(TOOLKIT)\bin\ipfc.exe rc.i $(PATH_BIN)/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
         rm rc.i
 

branches/client-1.5/src/ndpsmb.c

@@ -7 +7 @@
 #define INCL_LONGLONG
 #include <ndextpl2.h>
-#include <smbwrp.h>
+#include "smbwrp.h"
+#include "util.h"
 
 #ifndef DEBUG_PRINTF

branches/client-1.5/src/smbwrp.c

@@ -89 +89 @@
 /*
  * Wrapper for cli_errno to return not connected error on negative fd
+ * Now returns an OS/2 return code instead of lerrno.
  */
 int os2cli_errno(cli_state * cli)
@@ -96 +97 @@
                 return ENOTCONN;
         }
-        return cli_errno(cli);
+        return maperror(cli_errno(cli));
 }
 
@@ -1699 +1700 @@
 }
 
-
-char * getlastslash(char * path)
-{
-        char * p;
-        if (!path)
-        {
-                return NULL;
-        }
-        for (p = path + strlen(path) - 1; p >= path; p--)
-        {
-                if (*p == '\\' || *p == '/')
-                {
-                        return p;
-                }
-        }
-        return NULL;
-}
-