Changeset 2309

Timestamp:

Aug 27, 2005, 7:10:27 PM (20 years ago)

Author:

bird

Message:

Don't set .exe default to early, nor twice.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• src/lib/process/spawnve.c (modified) (1 diff, 1 prop)
• src/lib/sys/__spawnve.c (modified) (2 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -7 +7 @@
         o Fixed two cases where the signal semaphore was incorrectly unlocked
           after signalDeliver().
+        o Don't try the '.exe' too early on executables (exec/spawn), this broke
+          execution of './configure' and other scripts with no extension.
 
 2005-08-24: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/src/lib/process/spawnve.c

@@ -34 +34 @@
     }
     strcpy(exe, name);
+#if 0/*  This isn't the place and time, however the backend assumes there is sufficient space in the buffer. */
     _defext(exe, "exe");
-    LIBCLOG_MSG("exe=%s\n", exe);
+    LIBCLOG_MSG("exe=%s\n", exe); */
+#endif
     np.fname_off = (unsigned long)exe;
 

trunk/src/emx/src/lib/sys/__spawnve.c

@@ -160 +160 @@
 
     /*
-     * Allocate space for the program name and resolve the filename.
+     * Resolve the program name - prefere .exe over stubs.
+     * The caller have left enough space for adding an .exe extension.
      */
-    size_t cch = strlen((const char *)np->fname_off);
-    char *pszPgmName = alloca(cch + 5);
-    memcpy(pszPgmName, (const char *)np->fname_off, cch + 1);
+    char *pszPgmName = (char *)np->fname_off;
+    size_t cch = strlen((char *)np->fname_off);
     _defext(pszPgmName, "exe");
     char szNativePath[PATH_MAX];
@@ -172 +172 @@
         if (pszPgmName[cch])
         {
-            pszPgmName[cch] = '\0';
+            pszPgmName[cch] = '\0'; /* Drop the .exe bit added by _defext(). */
             rc = __libc_back_fsResolve(pszPgmName, BACKFS_FLAGS_RESOLVE_FULL, &szNativePath[0], NULL);
         }