X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a..4d6435dbde12837bdf4b4d594e0440392df4b9d3:/uip/anno.c

diff --git a/uip/anno.c b/uip/anno.c
index cf52021c..d815320b 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.
  *
@@ -94,13 +94,7 @@ main (int argc, char **argv)
     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;
@@ -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);