Replace -b with -C and -B (as proposed by Alexander).

Add -3, -A and -B to the usage.
Update regression test for the new parameters.

2 files changed, 23 insertions, 9 deletions

diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index d9973c2..8429906 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -60,6 +60,10 @@
 .Op Fl A Ar number
 .Op Fl B Ar number
 .Op Ar year
+.Nm ncal
+.Op Fl CN
+.Op Fl H Ar yyyy-mm-dd
+.Op Fl d Ar yyyy-mm
 .Sh DESCRIPTION
 The
 .Nm
@@ -127,8 +131,14 @@ of months after the current month.
 Display the
 .Ar number
 of months before the current month.
-.It Fl b
-Switch to backwards compatibility mode (for debugging).
+.It Fl C
+Switch to
+.Nm cal
+mode.
+.It Fl N
+Switch to
+.Nm ncal
+mode.
 .It Fl d Ar yyyy-mm
 Use
 .Ar yyyy-mm
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 9f077fb..5ab9a21 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -256,7 +256,7 @@ main(int argc, char *argv[])
 
 	before = after = -1;
 
-	while ((ch = getopt(argc, argv, "A:B:3Jbd:eH:hjm:ops:wy")) != -1)
+	while ((ch = getopt(argc, argv, "3A:B:Cd:eH:hjJm:Nops:wy")) != -1)
 		switch (ch) {
 		case '3':
 			flag_3months = 1;
@@ -283,9 +283,12 @@ main(int argc, char *argv[])
 			nswitch = ndaysj(&never);
 			flag_julian_cal = 1;
 			break;
-		case 'b':
+		case 'C':
 			flag_backward = 1;
 			break;
+		case 'N':
+			flag_backward = 0;
+			break;
 		case 'd':
 			flag_today = optarg;
 			break;
@@ -500,11 +503,12 @@ usage(void)
 {
 
 	fputs(
-	    "usage: cal [-hjy] [[month] year]\n"
-	    "       cal [-hj] [-m month] [year]\n"
-	    "       ncal [-hJjpwy] [-s country_code] [[month] year]\n"
-	    "       ncal [-hJeo] [year]\n"
-	    "for debug the highlighting: [-b] [-H yyyy-mm-dd] [-d yyyy-mm]\n",
+"Usage: cal [general options] [-hjy] [[month] year]\n"
+"       cal [general options] [-hj] [-m month] [year]\n"
+"       ncal [general options] [-hJjpwy] [-s country_code] [[month] year]\n"
+"       ncal [general options] [-hJeo] [year]\n"
+"General options: [-NC3] [-A months] [-B months]\n"
+"For debug the highlighting: [-H yyyy-mm-dd] [-d yyyy-mm]\n",
 	    stderr);
 	exit(EX_USAGE);
 }