Changeset 2463 for trunk/ash/exec.c

Timestamp:

Nov 19, 2005, 4:58:38 PM (20 years ago)

Author:

bird

Message:

OS/2 changes.

File:

• trunk/ash/exec.c (modified) (20 diffs)

trunk/ash/exec.c

@@ -80 +80 @@
 #include "jobs.h"
 #include "alias.h"
+#ifdef __INNOTEK_LIBC__
+#include <InnoTekLIBC/backend.h>
+#endif
 
 
@@ -101 +104 @@
 
 
-STATIC void tryexec(char *, char **, char **, int);
+STATIC void tryexec(char *, char **, char **, int, int);
 STATIC void execinterp(char **, char **);
 STATIC void printentry(struct tblentry *, int);
@@ -107 +110 @@
 STATIC struct tblentry *cmdlookup(const char *, int);
 STATIC void delete_cmd_entry(void);
+#ifdef PC_EXE_EXTS
+STATIC int stat_pc_exec_exts(char *fullname, struct stat *st, int has_ext);
+#endif
 
 
@@ -121 +127 @@
         char *cmdname;
         int e;
-
+#ifdef PC_EXE_EXTS
+        int has_ext = strlen(argv[0]) - 4;
+        has_ext = has_ext > 0
+            && argv[0][has_ext] == '.'
+            /* use strstr and upper/lower permuated extensions to avoid multiple strcasecmp calls. */
+            && strstr("exe;" "Exe;" "EXe;" "EXE;" "ExE;" "eXe;" "eXE;" "exE;"
+                      "cmd;" "Cmd;" "CMd;" "CMD;" "CmD;" "cMd;" "cMD;" "cmD;"
+                      "com;" "Com;" "COm;" "COM;" "CoM;" "cOm;" "cOM;" "coM;"
+                      "bat;" "Bat;" "BAt;" "BAT;" "BaT;" "bAt;" "bAT;" "baT;"
+                      "btm;" "Btm;" "BTm;" "BTM;" "BtM;" "bTm;" "bTM;" "btM;",
+                      argv[0] + has_ext + 1)
+               != NULL;
+#else
+        const int has_ext = 1;
+#endif
+        TRACE(("shellexec: argv[0]=%s idx=%d\n", argv[0], idx));
         if (strchr(argv[0], '/') != NULL) {
-                tryexec(argv[0], argv, envp, vforked);
+                cmdname = stalloc(strlen(argv[0]) + 5);
+                strcpy(cmdname, argv[0]);
+                tryexec(cmdname, argv, envp, vforked, has_ext);
+                TRACE(("shellexec: cmdname=%s\n", cmdname));
+                stunalloc(cmdname);
                 e = errno;
         } else {
@@ -129 +154 @@
                 while ((cmdname = padvance(&path, argv[0])) != NULL) {
                         if (--idx < 0 && pathopt == NULL) {
-                                tryexec(cmdname, argv, envp, vforked);
+                                tryexec(cmdname, argv, envp, vforked, has_ext);
                                 if (errno != ENOENT && errno != ENOTDIR)
                                         e = errno;
@@ -149 +174 @@
                 break;
         }
-        TRACE(("shellexec failed for %s, errno %d, vforked %d, suppressint %d\n",
+        TRACE(("shellexec failed for '%s', errno %d, vforked %d, suppressint %d\n",
                 argv[0], e, vforked, suppressint ));
         exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC));
@@ -157 +182 @@
 
 STATIC void
-tryexec(char *cmd, char **argv, char **envp, int vforked)
+tryexec(char *cmd, char **argv, char **envp, int vforked, int has_ext)
 {
         int e;
-#ifndef BSD
+#ifdef EXEC_HASH_BANG_SCRIPT
         char *p;
+#endif
+#ifdef PC_EXE_EXTS
+        /* exploit the effect of stat_pc_exec_exts which adds the
+         * correct extentions to the file.
+         */
+        struct stat st;
+        if (!has_ext)
+            stat_pc_exec_exts(cmd, &st, 0);
+#endif
+#if defined __INNOTEK_LIBC__ && defined EXEC_HASH_BANG_SCRIPT
+        __libc_Back_gfProcessHandleHashBangScripts = 0;
 #endif
 
@@ -183 +219 @@
                 setinputfile(cmd, 0);
                 commandname = arg0 = savestr(argv[0]);
-#ifndef BSD
+#ifdef EXEC_HASH_BANG_SCRIPT
                 pgetc(); pungetc();             /* fill up input buffer */
                 p = parsenextc;
@@ -198 +234 @@
 
 
-#ifndef BSD
+#ifdef EXEC_HASH_BANG_SCRIPT
 /*
  * Execute an interpreter introduced by "#!", for systems where this
@@ -249 +285 @@
                 for (;;) {
                         if (equal(p, "sh") || equal(p, "ash")) {
+                                TRACE(("hash bang self\n"));
                                 return;
                         }
@@ -270 +307 @@
         ap = argv;
         while (*ap2++ = *ap++);
-        shellexec(new, envp, pathval(), 0);
+        TRACE(("hash bang '%s'\n", new[0]));
+        shellexec(new, envp, pathval(), 0, 0);
         /* NOTREACHED */
 }
@@ -300 +338 @@
                 return NULL;
         start = *path;
+#ifdef PC_PATH_SEP
+        for (p = start ; *p && *p != ';' && *p != '%' ; p++);
+#else
         for (p = start ; *p && *p != ':' && *p != '%' ; p++);
+#endif
         len = p - start + strlen(name) + 2;     /* "2" is for '/' and '\0' */
+#ifdef PC_EXE_EXTS
+        len += 4; /* "4" is for .exe/.com/.cmd/.bat/.btm */
+#endif
         while (stackblocksize() < len)
                 growstackblock();
@@ -314 +359 @@
         if (*p == '%') {
                 pathopt = ++p;
+#ifdef PC_PATH_SEP
+                while (*p && *p != ';')  p++;
+#else
                 while (*p && *p != ':')  p++;
-        }
+#endif
+        }
+#ifdef PC_PATH_SEP
+        if (*p == ';')
+#else
         if (*p == ':')
+#endif
                 *path = p + 1;
         else
@@ -322 +375 @@
         return stalloc(len);
 }
