sys/t/mdup-test.c: Cope with the idea of arguments which aren't fd pairs.

The code used to assume a fixed relationship between command-line
argument indices and indices in the `mdup_fd' table.  Fix this by
introducing separate index variables in the argument-parsing loop, and
set the table length correctly afterwards.

diff --git a/sys/t/mdup-test.c b/sys/t/mdup-test.c
index 3169247ae4d3037039e3a54d0c2429383af78b61..ef9429d30fe0e3590deff7d089653a16aa6b5e54 100644 (file)
--- a/sys/t/mdup-test.c
+++ b/sys/t/mdup-test.c
@@ -14,7 +14,7 @@ static void fail(const char *what) { perror(what); exit(1); }
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-  int i, n;
+  int i, n, j;

   int fd, fd2;
   struct stat st;
   int ino[MAXFD];
   int fd, fd2;
   struct stat st;
   int ino[MAXFD];


@@ -22,13 +22,14 @@ int main(int argc, char *argv[])
   mdup_fd fds[MAXFD];
   int win = 1;
 
   mdup_fd fds[MAXFD];
   int win = 1;
 

-  for (i = 0; i < argc - 1; i++) {
-    if (i >= MAXFD) { fprintf(stderr, "too many\n"); exit(1); }
-    if (sscanf(argv[i + 1], "%d:%d", &fds[i].cur, &fds[i].want) < 2 ||
-       fds[i].cur >= MAXFD)
+  for (i = 1, j = 0; i < argc; i++) {
+    if (j >= MAXFD) { fprintf(stderr, "too many\n"); exit(1); }
+    if (sscanf(argv[i], "%d:%d", &fds[j].cur, &fds[j].want) < 2 ||
+       fds[j].cur >= MAXFD)

       { fprintf(stderr, "bad syntax\n"); exit(1); }
       { fprintf(stderr, "bad syntax\n"); exit(1); }

+    j++;

   }
   }

-  n = argc - 1;
+  n = j;

   for (i = 0; i < MAXFD; i++) flag[i] = -1;
   for (i = 0; i < n; i++) {
     fd = fds[i].cur;
   for (i = 0; i < MAXFD; i++) flag[i] = -1;
   for (i = 0; i < n; i++) {
     fd = fds[i].cur;