X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpick.c;h=2d9b76eb039545a6c5118257c3d492f341d2d60e;hb=e98f7f60095bceba1f32e448c421b3e862b728aa;hp=8fd294ee140fc85caf6e17e1641cc8fe87bc4065;hpb=174d375bb4b9bcaa0c3f28c422216f68703494a8;p=mmh

diff --git a/uip/pick.c b/uip/pick.c
index 8fd294e..2d9b76e 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -68,6 +68,7 @@ static struct swit switches[] = {
 
 static int listsw = -1;
 
+static void putzero_done (int) NORETURN;
 
 int
 main (int argc, char **argv)
@@ -81,6 +82,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     register FILE *fp;
 
+    done=putzero_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -177,7 +180,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);
     }
@@ -283,15 +286,15 @@ main (int argc, char **argv)
     seq_save (mp);			/* synchronize message sequences */
     context_save ();			/* save the context file         */
     folder_free (mp);			/* free folder/message structure */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
-int
-done (int status)
+static void
+putzero_done (int status)
 {
     if (listsw && status && !isatty (fileno (stdout)))
 	printf ("0\n");
     exit (status);
-    return 1;  /* dead code to satisfy the compiler */
 }