X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fanno.c;h=7de86005fb31c49aace0964c011c9f90361c44e7;hb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38;hp=ec3590c46a8a60e3dd84bc3fa315c5ebef0d207f;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;p=mmh

diff --git a/uip/anno.c b/uip/anno.c
index ec3590c..7de8600 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -110,88 +110,91 @@ main(int argc, char **argv)
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-				case UNKWNSW:
-					adios(NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
-						invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				case COMPSW:
-					if (comp)
-						adios(NULL, "only one component at a time!");
-					if (!(comp = *argp++) || *comp == '-')
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+					"%s [+folder] [msgs] [switches]",
+					invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case COMPSW:
+				if (comp)
+					adios(NULL, "only one component at a time!");
+				if (!(comp = *argp++) || *comp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case DATESW:
+				datesw++;
+				continue;
+			case NDATESW:
+				datesw = 0;
+				continue;
+
+			case INPLSW:
+				inplace++;
+				continue;
+			case NINPLSW:
+				inplace = 0;
+				continue;
+
+			case TEXTSW:
+				if (text)
+					adios(NULL, "only one body at a time!");
+				if (!(text = *argp++) || *text == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case DELETESW:  /* delete annotations */
+				delete = 0;
+				continue;
+
+			case LISTSW:  /* produce a listing */
+				list = 1;
+				continue;
+
+			case NUMBERSW: /* number listing or delete by number */
+				if (number != 0)
+					adios(NULL, "only one number at a time!");
+
+				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]);
-					continue;
-
-				case DATESW:
-					datesw++;
-					continue;
-				case NDATESW:
-					datesw = 0;
-					continue;
-
-				case INPLSW:
-					inplace++;
-					continue;
-				case NINPLSW:
-					inplace = 0;
-					continue;
-
-				case TEXTSW:
-					if (text)
-						adios(NULL, "only one body at a time!");
-					if (!(text = *argp++) || *text == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case DELETESW:  /* delete annotations */
-					delete = 0;
-					continue;
-
-				case LISTSW:  /* produce a listing */
-					list = 1;
-					continue;
-
-				case NUMBERSW:  /* number listing or delete by number */
-					if (number != 0)
-						adios(NULL, "only one number at a time!");
-
-					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]);
 
-						argp++;
-					}
+					argp++;
+				}
 
-					delete = number;
-					continue;
+				delete = number;
+				continue;
 
-				case APPENDSW:  /* append annotations instead of default prepend */
-					append = 1;
-					continue;
+			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 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;
+			case NOPRESERVESW:  /* don't preserve access and modification times on annotated message (default) */
+				annopreserve(0);
+				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
@@ -209,7 +212,7 @@ main(int argc, char **argv)
 #endif /* UCI */
 
 	if (!msgs.size)
-		app_msgarg(&msgs, "cur");
+		app_msgarg(&msgs, seq_cur);
 	if (!folder)
 		folder = getcurfol();
 	maildir = toabsdir(folder);
@@ -242,7 +245,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	context_replace(pfolder, folder);  /* update current folder  */
+	context_replace(curfolder, folder);  /* update current folder  */
 	seq_setcur(mp, mp->lowsel);  /* update current message */
 	seq_save(mp);  /* synchronize message sequences */
 	folder_free(mp);  /* free folder/message structure */