X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/afee8ed17a56617618fb7f963b111d7cf0fb56e7..c0ee509559273a5133ff73026e76c19aca65fa87:/uip/picksbr.c?ds=sidebyside

diff --git a/uip/picksbr.c b/uip/picksbr.c
index c572cde0..3c2107c2 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";
@@ -249,6 +243,7 @@ parse (void)
 	    if ((o->n_R_child = parse ()))
 		return o;
 	    padvise (NULL, "missing disjunctive");
+	    free (o);
 	    return NULL;
 
 header: ;
@@ -269,6 +264,7 @@ nexp1 (void)
 
     if (*cp != '-') {
 	padvise (NULL, "%s unexpected", cp);
+	free (n);
 	return NULL;
     }
 
@@ -278,10 +274,12 @@ nexp1 (void)
 	case AMBIGSW: 
 	    ambigsw (cp, parswit);
 	    talked++;
+	    free (n);
 	    return NULL;
 	case UNKWNSW: 
 	    fprintf (stderr, "-%s unknown\n", cp);
 	    talked++;
+	    free (n);
 	    return NULL;
 
 	case PRAND: 
@@ -290,6 +288,7 @@ nexp1 (void)
 	    if ((o->n_R_child = nexp1 ()))
 		return o;
 	    padvise (NULL, "missing conjunctive");
+	    free (o);
 	    return NULL;
 
 header: ;
@@ -331,6 +330,7 @@ nexp2 (void)
 	    if ((n->n_L_child = nexp3 ()))
 		return n;
 	    padvise (NULL, "missing negation");
+	    free (n);
 	    return NULL;
 
 header: ;
@@ -412,12 +412,14 @@ nexp3 (void)
 	    n->n_header = 0;
 	    if (!(cp = nxtarg ())) {/* allow -xyz arguments */
 		padvise (NULL, "missing argument to %s", argp[-2]);
+		free (n);
 		return NULL;
 	    }
 	    dp = cp;
     pattern: ;
 	    if (!gcompile (n, dp)) {
 		padvise (NULL, "pattern error in %s %s", argp[-2], cp);
+		free (n);
 		return NULL;
 	    }
 	    n->n_patbuf = getcpy (dp);
@@ -444,6 +446,7 @@ nexp3 (void)
 	    n->n_datef = datesw;
 	    if (!tcompile (cp, &n->n_tws, n->n_after = i == PRAFTR)) {
 		padvise (NULL, "unable to parse %s %s", argp[-2], cp);
+		free (n);
 		return NULL;
 	    }
 	    return n;
@@ -456,7 +459,7 @@ newnexus (int (*action)())
 {
     register struct nexus *p;
 
-    if ((p = (struct nexus *) calloc ((size_t) 1, sizeof *p)) == NULL)
+    if ((p = (struct nexus *) mh_xcalloc ((size_t) 1, sizeof *p)) == NULL)
 	adios (NULL, "unable to allocate component storage");
 
     p->n_action = action;
@@ -474,12 +477,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));
@@ -562,8 +565,8 @@ gcompile (struct nexus *n, char *astr)
     int cclcnt;
     register unsigned char *ep, *dp, *sp, *lastep = 0;
 
-    dp = (ep = n->n_expbuf) + sizeof n->n_expbuf;
-    sp = astr;
+    dp = (ep = (unsigned char *) n->n_expbuf) + sizeof n->n_expbuf;
+    sp = (unsigned char *) astr;
     if (*sp == '^') {
 	n->n_circf = 1;
 	sp++;
@@ -802,7 +805,7 @@ advance (char *alp, char *aep)
 	star: 
 		do {
 		    lp--;
-		    if (advance (lp, ep))
+		    if (advance ((char *) lp, (char *) ep))
 			return (1);
 		} while (lp > curlp);
 		return 0;
@@ -895,19 +898,19 @@ tws_special (char *ap)
     register struct tws *tw;
 
     time (&clock);
-    if (!mh_strcasecmp (ap, "today"))
+    if (!strcasecmp (ap, "today"))
 	return dlocaltime (&clock);
-    if (!mh_strcasecmp (ap, "yesterday")) {
+    if (!strcasecmp (ap, "yesterday")) {
 	clock -= (long) (60 * 60 * 24);
 	return dlocaltime (&clock);
     }
-    if (!mh_strcasecmp (ap, "tomorrow")) {
+    if (!strcasecmp (ap, "tomorrow")) {
 	clock += (long) (60 * 60 * 24);
 	return dlocaltime (&clock);
     }
 
     for (i = 0; tw_ldotw[i]; i++)
-	if (!mh_strcasecmp (ap, tw_ldotw[i]))
+	if (!strcasecmp (ap, tw_ldotw[i]))
 	    break;
     if (tw_ldotw[i]) {
 	if ((tw = dlocaltime (&clock)) == NULL)
@@ -951,7 +954,7 @@ plist
 		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
 		    bp = add (buf, bp);
 		}
-		if (!mh_strcasecmp (name, n->n_datef))
+		if (!strcasecmp (name, n->n_datef))
 		    break;
 		continue;