svn commit: r244279 - stable/9/usr.bin/ministat

[Eitan Adler]

Author: eadler
Date: Sat Dec 15 21:57:34 2012
New Revision: 244279
URL: http://svnweb.freebsd.org/changeset/base/244279

Log:
  MFC r243079:
  	Add option to suppress just the plot in ministat while still retaining
  	the relative comparison (i.e., useful part).
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/usr.bin/ministat/ministat.1
  stable/9/usr.bin/ministat/ministat.c
Directory Properties:
  stable/9/usr.bin/ministat/   (props changed)

Modified: stable/9/usr.bin/ministat/ministat.1
==============================================================================
--- stable/9/usr.bin/ministat/ministat.1	Sat Dec 15 21:47:05 2012	(r244278)
+++ stable/9/usr.bin/ministat/ministat.1	Sat Dec 15 21:57:34 2012	(r244279)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 28, 2010
+.Dd November 10, 2012
 .Dt MINISTAT 1
 .Os
 .Sh NAME
@@ -33,7 +33,7 @@
 .Nd statistics utility
 .Sh SYNOPSIS
 .Nm
-.Op Fl ns
+.Op Fl Ans
 .Op Fl C Ar column
 .Op Fl c Ar confidence_level
 .Op Fl d Ar delimiter
@@ -47,6 +47,9 @@ in the specified files or, if no file is
 .Pp
 The options are as follows:
 .Bl -tag -width Fl
+.It Fl A
+Just report the statistics of the input and relative comparisons,
+suppress the ASCII-art plot.
 .It Fl n
 Just report the raw statistics of the input, suppress the ASCII-art plot
 and the relative comparisons.

Modified: stable/9/usr.bin/ministat/ministat.c
==============================================================================
--- stable/9/usr.bin/ministat/ministat.c	Sat Dec 15 21:47:05 2012	(r244278)
+++ stable/9/usr.bin/ministat/ministat.c	Sat Dec 15 21:57:34 2012	(r244279)
@@ -509,7 +509,7 @@ usage(char const *whine)
 
 	fprintf(stderr, "%s\n", whine);
 	fprintf(stderr,
-	    "Usage: ministat [-C column] [-c confidence] [-d delimiter(s)] [-ns] [-w width] [file [file ...]]\n");
+	    "Usage: ministat [-C column] [-c confidence] [-d delimiter(s)] [-Ans] [-w width] [file [file ...]]\n");
 	fprintf(stderr, "\tconfidence = {");
 	for (i = 0; i < NCONF; i++) {
 		fprintf(stderr, "%s%g%%",
@@ -517,6 +517,7 @@ usage(char const *whine)
 		    studentpct[i]);
 	}
 	fprintf(stderr, "}\n");
+	fprintf(stderr, "\t-A : print statistics only. suppress the graph.\n");
 	fprintf(stderr, "\t-C : column number to extract (starts and defaults to 1)\n");
 	fprintf(stderr, "\t-d : delimiter(s) string, default to \" \\t\"\n");
 	fprintf(stderr, "\t-n : print summary statistics only, no graph/test\n");
@@ -538,6 +539,7 @@ main(int argc, char **argv)
 	int flag_s = 0;
 	int flag_n = 0;
 	int termwidth = 74;
+	int suppress_plot = 0;
 
 	if (isatty(STDOUT_FILENO)) {
 		struct winsize wsz;
@@ -550,8 +552,11 @@ main(int argc, char **argv)
 	}
 
 	ci = -1;
-	while ((c = getopt(argc, argv, "C:c:d:snw:")) != -1)
+	while ((c = getopt(argc, argv, "AC:c:d:snw:")) != -1)
 		switch (c) {
+		case 'A':
+			suppress_plot = 1;
+			break;
 		case 'C':
 			column = strtol(optarg, &p, 10);
 			if (p != NULL && *p != '\0')
@@ -610,7 +615,7 @@ main(int argc, char **argv)
 	for (i = 0; i < nds; i++) 
 		printf("%c %s\n", symbol[i+1], ds[i]->name);
 
-	if (!flag_n) {
+	if (!flag_n && !suppress_plot) {
 		SetupPlot(termwidth, flag_s, nds);
 		for (i = 0; i < nds; i++)
 			DimPlot(ds[i]);