Changeset 2293 for trunk/src/kash/show.c

Timestamp:

Feb 28, 2009, 8:25:12 AM (16 years ago)

Author:

bird

Message:

kash: forking on windows (almost there).

File:

• trunk/src/kash/show.c (modified) (7 diffs)

trunk/src/kash/show.c

@@ -274 +274 @@
 trputc(shinstance *psh, int c)
 {
-        if (debug(psh) != 1)
+        if (psh && debug(psh) != 1)
                 return;
         putc(c, tracefile);
@@ -287 +287 @@
         va_list va;
 
-        if ((psh || !tracefile) && debug(psh) != 1)
-                return;
-        fprintf(tracefile, "[%d] ", sh_getpid(psh));
+        if (!tracefile || (psh && debug(psh) != 1))
+                return;
+        fprintf(tracefile, "[%d] ", sh_getpid(psh));
         va_start(va, fmt);
         (void) vfprintf(tracefile, fmt, va);
@@ -304 +304 @@
         int savederrno = errno;
 
-        if ((psh || !tracefile) && debug(psh) != 1)
-                return;
-        fprintf(tracefile, "[%d] ", sh_getpid(psh));
+        if (!tracefile || (psh && debug(psh) != 1))
+                return;
+        fprintf(tracefile, "[%d] ", sh_getpid(psh));
         (void) vfprintf(tracefile, fmt, va);
 
@@ -320 +320 @@
         int savederrno = errno;
 
-        if ((psh || !tracefile) && debug(psh) != 1)
+        if (!tracefile || (psh && debug(psh) != 1))
                 return;
         fputs(s, tracefile);
@@ -335 +335 @@
         char c;
 
-        if ((psh || !tracefile) && debug(psh) != 1)
+        if (!tracefile || (psh && debug(psh) != 1))
                 return;
         putc('"', tracefile);
@@ -378 +378 @@
         int savederrno = errno;
 
-        if ((psh || !tracefile) && debug(psh) != 1)
+        if (!tracefile || (psh && debug(psh) != 1))
                 return;
         while (*ap) {
@@ -400 +400 @@
         int fd;
 
-        if (debug(psh) != 1) {
+        if (psh && debug(psh) != 1) {
                 if (tracefile)
                         fflush(tracefile);