Changeset 372

Timestamp:

01/15/10 13:16:04 (2 months ago)

Author:

diver

Message:

remove hardcoded path, remove some files

Location:

branches/samba-3.3.x/source

Files:

• Makefile.in (modified) (1 diff)
• dynconfig.c (modified) (6 diffs)
• include/dynconfig.h# (deleted)
• include/version.h (deleted)
• lib/os2ea.c (modified) (5 diffs)
• lib/os2path.c (added)

branches/samba-3.3.x/source/Makefile.in

@@ -332 +332 @@
           lib/interface.o lib/md4.o \
           lib/pidfile.o \
-          lib/signal.o lib/system.o lib/os2ea.o lib/sendfile.o lib/recvfile.o lib/time.o \
+          lib/signal.o lib/system.o lib/os2ea.o lib/os2path.o lib/sendfile.o lib/recvfile.o lib/time.o \
           lib/ufc.o lib/genrand.o lib/username.o \
           lib/util_pw.o lib/access.o lib/smbrun.o \

branches/samba-3.3.x/source/dynconfig.c

@@ -66 +66 @@
 }
 
+#ifndef __OS2__
 DEFINE_DYN_CONFIG_PARAM(SBINDIR)
 DEFINE_DYN_CONFIG_PARAM(BINDIR)
 DEFINE_DYN_CONFIG_PARAM(SWATDIR)
-#ifndef __OS2__
 DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
 DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
 DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
-#endif
 DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
 DEFINE_DYN_CONFIG_PARAM(LIBDIR)
 DEFINE_DYN_CONFIG_PARAM(MODULESDIR)
+#endif
 DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
 #ifndef __OS2__
@@ -86 +86 @@
 
 #ifdef __OS2__
-static char *dyn_CONFIGFILE; /**< Location of smb.conf file. **/
+
+/* Directory the binary was called from, same as getbindir() */
+static char *dyn_SBINDIR;
+
+const char *get_dyn_SBINDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SBINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+
+        if (dyn_SBINDIR == NULL) {
+                return buffer;
+        }
+        return dyn_SBINDIR;
+}
+
+const char *set_dyn_SBINDIR(const char *newpath)
+{
+        if (dyn_SBINDIR) {
+                SAFE_FREE(dyn_SBINDIR);
+        }
+        dyn_SBINDIR = SMB_STRDUP(newpath);
+        return dyn_SBINDIR;
+}
+
+/* Directory the binary was called from, same as getsbindir() */
+static char *dyn_BINDIR;
+
+const char *get_dyn_BINDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", BINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+
+        if (dyn_BINDIR == NULL) {
+                return buffer;
+        }
+        return dyn_BINDIR;
+}
+
+const char *set_dyn_BINDIR(const char *newpath)
+{
+        if (dyn_BINDIR) {
+                SAFE_FREE(dyn_BINDIR);
+        }
+        dyn_BINDIR = SMB_STRDUP(newpath);
+        return dyn_BINDIR;
+}
+
+/* Directory holding the SWAT files */
+static char *dyn_SWATDIR;
+
+const char *get_dyn_SWATDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SWATDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir,"swat");
+                }
+        }
+
+        if (dyn_SWATDIR == NULL) {
+                return buffer;
+        }
+        return dyn_SWATDIR;
+}
+
+const char *set_dyn_SWATDIR(const char *newpath)
+{
+        if (dyn_SWATDIR) {
+                SAFE_FREE(dyn_SWATDIR);
+        }
+        dyn_SWATDIR = SMB_STRDUP(newpath);
+        return dyn_SWATDIR;
+}
+
+
+/* Location of smb.conf file. */
+static char *dyn_CONFIGFILE;
 
 const char *get_dyn_CONFIGFILE(void)
@@ -183 +282 @@
 }
 
+/* Directory holding the codepages */
+static char *dyn_CODEPAGEDIR;
+
+const char *get_dyn_CODEPAGEDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", CODEPAGEDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "codepages");
+                }
+        }
+
+        if (dyn_CODEPAGEDIR == NULL) {
+                return buffer;
+        }
+        return dyn_CODEPAGEDIR;
+}
+
+const char *set_dyn_CODEPAGEDIR(const char *newpath)
+{
+        if (dyn_CODEPAGEDIR) {
+                SAFE_FREE(dyn_CODEPAGEDIR);
+        }
+        dyn_CODEPAGEDIR = SMB_STRDUP(newpath);
+        return dyn_CODEPAGEDIR;
+}
+
+/* Directory holding the libs */
+static char *dyn_LIBDIR;
+
+const char *get_dyn_LIBDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_LIBDIR == NULL) {
+                return buffer;
+        }
+        return dyn_LIBDIR;
+}
+
+const char *set_dyn_LIBDIR(const char *newpath)
+{
+        if (dyn_LIBDIR) {
+                SAFE_FREE(dyn_LIBDIR);
+        }
+        dyn_LIBDIR = SMB_STRDUP(newpath);
+        return dyn_LIBDIR;
+}
+
+/* Directory holding the modules */
+static char *dyn_MODULESDIR;
+
+const char *get_dyn_MODULESDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", MODULESDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "modules");
+                }
+        }
+
+        if (dyn_MODULESDIR == NULL) {
+                return buffer;
+        }
+        return dyn_MODULESDIR;
+}
+
+const char *set_dyn_MODULESDIR(const char *newpath)
+{
+        if (dyn_MODULESDIR) {
+                SAFE_FREE(dyn_MODULESDIR);
+        }
+        dyn_MODULESDIR = SMB_STRDUP(newpath);
+        return dyn_MODULESDIR;
+}
+
 /**
  * @brief Directory holding lock files.
@@ -213 +408 @@
 }
 
+/* Directory holding the pid files */
 static char *dyn_PIDDIR;
 
@@ -237 +433 @@
 }
 
+/* Location of smbpasswd */
 static char *dyn_SMB_PASSWD_FILE;
 
@@ -261 +458 @@
 }
 
+/* Directory holding the private files */
 static char *dyn_PRIVATE_DIR;
 

branches/samba-3.3.x/source/lib/os2ea.c

@@ -29 +29 @@
 
 #ifndef TESTING
+
+// Samba DEBUG() needs the following includes and defines
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
 #define CMD_KI_RDCNT            (0x63)
-
+#include <stdbool.h>
 #include "local.h"
 #include "xfile.h"
-#define DEBUG(a,b) (0)
-
+#include "debug.h"
 #else
 
@@ -167 +168 @@
 } 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()
@@ -174 +177 @@
     int c;
 
-#ifndef __INNOTEK_LIBC__
     if (hDoscalls == 0) {
         char failed_module[20];
@@ -183 +185 @@
 
         if (rc == 0) {
-            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&DosPerfSysCall);
+            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&pfnDosPerfSysCall);
 
             if (rc) {
-                DosPerfSysCall = NULL;
+                pfnDosPerfSysCall = NULL;
             }
         }
     }
 
-    if (DosPerfSysCall) {
-        if (DosPerfSysCall(CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
+    if (pfnDosPerfSysCall) {
+        if ((*pfnDosPerfSysCall) (CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
             for (c = 0; c < sizeof(util); c++) {
                 byte ^= ((UCHAR *)&util)[c];
@@ -198 +200 @@
         }
         else {
-            DosPerfSysCall = NULL;
+            pfnDosPerfSysCall = NULL;
         }
     }
-#endif
+
     return byte;
 }