Added multiply format function, requested by Norm.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index c3654409c5b9e609bcce88344c9e832660bf54cb..30f0f484059cd234f81e8e8129f9a9805040d836 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -11,21 +11,21 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>

-#include <errno.h>
-
-static struct swit switches[] = {
-#define FILESW         0
-    { "file name", 0 },
-#define MBOXSW         1
-    { "mbox", 0 },
-#define MMDFSW         2
-    { "mmdf", 0 },
-#define VERSIONSW      3
-    { "version", 0 },
-#define        HELPSW         4
-    { "help", 0 },
-    { NULL, 0 }
-};
+
+#define PACKF_SWITCHES \
+    X("file name", 0, FILESW) \
+    X("mbox", 0, MBOXSW) \
+    X("mmdf", 0, MMDFSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(PACKF);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(PACKF, switches);
+#undef X

 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;


@@ -46,15 +46,9 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
     struct msgs *mp;
     struct stat st;
 

-    done=mbxclose_done;
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
+    done=mbxclose_done;

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -75,10 +69,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case FILESW: 
                    if (file)
 
                case FILESW: 
                    if (file)


@@ -137,7 +131,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 */