Index: /trunk/src/kash/shfile.c
===================================================================
--- /trunk/src/kash/shfile.c	(revision 2300)
+++ /trunk/src/kash/shfile.c	(revision 2301)
@@ -25,4 +25,7 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "shfile.h"
 #include "shinstance.h" /* TRACE2 */
@@ -50,9 +53,7 @@
  * Whether the file descriptor table stuff is actually in use or not.
  */
-#if !defined(SH_PURE_STUB_MODE) \
- && (   K_OS == K_OS_WINDOWS \
-     || (   !defined(SH_STUB_MODE) \
-         && !defined(SH_FORKED_MODE)) \
-    )
+#if K_OS == K_OS_WINDOWS \
+ || (   !defined(SH_STUB_MODE) \
+     && !defined(SH_FORKED_MODE))
 # define SHFILE_IN_USE
 #endif
@@ -599,8 +600,4 @@
 # endif /* K_OS != K_OS_WINDOWS */
 
-#elif defined(SH_PURE_STUB_MODE)
-    fd = -1;
-    errno = ENOSYS;
-
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     fd = open(name, flags, mode);
@@ -684,8 +681,4 @@
     }
 
-#elif defined(SH_PURE_STUB_MODE)
-    rc = -1;
-    errno = ENOSYS;
-
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
@@ -703,8 +696,5 @@
 {
     int rc;
-#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)
     rc = dup(fd);
 
@@ -738,7 +728,4 @@
     else
         rc = -1;
-
-#elif defined(SH_PURE_STUB_MODE)
-    rc = -1;
 
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
@@ -776,7 +763,4 @@
         rc = -1;
 
-#elif defined(SH_PURE_STUB_MODE)
-    rc = -1;
-
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
@@ -814,7 +798,4 @@
     else
         rc = -1;
-
-#elif defined(SH_PURE_STUB_MODE)
-    rc = -1;
 
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
@@ -854,7 +835,4 @@
     else
         rc = -1;
-
-#elif defined(SH_PURE_STUB_MODE)
-    rc = -1;
 
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
@@ -940,7 +918,4 @@
     else
         rc = -1;
-
-#elif defined(SH_PURE_STUB_MODE)
-    rc = -1;
 
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
@@ -1013,8 +988,5 @@
 int shfile_stat(shfdtab *pfdtab, const char *path, struct stat *pst)
 {
-#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)
     return stat(path, pst);
 
@@ -1025,8 +997,5 @@
 int shfile_lstat(shfdtab *pfdtab, const char *link, struct stat *pst)
 {
-#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)
 # ifdef _MSC_VER
     return stat(link, pst);
@@ -1041,8 +1010,5 @@
 int shfile_chdir(shfdtab *pfdtab, const char *path)
 {
-#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)
 # ifdef _MSC_VER //???
     return chdir(path);
@@ -1057,8 +1023,5 @@
 char *shfile_getcwd(shfdtab *pfdtab, char *buf, int len)
 {
-#ifdef SH_PURE_STUB_MODE
-    return NULL;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     return getcwd(buf, len);
 
@@ -1069,8 +1032,5 @@
 int shfile_access(shfdtab *pfdtab, const char *path, int type)
 {
-#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)
 # ifdef _MSC_VER
     type &= ~X_OK;
@@ -1088,7 +1048,5 @@
     int rc;
 
-#ifdef SH_PURE_STUB_MODE
-    rc = 0;
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     rc = isatty(fd);
 #else
@@ -1104,8 +1062,5 @@
     int rc;
 
-#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;
@@ -1128,8 +1083,5 @@
     int rc;
 
-#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;
@@ -1149,10 +1101,7 @@
 mode_t shfile_get_umask(shfdtab *pfdtab)
 {
-#ifdef SH_PURE_STUB_MODE
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     return 022;
 
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-    return 022;
-
 #else
 #endif
@@ -1167,8 +1116,5 @@
 shdir *shfile_opendir(shfdtab *pfdtab, const char *dir)
 {
-#ifdef SH_PURE_STUB_MODE
-    return NULL;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
@@ -1184,8 +1130,5 @@
 shdirent *shfile_readdir(struct shdir *pdir)
 {
-#ifdef SH_PURE_STUB_MODE
-    return NULL;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
@@ -1202,8 +1145,5 @@
 void shfile_closedir(struct shdir *pdir)
 {
-#ifdef SH_PURE_STUB_MODE
-    return NULL;
-
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
Index: /trunk/src/kash/shinstance.c
===================================================================
--- /trunk/src/kash/shinstance.c	(revision 2300)
+++ /trunk/src/kash/shinstance.c	(revision 2301)
@@ -264,5 +264,5 @@
             else
             {
-#if defined(SH_PURE_STUB_MODE) || defined(_MSC_VER)
+#if defined(_MSC_VER)
                 sh_sigemptyset(&psh->sigmask);
 #else
@@ -529,8 +529,4 @@
     }
 
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#else
-
     /*
      * Make sure our data is correct.
@@ -596,9 +592,9 @@
         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,5 +603,4 @@
 
     return 0;
-#endif
 }
 
@@ -803,8 +798,5 @@
      * 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,8 +818,5 @@
     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,8 +837,5 @@
 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,12 +852,8 @@
 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,8 +899,5 @@
     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,9 +931,5 @@
 {
     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,8 +1046,5 @@
     (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,8 +1071,5 @@
         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,10 +1095,7 @@
 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,10 +1112,7 @@
 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,10 +1129,7 @@
 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,10 +1146,7 @@
 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,8 +1165,5 @@
     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,8 +1180,5 @@
 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,10 +1197,7 @@
 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,8 +1214,5 @@
 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,8 +1234,5 @@
     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,8 +1255,5 @@
     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,8 +1273,5 @@
 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,8 +1293,5 @@
 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;