X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fanno.c;h=151282372b9988aa8171ee538bec92a8ed74cc92;hb=34940cc59d658e50484f05ad11abe848ad724526;hp=36ff4b516389516f1e3b95fe90c602660f337976;hpb=426543622b377fc5d091455cba685e114b6df674;p=mmh

diff --git a/uip/anno.c b/uip/anno.c
index 36ff4b5..1512823 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -85,6 +85,7 @@ main(int argc, char **argv)
 	char *cp, *maildir;
 	unsigned char *comp = NULL;
 	char *text = NULL, *folder = NULL, buf[BUFSIZ];
+	char *file = NULL;
 	char **argp, **arguments;
 	struct msgs_array msgs = { 0, 0, NULL };
 	struct msgs *mp;
@@ -92,6 +93,7 @@ main(int argc, char **argv)
 	int delete = -2;  /* delete header element if set */
 	int list = 0;  /* list header elements if set */
 	int number = 0; /* delete specific number of like elements if set */
+	int havemsgs = 0;
 
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
@@ -165,7 +167,11 @@ main(int argc, char **argv)
 					if (strcmp(*argp, "all") == 0)
 						number = -1;
 					else if (!(number = atoi(*argp)))
-						adios(NULL, "missing argument to %s", argp[-2]);
+						/* FIXME: fails for
+						** `-list -number l:10'
+						** but okay if we add `all'.
+						*/
+						adios(NULL, "missing argument to %s", argp[-1]);
 					argp++;
 				}
 
@@ -190,8 +196,29 @@ main(int argc, char **argv)
 				adios(NULL, "only one folder at a time!");
 			else
 				folder = getcpy(expandfol(cp));
-		} else
+		} else if (*cp == '/' || *cp == '.') {
+			if (file)
+				adios(NULL, "only one file at a time!");
+			file = cp;
+		} else {
 			app_msgarg(&msgs, cp);
+			havemsgs = 1;
+		}
+	}
+
+	if (file && (folder || havemsgs)) {
+		adios(NULL, "Don't intermix files and messages.");
+	}
+
+	make_comp(&comp);
+
+	if (file) {
+		if (list)
+			annolist(file, comp, text, number);
+		else
+			annotate(file, comp, text,
+					datesw, delete, append, preserve);
+		done(0);
 	}
 
 	if (!msgs.size)
@@ -216,8 +243,6 @@ main(int argc, char **argv)
 		if (!m_convert(mp, msgs.msgs[msgnum]))
 			done(1);
 
-	make_comp(&comp);
-
 	/* annotate all the SELECTED messages */
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {