Exposed a bunch of switches that are now documented.

[nmh] / uip / anno.c

diff --git a/uip/anno.c b/uip/anno.c
index 0ed6e77f98d9da60e055947be14b828004015e3b..7a91f25195f48882a3112ac8439ff7fab7772b55 100644 (file)
--- 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 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.
  *
  *     below, each line is numbered starting with 1.  A tab separates the
  *     number from the field body.
  *


@@ -74,7 +74,7 @@ DEFINE_SWITCH_ARRAY(ANNO, switches);
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static void make_comp (unsigned char **);
+static void make_comp (char **);

 
 
 int
 
 
 int


@@ -83,8 +83,7 @@ main (int argc, char **argv)
     int inplace = 1, datesw = 1;
     int msgnum;
     char *cp, *maildir;
     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;
     char **argp, **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;


@@ -95,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 */
 
     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;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -241,7 +234,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
        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 */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -275,10 +268,9 @@ main (int argc, char **argv)
 }
 
 static void
 }
 
 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: ");
 
     if (*ap == NULL) {
        printf ("Enter component name: ");


@@ -299,6 +291,6 @@ make_comp (unsigned char **ap)
        adios (NULL, "too large component name %s", *ap);
 
     for (cp = *ap; *cp; cp++)
        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);
 }
            adios (NULL, "invalid component name %s", *ap);
 }