X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f67e3671c985ad8095dc6fcc8be7ba6dd25cdf63..a3724ed3:/uip/anno.c?ds=sidebyside

diff --git a/uip/anno.c b/uip/anno.c
index 0ed6e77f..145cc97c 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
@@ -34,7 +32,7 @@
  *	option is specified, only the last path name component of each field
  *	body is output.  The entire field body is output if the -text option
  *	is used; the contents of the -text argument are ignored.  If the -list
- *	option is used in conjuction with the new -number option described
+ *	option is used in conjunction with the new -number option described
  *	below, each line is numbered starting with 1.  A tab separates the
  *	number from the field body.
  *
@@ -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) \
@@ -74,7 +73,7 @@ DEFINE_SWITCH_ARRAY(ANNO, switches);
 /*
  * static prototypes
  */
-static void make_comp (unsigned char **);
+static void make_comp (char **);
 
 
 int
@@ -83,25 +82,18 @@ main (int argc, char **argv)
     int inplace = 1, datesw = 1;
     int msgnum;
     char *cp, *maildir;
-    unsigned char *comp = NULL;
-    char *text = NULL, *folder = NULL, buf[BUFSIZ];
+    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 */
     int		delete = -2;		/* delete header element if set */
-    char	*draft = (char *)0;	/* draft file name */
+    char	*draft = NULL;	/* draft file name */
     int		isdf = 0;		/* return needed for m_draft() */
     int		list = 0;		/* list header elements if set */
     int		number = 0;		/* delete specific number of like elements if set */
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -176,7 +168,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++;
 		    }
@@ -212,11 +204,11 @@ main (int argc, char **argv)
      *	message numbers below.
      */
 
-    if (draft != (char *)0) {
+    if (draft != NULL) {
 	if (msgs.size != 0)
 	    adios(NULL, "can only have message numbers or -draft.");
 
-	draft = getcpy(m_draft(folder, (char *)0, 1, &isdf));
+	draft = getcpy(m_draft(folder, NULL, 1, &isdf));
 
 	make_comp(&comp);
 
@@ -241,7 +233,7 @@ main (int argc, char **argv)
 	adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))
 	adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
@@ -275,10 +267,9 @@ main (int argc, char **argv)
 }
 
 static void
-make_comp (unsigned char **ap)
+make_comp (char **ap)
 {
-    register unsigned char *cp;
-    char buffer[BUFSIZ];
+    char *cp, buffer[BUFSIZ];
 
     if (*ap == NULL) {
 	printf ("Enter component name: ");
@@ -291,7 +282,7 @@ make_comp (unsigned char **ap)
 
     if ((cp = *ap + strlen (*ap) - 1) > *ap && *cp == ':')
 	*cp = 0;
-    if (strlen (*ap) == 0)
+    if (!**ap)
 	adios (NULL, "null component name");
     if (**ap == '-')
 	adios (NULL, "invalid component name %s", *ap);
@@ -299,6 +290,6 @@ make_comp (unsigned char **ap)
 	adios (NULL, "too large component name %s", *ap);
 
     for (cp = *ap; *cp; cp++)
-	if (!isalnum (*cp) && *cp != '-')
+	if (!isalnum ((unsigned char) *cp) && *cp != '-')
 	    adios (NULL, "invalid component name %s", *ap);
 }