Changeset 2867 for trunk/kLdr/kLdrDyld.c

Timestamp:

Nov 11, 2006, 10:33:17 AM (19 years ago)

Author:

bird

Message:

top half of the filesearching is done.

File:

• trunk/kLdr/kLdrDyld.c (modified) (2 diffs)

trunk/kLdr/kLdrDyld.c

@@ -94 +94 @@
 char            g_szkLdrDyldError[1024];
 
-/** The Library search path. */
-char            kLdrDyldLibraryPath[4096];
-
 /** The default flags. */
 uint32_t        kLdrDyldFlags = 0;
 /** The default search method. */
 KLDRDYLDSEARCH  kLdrDyldSearch = KLDRDYLD_SEARCH_INVALID;
-/** The default DLL prefix. */
-char            kLdrDyldDefPrefix[16];
-/** The default DLL suffix. */
-char            kLdrDyldDefSuffix[16];
 
 
@@ -236 +229 @@
 void kldrDoDyldLoadExe(PKLDREXEARGS pArgs)
 {
-    void *pvStack = NULL;
-    size_t cbStack = 0;
-    PKLDRDYLDMOD pExe = NULL;
+    void *pvStack;
+    size_t cbStack;
+    PKLDRDYLDMOD pExe;
     int rc;
 
     /*
-     * Copy the arguments into the globals and do loader init.
+     * Copy the arguments into the globals and do loader init (probably already initialized).
      */
     kLdrDyldFlags = pArgs->fFlags;
     kLdrDyldSearch = pArgs->enmSearch;
-    kLdrHlpMemCopy(kLdrDyldDefPrefix, pArgs->szDefPrefix, KLDR_MIN(sizeof(pArgs->szDefPrefix), sizeof(kLdrDyldDefPrefix)));
-    kLdrHlpMemCopy(kLdrDyldDefSuffix, pArgs->szDefSuffix, KLDR_MIN(sizeof(pArgs->szDefSuffix), sizeof(kLdrDyldDefSuffix)));
-    kLdrHlpMemCopy(kLdrDyldLibraryPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), sizeof(kLdrDyldLibraryPath)));
+    if (pArgs->szDefPrefix[0] != '\0')
+        kLdrHlpMemCopy(kLdrDyldDefPrefix, pArgs->szDefPrefix, KLDR_MIN(sizeof(pArgs->szDefPrefix), sizeof(kLdrDyldDefPrefix)));
+    if (pArgs->szDefSuffix[0] != '\0')
+        kLdrHlpMemCopy(kLdrDyldDefSuffix, pArgs->szDefSuffix, KLDR_MIN(sizeof(pArgs->szDefSuffix), sizeof(kLdrDyldDefSuffix)));
+    /* append */ /** @todo create a function for doing this, an exposed api preferably. */
+    cbStack = sizeof(kLdrDyldPath) - kLdrHlpStrLen(kLdrDyldPath); /* borrow cbStack for a itty bit. */
+    kLdrHlpMemCopy(kLdrDyldPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), cbStack));
+    kLdrDyldPath[sizeof(kLdrDyldPath) - 1] = '\0';
 
     g_fBootstrapping = 1;