From 37a9f58275d8c4180eb96791fc7cbad3cf4955f5 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 1 Nov 2008 13:40:46 +0000 Subject: [PATCH] Clamp the values of t_column to 5 digits in `pstat -t' and `show all ttys'. We often run into these very high column numbers when we run curses applications, because they don't print any newlines. This messes up the table output of `pstat -t'. If these numbers get really high, they aren't of any use to the reader anyway. Convert them to `99999' when they run out of bounds. --- sys/kern/tty.c | 2 +- usr.sbin/pstat/pstat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 8f6f9b274abd..cdabafce5b2f 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2007,7 +2007,7 @@ DB_SHOW_ALL_COMMAND(ttys, db_show_all_ttys) osiz, tp->t_outq.to_end - tp->t_outq.to_begin, osiz - tp->t_outlow, - tp->t_column, + MIN(tp->t_column, 99999), tp->t_session ? tp->t_session->s_sid : 0, tp->t_pgrp ? tp->t_pgrp->pg_id : 0); diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index a1e81b3f43eb..a33bd0a74907 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -334,7 +334,7 @@ ttyprt(struct xtty *xt) xt->xt_insize, xt->xt_incc, xt->xt_inlc, (xt->xt_insize - xt->xt_inlow), xt->xt_outsize, xt->xt_outcc, (xt->xt_outsize - xt->xt_outlow), - xt->xt_column, xt->xt_sid, xt->xt_pgid); + MIN(xt->xt_column, 99999), xt->xt_sid, xt->xt_pgid); for (i = j = 0; ttystates[i].flag; i++) if (xt->xt_flags & ttystates[i].flag) { putchar(ttystates[i].val);