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

Timestamp:

Mar 1, 2009, 6:37:11 AM (16 years ago)

Author:

bird

Message:

kash: Removed the SH_PURE_STUB_MODE code.

File:

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

trunk/src/kash/shinstance.c

@@ -264 +264 @@
             else
             {
-#if defined(SH_PURE_STUB_MODE) || defined(_MSC_VER)
+#if defined(_MSC_VER)
                 sh_sigemptyset(&psh->sigmask);
 #else
@@ -529 +529 @@
     }
 
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#else
-
     /*
      * Make sure our data is correct.
@@ -596 +592 @@
         TRACE2((psh, "sh_sigaction: setting signo=%d:%s to {.sa_handler=%p, .sa_flags=%#x}\n",
                     signo, sys_signame[signo], g_sig_state[signo].sa.sa_handler, g_sig_state[signo].sa.sa_flags));
-# ifdef _MSC_VER
+#ifdef _MSC_VER
         if (signal(signo, g_sig_state[signo].sa.sa_handler) == SIG_ERR)
-# else
+#else
         if (sigaction(signo, &g_sig_state[signo].sa, NULL))
-# endif
+#endif
             assert(0);
 
@@ -607 +603 @@
 
     return 0;
-#endif
 }
 
@@ -803 +798 @@
      * Some other process, call kill where possible
      */
-#ifdef SH_PURE_STUB_MODE
-    rc = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
@@ -826 +818 @@
     int rc;
 
-#ifdef SH_PURE_STUB_MODE
-    rc = -1;
-
-#elif defined(SH_STUB_MODE)
+#if defined(SH_STUB_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
@@ -848 +837 @@
 clock_t sh_times(shinstance *psh, shtms *tmsp)
 {
-#ifdef SH_PURE_STUB_MODE
-    return 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     (void)psh;
 # ifdef _MSC_VER
@@ -866 +852 @@
 int sh_sysconf_clk_tck(void)
 {
-#ifdef SH_PURE_STUB_MODE
-    return 1;
-#else
-# ifdef _MSC_VER
+#ifdef _MSC_VER
     return CLK_TCK;
-# else
+#else
     return sysconf(_SC_CLK_TCK);
-# endif
 #endif
 }
@@ -917 +899 @@
     TRACE2((psh, "sh_fork\n"));
 
-#ifdef SH_PURE_STUB_MODE
-    pid = -1;
-
-#elif K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
+#if K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
     pid = shfork_do_it(psh);
 
@@ -952 +931 @@
 {
     pid_t pidret;
-#ifdef SH_PURE_STUB_MODE
-    *statusp = 0;
-    pidret = -1;
-
-#elif K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
+#if K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
     DWORD   dwRet;
     HANDLE  hChild = INVALID_HANDLE_VALUE;
@@ -1071 +1046 @@
     (void)psh;
 
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     _exit(rc);
 
@@ -1099 +1071 @@
         envp = sh_environ(psh);
 
-#ifdef SH_PURE_STUB_MODE
-    rc = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     errno = 0;
 # ifdef _MSC_VER
@@ -1126 +1095 @@
 uid_t sh_getuid(shinstance *psh)
 {
-#ifdef SH_PURE_STUB_MODE
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+# ifdef _MSC_VER
     uid_t uid = 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-# ifdef _MSC_VER
-    uid_t uid = 0;
 # else
     uid_t uid = getuid();
@@ -1146 +1112 @@
 uid_t sh_geteuid(shinstance *psh)
 {
-#ifdef SH_PURE_STUB_MODE
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+# ifdef _MSC_VER
     uid_t euid = 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-# ifdef _MSC_VER
-    uid_t euid = 0;
 # else
     uid_t euid = geteuid();
@@ -1166 +1129 @@
 gid_t sh_getgid(shinstance *psh)
 {
-#ifdef SH_PURE_STUB_MODE
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+# ifdef _MSC_VER
     gid_t gid = 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-# ifdef _MSC_VER
-    gid_t gid = 0;
 # else
     gid_t gid = getgid();
@@ -1186 +1146 @@
 gid_t sh_getegid(shinstance *psh)
 {
-#ifdef SH_PURE_STUB_MODE
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+# ifdef _MSC_VER
     gid_t egid = 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-# ifdef _MSC_VER
-    gid_t egid = 0;
 # else
     gid_t egid = getegid();
@@ -1208 +1165 @@
     pid_t pid;
 
-#ifdef SH_PURE_STUB_MODE
-    pid = 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pid = _getpid();
@@ -1226 +1180 @@
 pid_t sh_getpgrp(shinstance *psh)
 {
-#ifdef SH_PURE_STUB_MODE
-    pid_t pgrp = 0;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pid_t pgrp = _getpid();
@@ -1246 +1197 @@
 pid_t sh_getpgid(shinstance *psh, pid_t pid)
 {
-#ifdef SH_PURE_STUB_MODE
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+# ifdef _MSC_VER
     pid_t pgid = pid;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-# ifdef _MSC_VER
-    pid_t pgid = pid;
 # else
     pid_t pgid = getpgid(pid);
@@ -1266 +1214 @@
 int sh_setpgid(shinstance *psh, pid_t pid, pid_t pgid)
 {
-#ifdef SH_PURE_STUB_MODE
-    int rc = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     int rc = -1;
@@ -1289 +1234 @@
     pid_t pgrp;
 
-#ifdef SH_PURE_STUB_MODE
-    pgrp = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pgrp = -1;
@@ -1313 +1255 @@
     TRACE2((psh, "sh_tcsetpgrp(%d, %d)\n", fd, pgrp));
 
-#ifdef SH_PURE_STUB_MODE
-    rc = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     rc = -1;
@@ -1334 +1273 @@
 int sh_getrlimit(shinstance *psh, int resid, shrlimit *limp)
 {
-#ifdef SH_PURE_STUB_MODE
-    int rc = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     int rc = -1;
@@ -1357 +1293 @@
 int sh_setrlimit(shinstance *psh, int resid, const shrlimit *limp)
 {
-#ifdef SH_PURE_STUB_MODE
-    int rc = -1;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     int rc = -1;