X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/61e09274bb3338efbd9c50f797751853c99dba3b..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/anno.c?ds=inline

diff --git a/uip/anno.c b/uip/anno.c
index cf52021c..53769304 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -34,7 +34,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.
  *
@@ -89,18 +89,12 @@ main (int argc, char **argv)
     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;
@@ -211,11 +205,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);
 
@@ -240,7 +234,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 */
@@ -289,7 +283,7 @@ make_comp (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);