readline(3) wrapper: Move free(3) of line to where it's reachable.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index fb8871d97dae7afb31570629a6152d7f594696c6..94a18eff2697d0930f0493fccb9f7efba862c9d9 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -1,8 +1,4 @@
-
-/*
- * packf.c -- pack a nmh folder into a file
- *
- * $Id$
+/* packf.c -- pack a nmh folder into a file
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,27 +9,27 @@
 #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 }
-};
+#include "sbr/m_maildir.h"
+
+#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 mapping = 0;
 
-static void mbxclose_done(int);
+static void mbxclose_done(int) NORETURN;
 
 char *file = NULL;
 
@@ -48,15 +44,9 @@ main (int argc, char **argv)
     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;
@@ -77,10 +67,10 @@ main (int argc, char **argv)
                    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);
-                   done (1);
+                   done (0);
 
                case FILESW: 
                    if (file)
@@ -91,11 +81,9 @@ main (int argc, char **argv)
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;
-                   mapping = 0;
                    continue;
                case MMDFSW:
                    mbx_style = MMDF_FORMAT;
-                   mapping = 1;
                    continue;
            }
        }
@@ -119,7 +107,7 @@ main (int argc, char **argv)
        if (errno != ENOENT)
            adios (file, "error on file");
        cp = concat ("Create file \"", file, "\"? ", NULL);
-       if (!getanswer (cp))
+       if (!read_yes_or_no_if_tty (cp))
            done (1);
        free (cp);
     }
@@ -139,7 +127,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 */
@@ -164,7 +152,7 @@ main (int argc, char **argv)
                break;
            }
 
-           if (mbx_copy (file, mbx_style, md, fd, mapping, NULL, 1) == NOTOK)
+           if (mbx_copy (file, mbx_style, md, fd, NULL) == NOTOK)
                adios (file, "error writing to file");
 
            close (fd);
@@ -183,7 +171,7 @@ main (int argc, char **argv)
     return 1;
 }
 
-static void
+static void NORETURN
 mbxclose_done (int status)
 {
     mbx_close (file, md);