Changeset 2869 for trunk/kLdr/kLdrDyldFind.c

Timestamp:

Nov 12, 2006, 3:47:25 AM (19 years ago)

Author:

bird

Message:

the simple testcase works.

File:

• trunk/kLdr/kLdrDyldFind.c (modified) (10 diffs)

trunk/kLdr/kLdrDyldFind.c

@@ -218 +218 @@
      */
     rc = kldrHlpGetEnv("KLDR_LIBRARY_PATH", kLdrDyldPath, sizeof(kLdrDyldPath));
-    if (rc)
-        kLdrDyldPath[0] = '\0';
-
     rc = kldrHlpGetEnv("KLDR_DEF_PREFIX", szTmp, sizeof(szTmp));
     if (!rc)
         kLdrHlpMemCopy(kLdrDyldDefPrefix, szTmp, sizeof(szTmp));
-
     rc = kldrHlpGetEnv("KLDR_DEF_SUFFIX", szTmp, sizeof(szTmp));
     if (!rc)
@@ -249 +245 @@
     kldrHlpGetEnv("KLDR_OS2_LIBPATH", kLdrDyldOS2Libpath, sizeof(kLdrDyldOS2Libpath));
     kldrHlpGetEnv("KLDR_OS2_LIBPATHSTRICT", kLdrDyldOS2LibpathStrict, sizeof(kLdrDyldOS2LibpathStrict));
+    if (    kLdrDyldOS2LibpathStrict[0] == 'T'
+        ||  kLdrDyldOS2LibpathStrict[0] == 't')
+        kLdrDyldOS2LibpathStrict[0] = 'T';
+    else
+        kLdrDyldOS2LibpathStrict[0] = '\0';
+    kLdrDyldOS2LibpathStrict[1] = '\0';
     kldrHlpGetEnv("KLDR_OS2_BEGINLIBPATH", kLdrDyldOS2BeginLibpath, sizeof(kLdrDyldOS2BeginLibpath));
     kldrHlpGetEnv("KLDR_OS2_ENDLIBPATH", kLdrDyldOS2EndLibpath, sizeof(kLdrDyldOS2EndLibpath));
@@ -267 +269 @@
     kldrHlpGetEnv("KLDR_WINDOWS_SYSTEM_DIR", kLdrDyldWindowsSystemDir, sizeof(kLdrDyldWindowsSystemDir));
     kldrHlpGetEnv("KLDR_WINDOWS_DIR", kLdrDyldWindowsDir, sizeof(kLdrDyldWindowsDir));
-    kldrHlpGetEnv("KLDR_WINDOWS_PATH", kLdrDyldWindowsPath, sizeof(kLdrDyldWindowsPath));
+    rc = kldrHlpGetEnv("KLDR_WINDOWS_PATH", kLdrDyldWindowsPath, sizeof(kLdrDyldWindowsPath));
+    if (rc)
+        kldrHlpGetEnv("PATH", kLdrDyldWindowsPath, sizeof(kLdrDyldWindowsPath));
 #endif
 
@@ -279 +283 @@
     (void)cch;
     return 0;
+}
+
+
+/**
+ * Lazily initialize the two application directory paths.
+ */
+static void kldrDyldFindLazyInitAppDir(void)
+{
+    if (!kLdrDyldAppDir[0])
+    {
+#if defined(__OS2__)
+        PPIB pPib;
+        PTIB pTib;
+        APIRET rc;
+
+        DosGetInfoBlocks(&pTib, &pPib);
+        rc = DosQueryModuleName(pPib->pib_hmte, sizeof(kLdrDyldAppDir), kLdrDyldAppDir);
+        if (!rc)
+        {
+            *kldrHlpGetFilename(kLdrDyldAppDir) = '\0';
+             kLdrHlpMemCopy(kLdrDyldWindowsAppDir, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
+        }
+        else
+        {
+            kLdrDyldWindowsAppDir[0] = kLdrDyldAppDir[0] = '.';
+            kLdrDyldWindowsAppDir[1] = kLdrDyldAppDir[1] = '\0';
+        }
+
+
+#elif defined(__WIN__)
+        DWORD dwSize = GetModuleFileName(NULL /* the executable */, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
+        if (dwSize > 0)
+        {
+            *kldrHlpGetFilename(kLdrDyldAppDir) = '\0';
+            kLdrHlpMemCopy(kLdrDyldWindowsAppDir, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
+        }
+        else
+        {
+            kLdrDyldWindowsAppDir[0] = kLdrDyldAppDir[0] = '.';
+            kLdrDyldWindowsAppDir[1] = kLdrDyldAppDir[1] = '\0';
+        }
+
+#else
+# error "Port me"
+#endif
+    }
 }
 
@@ -390 +440 @@
     Args.pszName = pszName;
     Args.cchName = kLdrHlpStrLen(pszName);
-    Args.cchPrefix = Args.pszPrefix ? kLdrHlpStrLen(pszPrefix) : 0;
-    Args.cchSuffix = Args.pszSuffix ? kLdrHlpStrLen(pszSuffix) : 0;
+    Args.cchPrefix = Args.pszPrefix ? kLdrHlpStrLen(Args.pszPrefix) : 0;
+    Args.cchSuffix = Args.pszSuffix ? kLdrHlpStrLen(Args.pszSuffix) : 0;
     Args.cchMaxLength = Args.cchName + Args.cchSuffix + Args.cchPrefix;
     Args.fFlags = fFlags;
@@ -400 +450 @@
      */
 /** @todo get rid of the strlen() on the various paths here! */
-    switch (enmSearch)
+    switch (Args.enmSearch)
     {
         case KLDRDYLD_SEARCH_KLDR:
         {
+            kldrDyldFindLazyInitAppDir();
             if (kLdrDyldAppDir[0] != '\0')
             {
@@ -432 +483 @@
         case KLDRDYLD_SEARCH_WINDOWS_ALTERED:
         {
+            kldrDyldFindLazyInitAppDir();
             rc = kldrDyldFindTryOpenPath(kLdrDyldWindowsAppDir, kLdrHlpStrLen(kLdrDyldWindowsAppDir), &Args);
             if (rc != KLDR_ERR_MODULE_NOT_FOUND)
                 break;
-            if (enmSearch == KLDRDYLD_SEARCH_WINDOWS_ALTERED)
+            if (Args.enmSearch == KLDRDYLD_SEARCH_WINDOWS_ALTERED)
             {
                 rc = kldrDyldFindTryOpenPath(".", 1, &Args);
@@ -447 +499 @@
             if (rc != KLDR_ERR_MODULE_NOT_FOUND)
                 break;
-            if (enmSearch == KLDRDYLD_SEARCH_WINDOWS)
+            if (Args.enmSearch == KLDRDYLD_SEARCH_WINDOWS)
             {
                 rc = kldrDyldFindTryOpenPath(".", 1, &Args);
@@ -513 +565 @@
     static char s_szFilename[1024];
     char *psz;
+
+    /*
+     * Ignore any attempts at opening empty paths.
+     * This can happen when a *Dir globals is empty.
+     */
+    if (!cchPath)
+        return KLDR_ERR_MODULE_NOT_FOUND; /* ignore */
 
     /*
@@ -692 +751 @@
         if (    cchName > cchSuffix
             &&  (   fCaseSensitive
-                 ?  kLdrHlpMemComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix)
-                 :  kLdrHlpMemIComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix))
+                 ?  !kLdrHlpMemComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix)
+                 :  !kLdrHlpMemIComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix))
            )
             *ppszSuffix = NULL;