X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fanno.c;h=e8742385fa2475c1f704de538145c116e3627c3f;hb=d38b7d5e0e1567acfef9a600d60156843154cfbc;hp=7ede7e0558531b3ca489a2ff14fb76bef6d1a72b;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;p=mmh

diff --git a/uip/anno.c b/uip/anno.c
index 7ede7e0..e874238 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -26,7 +26,7 @@ static struct swit switches[] = {
 #define DATESW 1
 	{ "date", 0 },
 #define NDATESW 2
-	{ "nodate", 0 },
+	{ "nodate", 2 },
 #define TEXTSW 3
 	{ "text body", 0 },
 #define VERSIONSW 4
@@ -34,17 +34,17 @@ static struct swit switches[] = {
 #define HELPSW 5
 	{ "help", 0 },
 #define LISTSW 6
-	{ "list", 1 },
+	{ "list", 0 },
 #define DELETESW 7
-	{ "delete", 2 },
+	{ "delete", 0 },
 #define NUMBERSW 8
-	{ "number", 2 },
+	{ "number", 0 },
 #define APPENDSW 9
-	{ "append", 1 },
+	{ "append", 0 },
 #define PRESERVESW 10
-	{ "preserve", 1 },
+	{ "preserve", 0 },
 #define NOPRESERVESW 11
-	{ "nopreserve", 3 },
+	{ "nopreserve", 2 },
 	{ NULL, 0 }
 };
 
@@ -74,9 +74,7 @@ main(int argc, char **argv)
 	int append = 0;  /* append annotations instead of default prepend */
 	int number = 0; /* delete specific number of like elements if set */
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 	context_read();
 
@@ -330,10 +328,7 @@ annolist(char *file, unsigned char *comp, int number)
 
 		if (strncasecmp(field, comp, length)==0 &&
 				field[length] == ':') {
-			for (cp = field + length + 1;
-					*cp == ' ' || *cp == '\t'; cp++) {
-				continue;
-			}
+			cp = trim(field + length + 1);
 			if (number) {
 				printf("%d\t", count++);
 			}