Changeset 3438 for trunk/src/kash/main.c

Timestamp:

Sep 9, 2020, 10:01:39 PM (5 years ago)

Author:

bird

Message:

kash: Hammering on threaded mode.

File:

• trunk/src/kash/main.c (modified) (5 diffs)

trunk/src/kash/main.c

@@ -45 +45 @@
 #endif
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -101 +102 @@
 
 int
-#if K_OS == K_OS_WINDOWS
+#if K_OS == K_OS_WINDOWS && defined(SH_FORKED_MODE)
 real_main(int argc, char **argv, char **envp)
 #else
@@ -130 +131 @@
          * Create the root shell instance.
          */
-        psh = sh_create_root_shell(NULL, argc, argv, envp);
+        psh = sh_create_root_shell(argv, envp);
         if (!psh)
                 return 2;
         shthread_set_shell(psh);
-        shell_main(psh, argc, psh->argptr);
+        shell_main(psh, argc, psh->orgargv);
         /* Not reached. */
         return 89;
@@ -406 +407 @@
 
         if (argc >= 2) {                /* That's what SVR2 does */
+                char * const savedcommandname = psh->commandname;
+                int const savedcommandnamemalloc = psh->commandnamemalloc;
                 char *fullname;
                 struct stackmark smark;
@@ -413 +416 @@
                 setinputfile(psh, fullname, 1);
                 psh->commandname = fullname;
+                psh->commandnamemalloc = 0;
                 cmdloop(psh, 0);
                 popfile(psh);
+                psh->commandname = savedcommandname;
+                psh->commandnamemalloc = savedcommandnamemalloc;
                 popstackmark(psh, &smark);
         }