Changeset 585 for branches

Timestamp:

Jun 28, 2011, 6:49:53 PM (14 years ago)

Author:

Silvan Scherrer

Message:

samba server 3.3: reworked os2_getexename()

Location:

branches/samba-3.3.x/source

Files:

• dynconfig.c (modified) (7 diffs)
• lib/os2helper.c (modified) (5 diffs)

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

@@ -110 +110 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", SBINDIR);
@@ -131 +131 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", BINDIR);
@@ -152 +152 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", SWATDIR);
@@ -233 +233 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", CODEPAGEDIR);
@@ -254 +254 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", LIBDIR);
@@ -275 +275 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", MODULESDIR);
@@ -357 +357 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", LIBDIR);

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

@@ -96 +96 @@
 
 // get the exe name (including path)
-bool os2_GetExeName(char *sExeName)
+bool os2_GetExeName(char *sExeName, int lExeName)
 {
         APIRET rc = NO_ERROR;
@@ -109 +109 @@
 
         // with the module name we get the path (including the exe name)
-        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(sExeName), sExeName);
+        rc = DosQueryModuleName(ppib->pib_hmte, lExeName, sExeName);
         if (rc != NO_ERROR)
         {
@@ -123 +123 @@
         char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
 
-        if (!os2_GetExeName(sExeName))
+        if (!os2_GetExeName(sExeName, sizeof(sExeName)))
                 return false;
 
@@ -132 +132 @@
         strcpy(buff, sDrive);
 
-        return 0;
+        return true;
 }
 
@@ -141 +141 @@
         char sDrive [_MAX_PATH], sDir [_MAX_DIR], sName[_MAX_PATH]; 
 
-        if (!os2_GetExeName(sExeName))
+        if (!os2_GetExeName(sExeName, sizeof(sExeName)))
                 return false;