Changeset 1199 for trunk/src/kash/eval.c

Timestamp:

Oct 7, 2007, 12:04:05 AM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/eval.c (modified) (11 diffs)

trunk/src/kash/eval.c

@@ -226 +226 @@
 {
         if (n == NULL) {
-                TRACE(("evaltree(NULL) called\n"));
+                TRACE((psh, "evaltree(NULL) called\n"));
                 psh->exitstatus = 0;
                 goto out;
@@ -233 +233 @@
         psh->displayhist = 1;   /* show history substitutions done with fc */
 #endif
-        TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
-            getpid(), n, n->type, flags));
+        TRACE((psh, "pid %d, evaltree(%p: %d, %d) called\n",
+               getpid(), n, n->type, flags));
         switch (n->type) {
         case NSEMI:
@@ -500 +500 @@
         int pip[2];
 
-        TRACE(("evalpipe(0x%lx) called\n", (long)n));
+        TRACE((psh, "evalpipe(0x%lx) called\n", (long)n));
         pipelen = 0;
         for (lp = n->npipe.cmdlist ; lp ; lp = lp->next)
@@ -540 +540 @@
         if (n->npipe.backgnd == 0) {
                 psh->exitstatus = waitforjob(psh, jp);
-                TRACE(("evalpipe:  job done exit status %d\n", psh->exitstatus));
+                TRACE((psh, "evalpipe:  job done exit status %d\n", psh->exitstatus));
         }
         INTON;
@@ -605 +605 @@
 out:
         popstackmark(psh, &smark);
-        TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
+        TRACE((psh, "evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
                 result->fd, result->buf, result->nleft, result->jp));
 }
@@ -716 +716 @@
         psh->vforked = 0;
         /* First expand the arguments. */
-        TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
+        TRACE((psh, "evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
         setstackmark(psh, &smark);
         psh->exitstatus = 0;
@@ -760 +760 @@
 
         for (sp = arglist.list ; sp ; sp = sp->next) {
-                TRACE(("evalcommand arg: %s\n", sp->text));
+                TRACE((psh, "evalcommand arg: %s\n", sp->text));
                 *argv++ = sp->text;
         }
@@ -864 +864 @@
                         switch (pid = vfork()) {
                         case -1:
-                                TRACE(("Vfork failed, errno=%d\n", errno));
+                                TRACE((psh, "Vfork failed, errno=%d\n", errno));
                                 INTON;
                                 error(psh, "Cannot vfork");
@@ -932 +932 @@
         case CMDFUNCTION:
 #ifdef DEBUG
-                trputs("Shell function:  ");  trargs(argv);
+                trputs(psh, "Shell function:  ");  trargs(psh, argv);
 #endif
                 redirect(psh, cmd->ncmd.redirect, REDIR_PUSH);
@@ -985 +985 @@
         case CMDSPLBLTIN:
 #ifdef DEBUG
-                trputs("builtin command:  ");  trargs(argv);
+                trputs(psh, "builtin command:  ");  trargs(psh, argv);
 #endif
                 mode = (cmdentry.u.bltin == execcmd) ? 0 : REDIR_PUSH;
@@ -1069 +1069 @@
         default:
 #ifdef DEBUG
-                trputs("normal command:  ");  trargs(argv);
+                trputs(psh, "normal command:  ");  trargs(psh, argv);
 #endif
                 clearredir(psh, psh->vforked);