Changeset 2652 for trunk/src/kash/shinstance.c

Timestamp:

Sep 9, 2012, 7:21:48 PM (13 years ago)

Author:

bird

Message:

kash: Fixes for hash-bang-scripts on windows. Related debug tracing fix. Another CWD slash fix. Fixed a couple of assertions.

File:

• trunk/src/kash/shinstance.c (modified) (2 diffs)

trunk/src/kash/shinstance.c

@@ -598 +598 @@
 #ifdef _MSC_VER
         if (signal(signo, g_sig_state[signo].sa.sa_handler) == SIG_ERR)
+        {
+            TRACE2((psh, "sh_sigaction: SIG_ERR, errno=%d signo=%d\n", errno, signo));
+            if (   signo != SIGHUP   /* whatever */
+                && signo != SIGQUIT
+                && signo != SIGPIPE
+                && signo != SIGTTIN
+                && signo != SIGTSTP
+                && signo != SIGTTOU
+                && signo != SIGCONT)
+                assert(0);
+        }
 #else
         if (sigaction(signo, &g_sig_state[signo].sa, NULL))
-#endif
             assert(0);
+#endif
 
         shmtx_leave(&g_sh_mtx, &tmp);
@@ -1181 +1192 @@
             errno = EINVAL;
         }
+        else
+        {
+            DWORD dwErr = GetLastError();
+            switch (dwErr)
+            {
+                case ERROR_FILE_NOT_FOUND:          errno = ENOENT; break;
+                case ERROR_PATH_NOT_FOUND:          errno = ENOENT; break;
+                case ERROR_BAD_EXE_FORMAT:          errno = ENOEXEC; break;
+                case ERROR_INVALID_EXE_SIGNATURE:   errno = ENOEXEC; break;
+                default:
+                    errno = EINVAL;
+                    break;
+            }
+            TRACE2((psh, "sh_execve: dwErr=%d -> errno=%d\n", dwErr, errno));
+        }
 
         shfile_exec_win(&psh->fdtab, 0 /* done */, NULL, NULL);