+
+
+#ifdef PC_EXE_EXTS
+STATIC int stat_pc_exec_exts(char *fullname, struct stat *st, int has_ext)
+{
+    /* skip the SYSV crap */
+    if (stat(fullname, st) >= 0)
+        return 0;
+    if (!has_ext && errno == ENOENT)
+    {
+        char *psz = strchr(fullname, '\0');
+        memcpy(psz, ".exe", 5);
+        if (stat(fullname, st) >= 0)
+            return 0;
+        if (errno != ENOENT && errno != ENOTDIR)
+            return -1;
+
+        memcpy(psz, ".cmd", 5);
+        if (stat(fullname, st) >= 0)
+            return 0;
+        if (errno != ENOENT && errno != ENOTDIR)
+            return -1;
+
+        memcpy(psz, ".bat", 5);
+        if (stat(fullname, st) >= 0)
+            return 0;
+        if (errno != ENOENT && errno != ENOTDIR)
+            return -1;
+
+        memcpy(psz, ".com", 5);
+        if (stat(fullname, st) >= 0)
+            return 0;
+        if (errno != ENOENT && errno != ENOTDIR)
+            return -1;
+
+        memcpy(psz, ".btm", 5);
+        if (stat(fullname, st) >= 0)
+            return 0;
+        *psz = '\0';
+    }
+    return -1;
+}
+#endif /* PC_EXE_EXTS */
 
 
@@ -366 +462 @@
                                 printentry(cmdp, verbose);
                         }
-                        flushall();
+                        output_flushall();
                 }
                 argptr++;
@@ -434 +530 @@
         int e;
         int (*bltin)(int,char **);
+
+#ifdef PC_EXE_EXTS
+        int has_ext = strlen(name) - 4;
+        has_ext = has_ext > 0
+            && name[has_ext] == '.'
+            /* use strstr and upper/lower permuated extensions to avoid multiple strcasecmp calls. */
+            && strstr("exe;" "Exe;" "EXe;" "EXE;" "ExE;" "eXe;" "eXE;" "exE;"
+                      "cmd;" "Cmd;" "CMd;" "CMD;" "CmD;" "cMd;" "cMD;" "cmD;"
+                      "com;" "Com;" "COm;" "COM;" "CoM;" "cOm;" "cOM;" "coM;"
+                      "bat;" "Bat;" "BAt;" "BAT;" "BaT;" "bAt;" "bAT;" "baT;"
+                      "btm;" "Btm;" "BTm;" "BTM;" "BtM;" "bTm;" "bTM;" "btM;",
+                      name + has_ext + 1)
+               != NULL;
+#endif
 
         /* If name contains a slash, don't use PATH or hash table */
@@ -532 +642 @@
                         goto success;
                 }
+#ifdef PC_EXE_EXTS
+                while (stat_pc_exec_exts(fullname, &statb, has_ext) < 0) {
+#else
                 while (stat(fullname, &statb) < 0) {
+#endif
 #ifdef SYSV
                         if (errno == EINTR)
@@ -539 +653 @@
                         if (errno != ENOENT && errno != ENOTDIR)
                                 e = errno;
+
                         goto loop;
                 }
@@ -707 +822 @@
                 if (*old != *new) {
                         firstchange = idx;
+#ifdef PC_PATH_SEP
+                        if ((*old == '\0' && *new == ';')
+                         || (*old == ';' && *new == '\0'))
+#else
                         if ((*old == '\0' && *new == ':')
                          || (*old == ':' && *new == '\0'))
+#endif
                                 firstchange++;
                         old = new;      /* ignore subsequent differences */
@@ -716 +836 @@
                 if (*new == '%' && bltin < 0 && prefix("builtin", new + 1))
                         bltin = idx;
+#ifdef PC_PATH_SEP
+                if (*new == ';') {
+#else
                 if (*new == ':') {
+#endif
                         idx++;
                 }