Changeset 2875 for trunk/kLdr/kLdrDyldFind.c

Timestamp:

Nov 12, 2006, 9:59:45 AM (19 years ago)

Author:

bird

Message:

Got the stub loader working (but without stack allocation/switching).

File:

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

trunk/kLdr/kLdrDyldFind.c

@@ -105 +105 @@
 /** @name The kLdr search method parameters.
  * @{ */
+/** The kLdr EXE search path.
+ * During EXE searching the it's initialized with the values of the KLDR_PATH and
+ * the PATH env.vars. Both ';' and ':' can be used as separators.
+ */
+char            kLdrDyldExePath[8192];
 /** The kLdr DLL search path.
  * During initialization the KLDR_LIBRARY_PATH env.var. and the path in the
  * executable stub is appended. Both ';' and ':' can be used as separators.
  */
-char            kLdrDyldPath[8192];
+char            kLdrDyldLibraryPath[8192];
 /** The kLdr application directory.
  * This is initialized when the executable is 'loaded' or by a kLdr user.
@@ -195 +200 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int kldrDyldFindDoSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
+static int kldrDyldFindDoDllSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
                                 KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr);
+static int kldrDyldFindDoExeSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
+                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr);
 static int kldrDyldFindTryOpen(const char *pszFilename, PPKLDRRDR ppRdr);
 static int kldrDyldFindTryOpenPath(const char *pchPath, size_t cchPath, PCKLDRDYLDFINDARGS pArgs);
 static int kldrDyldFindEnumeratePath(const char *pszSearchPath, PCKLDRDYLDFINDARGS pArgs);
-static int kldrDyldFindGetDefaults(KLDRDYLDSEARCH *penmSearch, const char **pszPrefix, const char **pszSuffix, const char *pszName);
+static int kldrDyldFindGetDefaults(KLDRDYLDSEARCH *penmSearch, const char **pszPrefix,
+                                   const char **pszSuffix, const char *pszName, uint32_t fFlags);
 
 
@@ -217 +225 @@
      * The kLdr search parameters.
      */
-    rc = kldrHlpGetEnv("KLDR_LIBRARY_PATH", kLdrDyldPath, sizeof(kLdrDyldPath));
+    rc = kldrHlpGetEnv("KLDR_LIBRARY_PATH", kLdrDyldLibraryPath, sizeof(kLdrDyldLibraryPath));
     rc = kldrHlpGetEnv("KLDR_DEF_PREFIX", szTmp, sizeof(szTmp));
     if (!rc)
@@ -358 +366 @@
     if (!kldrHlpIsFilenameOnly(pszName))
         rc = kldrDyldFindTryOpen(pszName, &pRdr);
+    else if (!(fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE))
+        rc = kldrDyldFindDoDllSearch(pszName, pszPrefix, pszSuffix, enmSearch, fFlags, &pRdr);
     else
-        rc = kldrDyldFindDoSearch(pszName, pszPrefix, pszSuffix, enmSearch, fFlags, &pRdr);
+        rc = kldrDyldFindDoExeSearch(pszName, pszPrefix, pszSuffix, enmSearch, fFlags, &pRdr);
     if (!rc)
     {
@@ -411 +421 @@
 
 /**
- * Searches for a file using the specified method.
+ * Searches for a DLL file using the specified method.
  *
  * @returns 0 on success and *ppMod pointing to the new module.
@@ -423 +433 @@
  * @param   ppRdr       Where to store the pointer to the file provider instance on success.
  */
-static int kldrDyldFindDoSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
-                                KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr)
+static int kldrDyldFindDoDllSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
+                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr)
 {
     int rc;
@@ -435 +445 @@
     Args.pszPrefix = pszPrefix;
     Args.pszSuffix = pszSuffix;
-    rc = kldrDyldFindGetDefaults(&Args.enmSearch, &Args.pszPrefix, &Args.pszSuffix, pszName);
+    rc = kldrDyldFindGetDefaults(&Args.enmSearch, &Args.pszPrefix, &Args.pszSuffix, pszName, fFlags);
     if (rc)
         return rc;
@@ -464 +474 @@
             if (rc != KLDR_ERR_MODULE_NOT_FOUND)
                 break;
-            rc = kldrDyldFindEnumeratePath(kLdrDyldPath, &Args);
+            rc = kldrDyldFindEnumeratePath(kLdrDyldLibraryPath, &Args);
             break;
         }
