reap() uses await but fails to put the null terminator on exitsts buffer and notedeath() duplicates what wait does. they've been modified to use wait directly. Reference: /n/sources/patch/dial-await-bug Date: Sun May 22 19:47:45 CES 2016 Signed-off-by: fst@9netics.com --- /sys/src/libc/9sys/dial.c Sun May 22 19:40:41 2016 +++ /sys/src/libc/9sys/dial.c Sun May 22 19:40:37 2016 @@ -164,28 +164,22 @@ } static void -notedeath(Dest *dp, char *exitsts) +notedeath(Dest *dp, Waitmsg *exitsts) { - int i, n, pid; - char *fields[5]; /* pid + 3 times + error */ + int n; Conn *conn; - for (i = 0; i < nelem(fields); i++) - fields[i] = ""; - n = tokenize(exitsts, fields, nelem(fields)); - if (n < 4) - return; - pid = atoi(fields[0]); - if (pid <= 0) + if (exitsts->pid <= 0) return; for (conn = dp->conn; conn < dp->connend; conn++) - if (conn->pid == pid && !conn->dead) { /* it's one we know? */ + if (conn->pid == exitsts->pid && !conn->dead) { /* it's one we know? */ if (conn - dp->conn != dp->winner) { closeopenfd(&conn->dfd); closeopenfd(&conn->cfd); } - strncpy(conn->err, fields[4], sizeof conn->err - 1); - conn->err[sizeof conn->err - 1] = '\0'; + n = strlen(exitsts->msg); + assert(n < ERRMAX); + strncpy(conn->err, exitsts->msg, n); conn->dead = 1; return; } @@ -206,10 +200,11 @@ static int reap(Dest *dp) { - char exitsts[2*ERRMAX]; + Waitmsg *exitsts = nil; - if (outstandingprocs(dp) && await(exitsts, sizeof exitsts) >= 0) { + if (outstandingprocs(dp) && (exitsts = wait()) != nil) { notedeath(dp, exitsts); + free(exitsts); return 0; } return -1;