From: David Levine <levinedl@acm.org>
Date: Sun, 3 Aug 2014 12:53:15 +0000 (-0500)
Subject: Added -debug switch to pick(1) and deprecated $MHPDEBUG.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ca5ae3e652ed0fb43efaabd697162fd1c28d09ba?ds=inline;hp=40a17f8f191deee9f27fd3dd394eda9a641e6f1c

Added -debug switch to pick(1) and deprecated $MHPDEBUG.
---

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 7830242d..81946359 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -22,6 +22,10 @@ OBSOLETE FEATURES
 -------------------
 DEPRECATED FEATURES
 -------------------
+
+- Support for the MHPDEBUG environment variable is deprecated and will be
+  removed from a future nmh release.  Instead, use the -debug switch to pick.
+
 ---------
 BUG FIXES
 ---------
diff --git a/h/picksbr.h b/h/picksbr.h
index 27c2e66c..fc3bc2a7 100644
--- a/h/picksbr.h
+++ b/h/picksbr.h
@@ -7,4 +7,4 @@
  * prototypes
  */
 int pcompile (char **, char *);
-int pmatches (FILE *, int, long, long);
+int pmatches (FILE *, int, long, long, int);
diff --git a/man/mh-profile.man b/man/mh-profile.man
index 3ebae8ba..1cdc7395 100644
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -878,6 +878,13 @@ will emit debugging information.
 If this variable is set to a non-null value,
 .B pick
 will emit a representation of the search pattern.
+.B $MHPDEBUG
+is deprecated, so support for this variable will
+be removed from a future nmh release.  Instead,
+.B pick
+now supports a
+.B \-debug
+switch.
 .RE
 .PP
 .B $MHWDEBUG
diff --git a/man/pick.man b/man/pick.man
index 38166453..e023db5c 100644
--- a/man/pick.man
+++ b/man/pick.man
@@ -1,4 +1,4 @@
-.TH PICK %manext1% "March 1, 2014" "%nmhversion%"
+.TH PICK %manext1% "August 3, 2014" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -46,6 +46,7 @@ pick \- search for messages by content
 .RB [ \-public " | " \-nopublic ]
 .RB [ \-zero " | " \-nozero ]
 .RB [ \-list " | " \-nolist ] 
+.RB [ \-debug ]
 .RB [ \-version ]
 .RB [ \-help ]
 .PP
@@ -287,6 +288,11 @@ in the
 same way
 .B mark
 uses them.
+.PP
+The
+.B \-debug
+switch causes pick to output a representation of the search
+pattern.
 .SS "Output when no messages are matched"
 If
 .B pick
diff --git a/test/pick/test-pick b/test/pick/test-pick
index 4eff47cb..858d8e75 100755
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -76,10 +76,9 @@ run_test 'pick -not -lbrace -subject NoMatch -and -subject message.3 -rbrace' \
 10
 11'
 
-# Test MHPDEBUG.
-# Don't use run_prog here because it loses the environment setting.
-MHPDEBUG=1 pick -not -lbrace -subject NoMatch -and -subject message.3 -rbrace \
- >/dev/null 2>"$actual"
+# Test -debug.
+run_prog pick -debug -not -lbrace -subject NoMatch -and -subject message.3 \
+  -rbrace >/dev/null 2>"$actual"
 cat >"$expected" <<EOF
 NOT
 | AND
diff --git a/uip/pick.c b/uip/pick.c
index 740f6f0a..d29799b7 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -36,6 +36,7 @@
     X("nozero", 0, NZEROSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
+    X("debug", 0, DEBUGSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
 
@@ -65,11 +66,16 @@ main (int argc, char **argv)
     struct msgnum_array nums = { 0, 0, NULL };
     struct msgs *mp, *mp2;
     register FILE *fp;
+    int debug = 0;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
     done=putzero_done;
 
+    /* Deprecated.  Use -debug instead. */
+    if ((cp = getenv ("MHPDEBUG")) && *cp)
+	++debug;
+
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -156,6 +162,10 @@ main (int argc, char **argv)
 	    case NLISTSW: 
 		listsw = 0;
 		continue;
+
+	    case DEBUGSW:
+		++debug;
+		continue;
 	    }
 	}
 	if (*cp == '+' || *cp == '@') {
@@ -225,7 +235,7 @@ main (int argc, char **argv)
 	if (is_selected (mp, msgnum)) {
 	    if ((fp = fopen (cp = m_name (msgnum), "r")) == NULL)
 		admonish (cp, "unable to read message");
-	    if (fp && pmatches (fp, msgnum, 0L, 0L)) {
+	    if (fp && pmatches (fp, msgnum, 0L, 0L, debug)) {
 		if (listsw)
 		    printf ("%s\n", m_name (msgnum));
 	    } else {
diff --git a/uip/picksbr.c b/uip/picksbr.c
index 60354703..74834f4e 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -157,7 +157,6 @@ struct nexus {
 #define	n_tws	 un.st3.un_tws
 
 static int talked;
-static int pdebug = 0;
 
 static char *datesw;
 static char **argp;
@@ -195,11 +194,6 @@ static int TWSaction();
 int
 pcompile (char **vec, char *date)
 {
-    register char *cp;
-
-    if ((cp = getenv ("MHPDEBUG")) && *cp)
-	pdebug++;
-
     argp = vec;
     if ((datesw = date) == NULL)
 	datesw = "date";
@@ -474,12 +468,12 @@ newnexus (int (*action)())
 		    stop;
 
 int
-pmatches (FILE *fp, int msgnum, long start, long stop)
+pmatches (FILE *fp, int msgnum, long start, long stop, int debug)
 {
     if (!head)
 	return 1;
 
-    if (!talked++ && pdebug)
+    if (!talked++ && debug)
 	PRaction (head, 0);
 
     return (*head->n_action) (args (head));