X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4b52048fba3bcc76d256eb3d3b26b3dad52e7517..6db45651:/uip/anno.c?ds=sidebyside

diff --git a/uip/anno.c b/uip/anno.c
index 53769304..d0747176 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -1,6 +1,4 @@
-
-/*
- * anno.c -- annotate messages
+/* anno.c -- annotate messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -45,6 +43,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define ANNO_SWITCHES \
     X("component field", 0, COMPSW) \
@@ -80,18 +79,18 @@ static void make_comp (char **);
 int
 main (int argc, char **argv)
 {
-    int inplace = 1, datesw = 1;
+    bool inplace, datesw;
     int msgnum;
     char *cp, *maildir;
     char *comp = NULL, *text = NULL, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
-    int		append = 0;		/* append annotations instead of default prepend */
+    bool	append;			/* append annotations instead of default prepend */
     int		delete = -2;		/* delete header element if set */
     char	*draft = NULL;	/* draft file name */
     int		isdf = 0;		/* return needed for m_draft() */
-    int		list = 0;		/* list header elements if set */
+    bool	list;			/* list header elements if set */
     int		number = 0;		/* delete specific number of like elements if set */
 
     if (nmh_init(argv[0], 1)) { return 1; }
@@ -99,6 +98,8 @@ main (int argc, char **argv)
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
+    append = list = false;
+    inplace = datesw = true;
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -125,17 +126,17 @@ main (int argc, char **argv)
 		    continue;
 
 		case DATESW:
-		    datesw++;
+		    datesw = true;
 		    continue;
 		case NDATESW:
-		    datesw = 0;
+		    datesw = false;
 		    continue;
 
 		case INPLSW:
-		    inplace++;
+		    inplace = true;
 		    continue;
 		case NINPLSW:
-		    inplace = 0;
+		    inplace = false;
 		    continue;
 
 		case TEXTSW:
@@ -154,7 +155,7 @@ main (int argc, char **argv)
 		    continue;
 
 		case LISTSW:		/* produce a listing */
-		    list = 1;
+		    list = true;
 		    continue;
 
 		case NUMBERSW:		/* number listing or delete by number */
@@ -169,7 +170,7 @@ main (int argc, char **argv)
 		    	    number = -1;
 
 		    	else if (!(number = atoi(*argp)))
-			    adios (NULL, "missing argument to %s", argp[-2]);
+			    adios (NULL, "missing argument to %s", argp[-1]);
 
 			argp++;
 		    }
@@ -178,7 +179,7 @@ main (int argc, char **argv)
 		    continue;
 
 		case APPENDSW:		/* append annotations instead of default prepend */
-		    append = 1;
+		    append = true;
 		    continue;
 
 		case PRESERVESW:	/* preserve access and modification times on annotated message */
@@ -193,8 +194,7 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else
 		app_msgarg(&msgs, cp);
     }