Changeset 367 for branches/samba-3.0

Timestamp:

Jan 13, 2010, 7:52:51 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

_divers os2_getExePath applied to BINDIR, SBINDIR and SWATDIR in 3.0.x

Location:

branches/samba-3.0/source

Files:

• dynconfig.c (modified) (9 diffs)
• include/dynconfig.h (modified) (2 diffs)
• lib/os2path.c (modified) (3 diffs)
• lib/popt_common.c (modified) (3 diffs)

branches/samba-3.0/source/dynconfig.c

@@ -41 +41 @@
  **/
 
-char const *dyn_SBINDIR = SBINDIR,
-        *dyn_BINDIR = BINDIR,
-        *dyn_SWATDIR = SWATDIR;
 
 #ifdef __OS2__
+
+/* Directory the binary was called from, same as getbindir() */
+const char * getsbindir()
+{
+        static pstring buffer = "";
+        if (!*buffer)
+        {
+                pstring exedir = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SBINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+        return buffer;
+}
+
+/* Directory the binary was called from, same as getsbindir() */
+const char * getbindir()
+{
+        static pstring buffer = "";
+        if (!*buffer)
+        {
+                pstring exedir = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", BINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+        return buffer;
+}
+
+/* Directory holding the SWAT files */
+const char * getswatdir()
+{
+        static pstring buffer = "";
+        if (!*buffer)
+        {
+                pstring exedir = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SWATDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir,"swat");
+                }
+        }
+        return buffer;
+}
+
+/* Location of smb.conf file. */
 const char * getconfigfile()
 {
@@ -74 +124 @@
 }
 
+/* Log file directory */
 const char * getlogbase()
 {
@@ -84 +135 @@
 }
 
+/* Directory holding lock files */
 const char * getlockdir()
 {
@@ -94 +146 @@
 }
 
+/* Directory holding the pid files */
 const char * getpiddir()
 {
@@ -104 +157 @@
 }
 
+/* Directory holding the private files */
 const char * getprivatedir()
 {
@@ -114 +168 @@
 }
 
+/* Location of smbpasswd */
 const char * getsmbpasswd()
 {
@@ -124 +179 @@
 }
 
+/* Statically configured LanMan hosts */
 const char * getlmhosts()
 {
@@ -139 +195 @@
  * @sa lib_path() to get the path to a file inside the LIBDIR.
  **/
-// we try to set the libdir based on the current running process
+// SCS we try to set the libdir based on the current running process
 const char * getlibdir()
 {
@@ -158 +214 @@
 fstring dyn_SHLIBEXT = SHLIBEXT;
 
-
 #else
 
-pstring dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/
+char const *dyn_SBINDIR = SBINDIR,
+        *dyn_BINDIR = BINDIR,
+        *dyn_SWATDIR = SWATDIR;
+
+/**< Location of smb.conf file. **/
+pstring dyn_CONFIGFILE = CONFIGFILE; 
 
 /** Log file directory. **/

branches/samba-3.0/source/include/dynconfig.h

@@ -25 +25 @@
  **/
 
-extern char const *dyn_SBINDIR,
-        *dyn_BINDIR,
-        *dyn_SWATDIR;
-
 #ifdef __OS2__
+#define dyn_SBINDIR (getsbindir())
+#define dyn_BINDIR (getbindir())
+#define dyn_SWATDIR (getswatdir())
 #define dyn_CONFIGFILE (getconfigfile())
 #define dyn_LOGFILEBASE (getlogbase())
@@ -39 +38 @@
 #define dyn_LIBDIR (getlibdir())
 #else
+extern char const *dyn_SBINDIR,
+        *dyn_BINDIR,
+        *dyn_SWATDIR;
 extern pstring dyn_CONFIGFILE;
 extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;

branches/samba-3.0/source/lib/os2path.c

@@ -11 +11 @@
 #include <string.h>
 
-// samba DEBUG() needs the following includes and defines
+// Samba DEBUG() needs the following includes and defines
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
 #include "pstring.h"
@@ -21 +21 @@
 int os2_GetExePath(char *buff)
 {
-        APIRET rc = NO_ERROR;
-        PPIB ppib = NULL;
-        char sExePath [_MAX_PATH];
-        char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
+        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);
+        rc = DosGetInfoBlocks(NULL, &ppib);
         if (rc != NO_ERROR)
         {
@@ -33 +33 @@
         }
 
-        // wit 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;
-        }
+        // 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 spitt to the different values
-        _splitpath(sExePath, sDrive, sDir, NULL, NULL);
-        // strcat(sDrive, sDir);
-        strncat(sDrive, sDir, strlen(sDir) -1);
-        strcpy(buff, sDrive);
+        // 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;

branches/samba-3.0/source/lib/popt_common.c

@@ -186 +186 @@
         case DYN_SBINDIR:
                 if (arg) {
+#ifdef __OS2__
+                        pstrcpy(dyn_SBINDIR, arg);
+#else
                         dyn_SBINDIR = SMB_STRDUP(arg);
+#endif
                 }
                 break;
@@ -192 +196 @@
         case DYN_BINDIR:
                 if (arg) {
+#ifdef __OS2__
+                        pstrcpy(dyn_BINDIR, arg);
+#else
                         dyn_BINDIR = SMB_STRDUP(arg);
+#endif
                 }
                 break;
@@ -198 +206 @@
         case DYN_SWATDIR:
                 if (arg) {
+#ifdef __OS2__
+                        pstrcpy(dyn_SWATDIR, arg);
+#else
                         dyn_SWATDIR = SMB_STRDUP(arg);
+#endif
                 }
                 break;