Changeset 2803 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Feb 16, 2000, 3:28:28 PM (26 years ago)

Author:

sandervl

Message:

Added new logging feature

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (4 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.18 2000-02-08 22:29:15 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.19 2000-02-16 14:25:45 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -27 +27 @@
 #include "dosqss.h"
 
+#define DBG_LOCALLOG    DBG_oslibdos
+#include "dbglocal.h"
+
 /***********************************
  * PH: fixups for missing os2win.h *
@@ -344 +347 @@
 }
 //******************************************************************************
+DWORD WIN32API GetEnvironmentVariableA(LPCSTR, LPSTR, DWORD );
 //******************************************************************************
 DWORD OSLibDosSearchPath(DWORD cmd, char *path, char *name, char *full_name, 
@@ -377 +381 @@
   case OSLIB_SEARCHENV:
   {
-   PCSZ envstring;
-   CHAR szResult[CCHMAXPATH];
-
-        if(DosScanEnv(path, &envstring) != 0) {
+   LPSTR envstring;
+   int   envsize;
+   CHAR  szResult[CCHMAXPATH];
+
+        envsize = GetEnvironmentVariableA(path, NULL, 0);
+        envstring = (LPSTR)malloc(envsize+1);
+        GetEnvironmentVariableA(path, envstring, envsize);
+        if(DosSearchPath(SEARCH_IGNORENETERRS, envstring,
+                         name, szResult, sizeof(szResult)) != 0) {
+                free(envstring);
                 return 0;
         }
-        if(DosSearchPath(SEARCH_IGNORENETERRS, envstring,
-                         name, szResult, sizeof(szResult)) != 0) {
-                return 0;
-        }
+        free(envstring);
         strcpy(full_name, szResult);
         return strlen(full_name);