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

Timestamp:

Mar 1, 2009, 6:42:54 AM (16 years ago)

Author:

bird

Message:

kash: Merged the SH_STUB_MODE and SH_FORKED_MODE stuff and use the latter name/define.

File:

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

trunk/src/kash/shinstance.c

@@ -697 +697 @@
     }
 
-#if (defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)) && !defined(_MSC_VER)
+#if defined(SH_FORKED_MODE) && !defined(_MSC_VER)
     rc = sigprocmask(operation, newp, oldp);
     if (!rc && newp)
@@ -726 +726 @@
         }
 
-# if defined(SH_STUB_MODE) || defined(_MSC_VER)
+# if defined(_MSC_VER)
         rc = 0;
 # else
@@ -798 +798 @@
      * Some other process, call kill where possible
      */
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
@@ -818 +818 @@
     int rc;
 
-#if defined(SH_STUB_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     errno = ENOSYS;
@@ -837 +837 @@
 clock_t sh_times(shinstance *psh, shtms *tmsp)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
     (void)psh;
 # ifdef _MSC_VER
@@ -902 +902 @@
     pid = shfork_do_it(psh);
 
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#elif defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pid = -1;
@@ -1023 +1023 @@
     }
 
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#elif defined(SH_FORKED_MODE)
     *statusp = 0;
 # ifdef _MSC_VER
@@ -1046 +1046 @@
     (void)psh;
 
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
     _exit(rc);
 
@@ -1071 +1071 @@
         envp = sh_environ(psh);
 
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
     errno = 0;
 # ifdef _MSC_VER
@@ -1079 +1079 @@
     {
         TRACE2((psh, "sh_execve: child exited, rc=%d. (errno=%d)\n", rc, errno));
-        exit(rc);
+        exit((int)rc);
     }
 # else
@@ -1095 +1095 @@
 uid_t sh_getuid(shinstance *psh)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     uid_t uid = 0;
@@ -1112 +1112 @@
 uid_t sh_geteuid(shinstance *psh)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     uid_t euid = 0;
@@ -1129 +1129 @@
 gid_t sh_getgid(shinstance *psh)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     gid_t gid = 0;
@@ -1146 +1146 @@
 gid_t sh_getegid(shinstance *psh)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     gid_t egid = 0;
@@ -1165 +1165 @@
     pid_t pid;
 
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pid = _getpid();
@@ -1180 +1180 @@
 pid_t sh_getpgrp(shinstance *psh)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pid_t pgrp = _getpid();
@@ -1197 +1197 @@
 pid_t sh_getpgid(shinstance *psh, pid_t pid)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pid_t pgid = pid;
@@ -1214 +1214 @@
 int sh_setpgid(shinstance *psh, pid_t pid, pid_t pgid)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     int rc = -1;
@@ -1234 +1234 @@
     pid_t pgrp;
 
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     pgrp = -1;
@@ -1255 +1255 @@
     TRACE2((psh, "sh_tcsetpgrp(%d, %d)\n", fd, pgrp));
 
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     rc = -1;
@@ -1273 +1273 @@
 int sh_getrlimit(shinstance *psh, int resid, shrlimit *limp)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     int rc = -1;
@@ -1293 +1293 @@
 int sh_setrlimit(shinstance *psh, int resid, const shrlimit *limp)
 {
-#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+#if defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
     int rc = -1;