@@ -525 +535 @@
 
 /**
+ * Searches for an EXE file using the specified method.
+ *
+ * @returns 0 on success and *ppMod pointing to the new module.
+ * @returns KLDR_ERR_MODULE_NOT_FOUND if the specified file couldn't be opened.
+ * @returns non-zero kLdr or OS specific status code on other failures.
+ * @param   pszName     The name.
+ * @param   pszPrefix   The prefix, optional.
+ * @param   pszSuffix   The suffix, optional.
+ * @param   enmSearch   The search method.
+ * @param   fFlags      The load/search flags.
+ * @param   ppRdr       Where to store the pointer to the file provider instance on success.
+ */
+static int kldrDyldFindDoExeSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
+                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr)
+{
+    int rc;
+    KLDRDYLDFINDARGS Args;
+
+    /*
+     * Initialize the argument structure and resolve defaults.
+     */
+    Args.enmSearch = enmSearch;
+    Args.pszPrefix = pszPrefix;
+    Args.pszSuffix = pszSuffix;
+    rc = kldrDyldFindGetDefaults(&Args.enmSearch, &Args.pszPrefix, &Args.pszSuffix, pszName, fFlags);
+    if (rc)
+        return rc;
+    Args.pszName = pszName;
+    Args.cchName = kLdrHlpStrLen(pszName);
+    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;
+    Args.ppRdr = ppRdr;
+
+    /*
+     * If we're bootstrapping a process, we'll start by looking in the
+     * application directory and the check out the path.
+     */
+    if (g_fBootstrapping)
+    {
+        kldrDyldFindLazyInitAppDir();
+        if (kLdrDyldAppDir[0] != '\0')
+        {
+            rc = kldrDyldFindTryOpenPath(kLdrDyldAppDir, kLdrHlpStrLen(kLdrDyldAppDir), &Args);
+            if (rc != KLDR_ERR_MODULE_NOT_FOUND)
+                return rc;
+        }
+    }
+
+    /*
+     * Search the EXE search path. Initialize it the first time around.
+     */
+    if (!kLdrDyldExePath[0])
+    {
+        size_t cch;
+        kldrHlpGetEnv("KLDR_EXE_PATH", kLdrDyldExePath, sizeof(kLdrDyldExePath) - 10);
+        cch = kLdrHlpStrLen(kLdrDyldExePath);
+        kLdrDyldExePath[cch++] = ';';
+        kldrHlpGetEnv("PATH", &kLdrDyldExePath[cch], sizeof(kLdrDyldExePath) - cch);
+    }
+    return kldrDyldFindEnumeratePath(kLdrDyldExePath, &Args);
+}
+
+
+/**
  * Try open the specfied file.
  *
@@ -565 +641 @@
     static char s_szFilename[1024];
     char *psz;
+    int rc;
 
     /*
@@ -612 +689 @@
     *psz = '\0';
 
+
     /*
      * Try open it.
      */
-    return kldrDyldFindTryOpen(s_szFilename, pArgs->ppRdr);
+    rc = kldrDyldFindTryOpen(s_szFilename, pArgs->ppRdr);
+    /* If we're opening an executable, try again without the suffix.*/
+    if (    rc
+        &&  pArgs->cchSuffix
+        &&  (pArgs->fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE))
+    {
+        psz -= pArgs->cchSuffix;
+        *psz = '\0';
+        rc = kldrDyldFindTryOpen(s_szFilename, pArgs->ppRdr);
+    }
+    return rc;
 }
 
@@ -689 +777 @@
  * @param   ppszSuffix  The suffix. In/Out.
  * @param   pszName     The name. In.
+ * @param   fFlags      The load/search flags.
  */
 static int kldrDyldFindGetDefaults(KLDRDYLDSEARCH *penmSearch, const char **ppszPrefix, const char **ppszSuffix,
-                                   const char *pszName)
+                                   const char *pszName, uint32_t fFlags)
 {
     unsigned fCaseSensitive;
@@ -722 +811 @@
         case KLDRDYLD_SEARCH_OS2:
             if (!*ppszSuffix)
-                *ppszSuffix = ".dll";
+                *ppszSuffix = !(fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE) ? ".dll" : ".exe";
             fCaseSensitive = 0;
             break;
@@ -729 +818 @@
         case KLDRDYLD_SEARCH_WINDOWS_ALTERED:
             if (!*ppszSuffix)
-                *ppszSuffix = ".dll";
+                *ppszSuffix = !(fFlags & KLDRDYLD_LOAD_FLAGS_EXECUTABLE) ? ".dll" : ".exe";
             fCaseSensitive = 0;
             break;
@@ -790 +879 @@
      * Defaults.
      */
-    rc = kldrDyldFindGetDefaults(&enmSearch, &pszPrefix, &pszSuffix, pszName);
+    rc = kldrDyldFindGetDefaults(&enmSearch, &pszPrefix, &pszSuffix, pszName, fFlags);
     if (rc)
         return rc;
@@ -812 +901 @@
         PKLDRRDR pRdr;
         if (fOS2LibpathStrict)
-            rc = kldrDyldFindDoSearch(pszName, pszPrefix, pszSuffix, enmSearch, fFlags, &pRdr);
+            rc = kldrDyldFindDoDllSearch(pszName, pszPrefix, pszSuffix, enmSearch, fFlags, &pRdr);
         else
             rc = kldrDyldFindTryOpen(pszName, &pRdr);