X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscan.c;h=b22297f87555b015a1d5864039de00060ac3aa92;hb=bfad64befb4d6696fdfb63b119666eec4bac6fb3;hp=4334efe5ed7e2bf684e21b17e6536838ecac92b5;hpb=174d375bb4b9bcaa0c3f28c422216f68703494a8;p=mmh

diff --git a/uip/scan.c b/uip/scan.c
index 4334efe..b22297f 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -2,8 +2,6 @@
 /*
  * scan.c -- display a one-line "scan" listing of folder or messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -101,10 +99,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case CLRSW: 
 		    clearflag++;
@@ -155,7 +153,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	} else
 		app_msgarg(&msgs, cp);
     }
@@ -263,14 +261,7 @@ main (int argc, char **argv)
 	 msgnum += (revflag ? -1 : 1)) {
 	if (is_selected(mp, msgnum)) {
 	    if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) {
-#if 0
-		if (errno != EACCES)
-#endif
 		    admonish (cp, "unable to open message");
-#if 0
-		else
-		    printf ("%*d  unreadable\n", DMAXFOLDER, msgnum);
-#endif
 		continue;
 	    }
 
@@ -304,11 +295,7 @@ main (int argc, char **argv)
 		    adios (NULL, "scan() botch (%d)", state);
 
 		case SCNEOF: 
-#if 0
-		    printf ("%*d  empty\n", DMAXFOLDER, msgnum);
-#else
 		    advise (NULL, "message %d: empty", msgnum);
-#endif
 		    break;
 	    }
 	    hdrflag = 0;
@@ -326,5 +313,6 @@ main (int argc, char **argv)
     if (clearflag)
 	clear_screen ();
 
-    return done (0);
+    done (0);
+    return 1;
 }