progress toward cleaning up logic of various modes and how the use their pipes

1 files changed, 25 insertions, 7 deletions

diff --git a/tools/hi-q.c b/tools/hi-q.c
index 8766b08..39c68e3 100644
--- a/tools/hi-q.c
+++ b/tools/hi-q.c
@@ -425,13 +425,31 @@ bar
 
   // For N-1 kids, the loose end feeds forward.
   //    It will be written by this kid and read by the next kid.
-  // For the last kid, the loose end connects to hi-q.
-  //    It will be written by hi-q and read by the last kid.
-
-      int lastkid = (ii == nkids-1);
-  #define flip(a,b) (lastkid ? b : a)
-      loose_end = datapipe[flip(rEnd, wEnd)];
-      kid_end   = datapipe[flip(wEnd, rEnd)];
+  // For the special kid, the loose end will be its nonstandard input.
+  //    It will be written by us (hi-q) and read by the last kid.
+
+      switch (filter[ii].mode) {
+        case series:
+        case sa:
+            loose_end = datapipe[rEnd];
+            kid_end   = datapipe[wEnd];
+          break;
+        case qq:
+            loose_end = datapipe[wEnd];  // reverse of normal "series" case
+            kid_end   = datapipe[rEnd];  // reverse of normal "series" case
+          break;
+        case postspam:
+        case stub:       // didn't need a connection at all
+           cerr << "ignoring fd " << datapipe[wEnd]
+                << " and " << datapipe[rEnd]
+                << endl;
+            xclose(datapipe[wEnd]);
+            xclose(datapipe[rEnd]);
+          break;
+        case fail:
+            cerr << "should never happen:  invalid filter" << endl;
+            exeunt(ex_syserr);
+      }
     }
 
     kidpid[ii] = fork();