ipc: start supporting sending/receiving more than 3 FDs

Actually, sending 4 FDs will be useful for lei internal xsearch
work once we start accepting input from stdin.  It won't be used
with the lightweight lei(1) client, however.

For WWW (eventually), a single FD may be enough.

2 files changed, 6 insertions, 5 deletions

diff --git a/t/cmd_ipc.t b/t/cmd_ipc.t
index b9f4d128..22f73c19 100644
--- a/t/cmd_ipc.t
+++ b/t/cmd_ipc.t
@@ -17,7 +17,8 @@ my $do_test = sub { SKIP: {
         my ($s1, $s2);
         my $src = 'some payload' x 40;
         socketpair($s1, $s2, AF_UNIX, $type, 0) or BAIL_OUT $!;
-        $send->($s1, fileno($r), fileno($w), fileno($s1), $src, $flag);
+        my $sfds = [ fileno($r), fileno($w), fileno($s1) ];
+        $send->($s1, $sfds, $src, $flag);
         my (@fds) = $recv->($s2, my $buf, length($src) + 1);
         is($buf, $src, 'got buffer payload '.$desc);
         my ($r1, $w1, $s1a);
@@ -39,7 +40,7 @@ my $do_test = sub { SKIP: {
         if (defined($SOCK_SEQPACKET) && $type == $SOCK_SEQPACKET) {
                 $r1 = $w1 = $s1a = undef;
                 $src = (',' x 1023) . '-' .('.' x 1024);
-                $send->($s1, fileno($r), fileno($w), fileno($s1), $src, $flag);
+                $send->($s1, $sfds, $src, $flag);
                 (@fds) = $recv->($s2, $buf, 1024);
                 is($buf, (',' x 1023) . '-', 'silently truncated buf');
                 $opens->();
diff --git a/t/ipc.t b/t/ipc.t
index 903294c5..d2b6ad4f 100644
--- a/t/ipc.t
+++ b/t/ipc.t
@@ -121,7 +121,7 @@ $warn->autoflush(0);
 local $SIG{__WARN__} = sub { print $warn "PID:$$ ", @_ };
 my @ppids;
 for my $t ('local', 'worker', 'worker again') {
-        $ipc->wq_do('test_write_each_fd', $wa, $wb, $wc, 'hello world');
+        $ipc->wq_do('test_write_each_fd', [ $wa, $wb, $wc ], 'hello world');
         my $i = 0;
         for my $fh ($ra, $rb, $rc) {
                 my $buf = readline($fh);
@@ -129,7 +129,7 @@ for my $t ('local', 'worker', 'worker again') {
                 like($buf, qr/\Ai=$i \d+ hello world\z/, "got expected ($t)");
                 $i++;
         }
-        $ipc->wq_do('test_die', $wa, $wb, $wc);
+        $ipc->wq_do('test_die', [ $wa, $wb, $wc ]);
         my $ppid = $ipc->wq_workers_start('wq', 1);
         push(@ppids, $ppid);
 }
@@ -142,7 +142,7 @@ SKIP: {
         my $pid = fork // BAIL_OUT $!;
         if ($pid == 0) {
                 use POSIX qw(_exit);
-                $ipc->wq_do('test_write_each_fd', $wa, $wb, $wc, $$);
+                $ipc->wq_do('test_write_each_fd', [ $wa, $wb, $wc ], $$);
                 _exit(0);
         } else {
                 my $i = 0;