Changeset 367 for branches/samba-3.0/source/lib

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/lib

Files:

• os2path.c (modified) (3 diffs)
• popt_common.c (modified) (3 diffs)

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;