Replace `if (p) free(p)' with `mh_xfree(p)'.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 53e696afb78f69233a72311b9e1cf8f6c5ee84b8..d8e037db3d17bfecb862dd9e087f0d378363c526 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
-#include <errno.h>
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
@@ -47,15 +46,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;
@@ -118,7 +111,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);
     }
@@ -138,7 +131,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 */