svn commit: r224037 - stable/8/contrib/top

[John Baldwin]

Author: jhb
Date: Thu Jul 14 19:25:30 2011
New Revision: 224037
URL: http://svn.freebsd.org/changeset/base/224037

Log:
  MFC 223870,223937:
  - Note that -a, -C, -H, -j, and -z are also toggles.
  - Add a leading space to the status messages output after toggling the
    'C' and 'H' flags at runtime.  This matches messages output for other
    toggles which leave the first column in the message blank to hold the
    cursor.

Modified:
  stable/8/contrib/top/top.X
  stable/8/contrib/top/top.c
Directory Properties:
  stable/8/contrib/top/   (props changed)
  stable/8/contrib/top/install-sh   (props changed)

Modified: stable/8/contrib/top/top.X
==============================================================================
--- stable/8/contrib/top/top.X	Thu Jul 14 19:18:17 2011	(r224036)
+++ stable/8/contrib/top/top.X	Thu Jul 14 19:25:30 2011	(r224037)
@@ -200,11 +200,16 @@ a user to set his or her own defaults.  
 can also be specified in the environment variable
 .BR TOP .
 The options
+.BR \-a ,
+.BR \-C ,
+.BR \-H ,
 .BR \-I ,
+.BR \-j ,
 .BR \-S ,
+.BR \-t ,
 .BR \-u ,
 and
-.B \-t
+.B \-z
 are actually toggles.  A second specification of any of these options
 will negate the first.  Thus a user who has the environment variable
 .B TOP

Modified: stable/8/contrib/top/top.c
==============================================================================
--- stable/8/contrib/top/top.c	Thu Jul 14 19:18:17 2011	(r224036)
+++ stable/8/contrib/top/top.c	Thu Jul 14 19:25:30 2011	(r224037)
@@ -1019,7 +1019,7 @@ restart:
 			    case CMD_thrtog:
 				ps.thread = !ps.thread;
 				new_message(MT_standout | MT_delayed,
-				    "Displaying threads %s",
+				    " Displaying threads %s",
 				    ps.thread ? "separately" : "as a count");
 				header_text = format_header(uname_field);
 				reset_display();
@@ -1028,7 +1028,7 @@ restart:
 			    case CMD_wcputog:
 				ps.wcpu = !ps.wcpu;
 				new_message(MT_standout | MT_delayed,
-				    "Displaying %sCPU",
+				    " Displaying %sCPU",
 				    ps.wcpu ? "W" : "");
 				header_text = format_header(uname_field);
 				reset_display();