d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iostat: add a bit of space between tty in/out columns

Browse Source 
The columns for tty input and output may bump against each other
if the tty output needs more than 5 columns.  Add a bit of space
that pushes everything 1 column to the right, but also avoids the
problem.

Approved by:	re (rwatson)
This commit is contained in:
keramida 2009-08-15 17:57:21 +00:00
parent a32367baa7
commit 1a1c48a8c0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/iostat/iostat.c
View File

@ -586,7 +586,7 @@ main(int argc, char **argv)
}
if (xflag == 0 && Tflag > 0)
printf("%4.0Lf%5.0Lf", cur.tk_nin / etime,
printf("%4.0Lf %5.0Lf", cur.tk_nin / etime,
cur.tk_nout / etime);
devstats(hflag, etime, havelast);
@ -674,7 +674,7 @@ phdr(void)
return;
if (Tflag > 0)
(void)printf(" tty");
(void)printf(" tty");
for (i = 0, printed=0;(i < num_devices) && (printed < maxshowdevs);i++){
int di;
if ((dev_select[i].selected != 0)
@ -696,7 +696,7 @@ phdr(void)
(void)printf("\n");
if (Tflag > 0)
(void)printf(" tin tout");
(void)printf(" tin tout");
for (i=0, printed = 0;(i < num_devices) && (printed < maxshowdevs);i++){
if ((dev_select[i].selected != 0)
@ -741,7 +741,7 @@ devstats(int perf_select, long double etime, int havelast)
if (xflag > 0) {
printf(" extended device statistics ");
if (Tflag > 0)
printf(" tty ");
printf(" tty ");
if (Cflag > 0)
printf(" cpu ");
printf("\n");
@ -754,7 +754,7 @@ devstats(int perf_select, long double etime, int havelast)
"device r/i w/i kr/i kw/i wait svc_t %%b "
);
if (Tflag > 0)
printf("tin tout ");
printf("tin tout ");
if (Cflag > 0)
printf("us ni sy in id ");
printf("\n");
@ -895,7 +895,7 @@ devstats(int perf_select, long double etime, int havelast)
*/
printf("%52s","");
if (Tflag > 0)
printf("%4.0Lf%5.0Lf", cur.tk_nin / etime,
printf("%4.0Lf %5.0Lf", cur.tk_nin / etime,
cur.tk_nout / etime);
if (Cflag > 0)
cpustats();