From: Ben Gras <ben@minix3.org>
Date: Wed, 2 Nov 2005 17:43:19 +0000 (+0000)
Subject: Display "select" blocking status correctly, and add check for wrong
X-Git-Tag: v3.1.2a~529
X-Git-Url: http://zhaoyanbai.com/repos/nsupdate.html?a=commitdiff_plain;h=edb541fb984a5b518d3aa5c0dc90bd64fbc3ae54;p=minix.git

Display "select" blocking status correctly, and add check for wrong
blocking process number
---

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 88a95a50e..e06ecb16a 100644
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -134,8 +134,8 @@ int kmemfd, memfd;		/* file descriptors of [k]mem */
  */
 #define S_HEADER "  PID TTY  TIME CMD\n"
 #define S_FORMAT "%5s %3s %s %s\n"
-#define L_HEADER "  F S UID   PID  PPID  PGRP     SZ       RECV TTY  TIME CMD\n"
-#define L_FORMAT "%3o %c %3d %5s %5d %5d %6d %10s %3s %s %s\n"
+#define L_HEADER "  F S UID   PID  PPID  PGRP     SZ         RECV TTY  TIME CMD\n"
+#define L_FORMAT "%3o %c %3d %5s %5d %5d %6d %12s %3s %s %s\n"
 
 
 struct pstat {			/* structure filled by pstat() */
@@ -242,8 +242,12 @@ struct pstat *bufp;
 		blkstr = "popen";
 	else if (-bufp->ps_ftask == XLOCK)
 		blkstr = "flock";
-	else
+	else if(-bufp->ps_ftask == XSELECT)
+		blkstr = "select";
+	else if(-bufp->ps_ftask >= 0)
 		blkstr = taskname(-bufp->ps_ftask);
+	else
+		blkstr = "??";
   }
   (void) sprintf(recvstr, "(%s) %s", blkstr, task);
   return recvstr;