Changeset 586

Timestamp:

Jun 28, 2011, 6:50:51 PM (14 years ago)

Author:

Silvan Scherrer

Message:

samba server 3.5: reworked os2_getexename()

Location:

trunk/server/source3

Files:

• dynconfig.c (modified) (8 diffs)
• lib/os2helper.c (modified) (5 diffs)
• version.ec_ (modified) (1 diff)

trunk/server/source3/dynconfig.c ¶

@@ -112 +112 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", SBINDIR);
@@ -133 +133 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", BINDIR);
@@ -154 +154 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", SWATDIR);
@@ -235 +235 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", CODEPAGEDIR);
@@ -256 +256 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", LIBDIR);
@@ -277 +277 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", MODULESDIR);
@@ -359 +359 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", LIBDIR);
@@ -380 +380 @@
         {
                 char exedir[1024] = "";
-                if (os2_GetExePath(exedir) != 0)
+                if (!os2_GetExePath(exedir))
                 {
                         snprintf(buffer, 260, "%s", NCALRPCDIR);

trunk/server/source3/lib/os2helper.c ¶

@@ -97 +97 @@
 
 // get the exe name (including path)
-bool os2_GetExeName(char *sExeName)
+bool os2_GetExeName(char *sExeName, int lExeName)
 {
         APIRET rc = NO_ERROR;
@@ -110 +110 @@
 
         // 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)
         {
@@ -124 +124 @@
         char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
 
-        if (!os2_GetExeName(sExeName))
+        if (!os2_GetExeName(sExeName, sizeof(sExeName)))
                 return false;
 
@@ -133 +133 @@
         strcpy(buff, sDrive);
 
-        return 0;
+        return true;
 }
 
@@ -142 +142 @@
         char sDrive [_MAX_PATH], sDir [_MAX_DIR], sName[_MAX_PATH]; 
 
-        if (!os2_GetExeName(sExeName))
+        if (!os2_GetExeName(sExeName, sizeof(sExeName)))
                 return false;
 

trunk/server/source3/version.ec_ ¶

@@ -1 @@
-SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.1.0"
+SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.2.0"
 SAMBA_VERSION_VENDOR_PATCH=432