X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fanno.c;h=ee9dcd71486d3a9dc35ddd0478c0a90c8467af8b;hp=0d4413492fc6f018da6db78ba55d67d88b49eb9a;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=174d375bb4b9bcaa0c3f28c422216f68703494a8

diff --git a/uip/anno.c b/uip/anno.c
index 0d44134..ee9dcd7 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -85,7 +85,7 @@ static struct swit switches[] = {
 /*
  * static prototypes
  */
-static void make_comp (char **);
+static void make_comp (unsigned char **);
 
 
 int
@@ -93,7 +93,8 @@ main (int argc, char **argv)
 {
     int inplace = 1, datesw = 1;
     int msgnum;
-    char *cp, *maildir, *comp = NULL;
+    char *cp, *maildir;
+    unsigned char *comp = NULL;
     char *text = NULL, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -211,7 +212,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);
     }
@@ -235,7 +236,8 @@ main (int argc, char **argv)
 	else
 	    annotate (draft, comp, text, inplace, datesw, delete, append);
 
-	return (done(0));
+	done(0);
+	return 1;
     }
 
 #ifdef UCI
@@ -284,13 +286,14 @@ main (int argc, char **argv)
     seq_save (mp);	/* synchronize message sequences */
     folder_free (mp);	/* free folder/message structure */
     context_save ();	/* save the context file         */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 static void
-make_comp (char **ap)
+make_comp (unsigned char **ap)
 {
-    register char *cp;
+    register unsigned char *cp;
     char buffer[BUFSIZ];
 
     if (*ap == NULL) {