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

diff --git a/uip/anno.c b/uip/anno.c
index b92abdc..ee9dcd7 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -46,13 +46,7 @@
  */
 
 #include <h/mh.h>
-
-/*
- * We allocate space for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
+#include <h/utils.h>
 
 static struct swit switches[] = {
 #define	COMPSW	0
@@ -81,26 +75,32 @@ static struct swit switches[] = {
     { "number", 2 },
 #define	APPENDSW		12
     { "append", 1 },
+#define	PRESERVESW		13
+    { "preserve", 1 },
+#define	NOPRESERVESW		14
+    { "nopreserve", 3 },
     { NULL, 0 }
 };
 
 /*
  * static prototypes
  */
-static void make_comp (char **);
+static void make_comp (unsigned char **);
 
 
 int
 main (int argc, char **argv)
 {
     int inplace = 1, datesw = 1;
-    int nummsgs, maxmsgs, msgnum;
-    char *cp, *maildir, *comp = NULL;
+    int msgnum;
+    char *cp, *maildir;
+    unsigned char *comp = NULL;
     char *text = NULL, *folder = NULL, buf[BUFSIZ];
-    char **argp, **arguments, **msgs;
+    char **argp, **arguments;
+    struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     int		append = 0;		/* append annotations instead of default prepend */
-    int		delete = -1;		/* delete header element if set */
+    int		delete = -2;		/* delete header element if set */
     char	*draft = (char *)0;	/* draft file name */
     int		isdf = 0;		/* return needed for m_draft() */
     int		list = 0;		/* list header elements if set */
@@ -117,15 +117,6 @@ main (int argc, char **argv)
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
-    /*
-     * Allocate the initial space to record message
-     * names and ranges.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
-	adios (NULL, "unable to allocate storage");
-
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -190,9 +181,16 @@ main (int argc, char **argv)
 
 		    if (argp - arguments == argc - 1 || **argp == '-')
 			number = 1;
+		    
+		    else {
+		    	if (strcmp(*argp, "all") == 0)
+		    	    number = -1;
 
-		    else if (!(number = atoi(*argp++)))
-			adios (NULL, "missing argument to %s", argp[-2]);
+		    	else if (!(number = atoi(*argp)))
+			    adios (NULL, "missing argument to %s", argp[-2]);
+
+			argp++;
+		    }
 
 		    delete = number;
 		    continue;
@@ -200,26 +198,23 @@ main (int argc, char **argv)
 		case APPENDSW:		/* append annotations instead of default prepend */
 		    append = 1;
 		    continue;
+
+		case PRESERVESW:	/* preserve access and modification times on annotated message */
+		    annopreserve(1);
+		    continue;
+
+		case NOPRESERVESW:	/* don't preserve access and modification times on annotated message (default) */
+		    annopreserve(0);
+		    continue;
 	    }
 	}
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-	} else {
-	    /*
-	     * Check if we need to allocate more space
-	     * for message name/ranges.
-	     */
-	    if (nummsgs >= maxmsgs) {
-		maxmsgs += MAXMSGS;
-		if (!(msgs = (char **) realloc (msgs,
-			(size_t) (maxmsgs * sizeof(*msgs)))))
-		    adios (NULL, "unable to reallocate msgs storage");
-	    }
-	    msgs[nummsgs++] = cp;
-	}
+		folder = pluspath (cp);
+	} else
+		app_msgarg(&msgs, cp);
     }
 
     /*
@@ -229,7 +224,7 @@ main (int argc, char **argv)
      */
 
     if (draft != (char *)0) {
-	if (nummsgs != 0)
+	if (msgs.size != 0)
 	    adios(NULL, "can only have message numbers or -draft.");
 
 	draft = getcpy(m_draft(folder, (char *)0, 1, &isdf));
@@ -241,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
@@ -251,8 +247,8 @@ main (int argc, char **argv)
 
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
-    if (!nummsgs)
-	msgs[nummsgs++] = "cur";
+    if (!msgs.size)
+	app_msgarg(&msgs, "cur");
     if (!folder)
 	folder = getfolder (1);
     maildir = m_maildir (folder);
@@ -269,8 +265,8 @@ main (int argc, char **argv)
 	adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
-    for (msgnum = 0; msgnum < nummsgs; msgnum++)
-	if (!m_convert (mp, msgs[msgnum]))
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+	if (!m_convert (mp, msgs.msgs[msgnum]))
 	    done (1);
 
     make_comp (&comp);
@@ -290,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) {