Changeset 2302 for trunk

Timestamp:

Aug 22, 2005, 5:50:15 AM (20 years ago)

Author:

bird

Message:

o Added libc_Back_gfProcessHandleHashBangScripts and

libc_Back_gfProcessHandlePCBatchScripts for use in shells which
can handle such scripts more efficiently than libc.

o Fixed some bugs related to finding the interpreter in the spawn/exec backend.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/sys/__spawnve.c (modified) (7 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -8 +8 @@
           The old defaults were 8MB (emxbind) and 8KB (emxomfld).
     - libc:
+        o Added __libc_Back_gfProcessHandleHashBangScripts and
+          __libc_Back_gfProcessHandlePCBatchScripts for use in shells which
+          can handle such scripts more efficiently than libc.
+        o Fixed some bugs related to finding the interpreter in the spawn/exec backend.
         o Merged the signal semaphore handling into the safe sems and
           made signals use them instead.

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -905 +905 @@
 int __libc_Back_processSetPriority(int iWhich, id_t idWho, int iPrio);
 
+
+/** When this flag is set, the exec / spawn backend will handle hash bang scripts. */
+extern int __libc_Back_gfProcessHandleHashBangScripts;
+/** When this flag is set, the exec / spawn backend will handle PC batch scripts. */
+extern int __libc_Back_gfProcessHandlePCBatchScripts;
 
 /** @} */

trunk/src/emx/src/lib/libc.def

@@ -1944 +1944 @@
     "___libc_LogErrorLeave" @1942
     "__memcpy_amd" @1943
+    "___libc_Back_gfProcessHandleHashBangScripts" @1944
+    "___libc_Back_gfProcessHandlePCBatchScripts" @1945

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

@@ -18 +18 @@
 #include <emx/syscalls.h>
 #include <InnoTekLIBC/sharedpm.h>
+#include <InnoTekLIBC/backend.h>
 #define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_PROCESS
 #include <InnoTekLIBC/logstrict.h>
 #include "syscalls.h"
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** When this flag is set, the exec / spawn backend will handle hash bang scripts. */
+int __libc_Back_gfProcessHandleHashBangScripts = 1;
+/** When this flag is set, the exec / spawn backend will handle PC batch scripts. */
+int __libc_Back_gfProcessHandlePCBatchScripts = 1;
 
 
@@ -302 +312 @@
                 const char *pszInterpreter = NULL;
                 const char *pszInterpreterArgs = NULL;
-                psz = _getext(pszPgmName);
-                if (psz && (!stricmp(psz, ".cmd") || !stricmp(psz, ".bat") || !stricmp(psz, ".btm")))
+                if (    __libc_Back_gfProcessHandlePCBatchScripts
+                    &&  (psz = _getext(pszPgmName))
+                    &&  (!stricmp(psz, ".cmd") || !stricmp(psz, ".bat") || !stricmp(psz, ".btm")))
                 {
                     pszInterpreterArgs = "/C";
@@ -319 +330 @@
                         *psz++ = '\\';
                 }
-                else
+                else if (__libc_Back_gfProcessHandleHashBangScripts)
                 {
                     /*
@@ -353 +364 @@
                                 if (*psz++ == '#')
                                 {
-                                    while ((ch = *psz) == ' ' && ch == '\t')
+                                    while ((ch = *psz) == ' ' || ch == '\t')
                                         psz++;
                                     if (*psz++ == '!')
                                     {
-                                        while ((ch = *psz) == ' ' && ch == '\t')
+                                        while ((ch = *psz) == ' ' || ch == '\t')
                                             psz++;
                                         pszInterpreter = psz;
@@ -370 +381 @@
                                         {
                                             *psz++ = '\0';
-                                            while ((ch = *psz) == ' ' && ch == '\t')
+                                            while ((ch = *psz) == ' ' || ch == '\t')
                                                 psz++;
                                             if (ch)
@@ -420 +431 @@
                  * If the specified name fails, we'll try search the path for it and
                  * also adding an .exe extension before we give up.
+                 * We omit any specified path since we're frequently faced with path
+                 * differences between OS/2 and the UNIX where the script originated.
                  */
                 rc = __libc_back_fsResolve(pszInterpreter, BACKFS_FLAGS_RESOLVE_FULL, &szNativePath[0], NULL);
                 if (rc)
                 {
+                    psz = _getname(pszInterpreter);
                     char szPath[512];
-                    _searchenv(pszInterpreter, "PATH", szPath); /** @todo _searchenv is not safe, it can easily overflow szPath! */
+                    _searchenv(psz, "PATH", szPath); /** @todo _searchenv is not safe, it can easily overflow szPath! */
                     if (!szPath[0])
                     {
-                        cch = strlen(pszInterpreter);
-                        memcpy(szNativePath, pszInterpreter, cch + 1);
+                        cch = strlen(psz);
+                        memcpy(szNativePath, psz, cch + 1);
                         _defext(szNativePath, "exe");
                         if (szNativePath[cch])
@@ -437 +451 @@
                         rc = __libc_back_fsResolve(szPath, BACKFS_FLAGS_RESOLVE_FULL, &szNativePath[0], NULL);
                     if (rc)
+                    {
+                        LIBCLOG_MSG("Failed to find interpreter '%s'! szPath='%s'\n", pszInterpreter, szPath);
                         break;
+                    }
                 }