Changeset 3483 in kBuild

Timestamp:

Sep 21, 2020 12:06:15 PM (4 years ago)

Author:

bird

Message:

kash: Don't use cmdlist to dump nfile lists in cmdtxt, need a dedicated function there.

File:

• trunk/src/kash/jobs.c (modified) (3 diffs)

trunk/src/kash/jobs.c

@@ -84 +84 @@
 STATIC void cmdtxt(shinstance *, union node *);
 STATIC void cmdlist(shinstance *, union node *, int);
+STATIC void cmdredirlist(shinstance *, union node *, int);
 STATIC void cmdputs(shinstance *, const char *);
 STATIC shpid forkparent(shinstance *psh, struct job *jp, union node *n, int mode, shpid pid);
@@ -1354 +1355 @@
         case NCMD:
                 cmdlist(psh, n->ncmd.args, 1);
-                cmdlist(psh, n->ncmd.redirect, 0);
+                cmdredirlist(psh, n->ncmd.redirect, 0);
                 break;
         case NARG:
@@ -1406 +1407 @@
                 cmdtxt(psh, np);
                 if (sep && np->narg.next)
+                        cmdputs(psh, " ");
+        }
+}
+
+STATIC void
+cmdredirlist(shinstance *psh, union node *np, int sep)
+{
+        for (; np; np = np->nfile.next) {
+                if (!sep)
+                        cmdputs(psh, " ");
+                cmdtxt(psh, np);
+                if (sep && np->nfile.next)
                         cmdputs(psh, " ");
         }