X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/012d05c2b62332eb400d66b806e48216d39358c6..7ec0c9a0229aa160d7419922d2f4ba7e87480cd6:/uip/pick.c

diff --git a/uip/pick.c b/uip/pick.c
index fba190a2..c5025888 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1,6 +1,4 @@
-
-/*
- * pick.c -- search for messages by content
+/* pick.c -- search for messages by content
  *
  * This code is Copyright (c) 2002, 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -66,9 +64,10 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgnum_array nums = { 0, 0, NULL };
     struct msgs *mp, *mp2;
-    register FILE *fp;
+    FILE *fp;
     int debug = 0;
     int reverse = 0;
+    int start, end, inc;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
@@ -237,15 +236,22 @@ main (int argc, char **argv)
      * match.  If there is NOT a match, then add it to a list to
      * remove from the final sequence (it will make sense later)
      */
-    for (msgnum = reverse ? mp->hghsel : mp->lowsel;
-         reverse ? msgnum >= mp->lowsel : msgnum <= mp->hghsel;
-         msgnum += reverse ? -1 : 1) {
+    if (!reverse) { /* Overflow or underflow is fine. */
+        start = mp->lowsel;
+        end = mp->hghsel + 1;
+        inc = 1;
+    } else {
+        start = mp->hghsel;
+        end = mp->lowsel - 1;
+        inc = -1;
+    }
+    for (msgnum = start; msgnum != end; msgnum += inc) {
 	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, debug)) {
 		if (listsw)
-		    printf ("%s\n", m_name (msgnum));
+		    puts(m_name (msgnum));
 	    } else {
 	    	app_msgnum(&nums, msgnum);
 	    }
@@ -316,6 +322,6 @@ static void
 putzero_done (int status)
 {
     if (listsw && status && !isatty (fileno (stdout)))
-	printf ("0\n");
+	puts("0");
     exit (status);
 }