X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6b4bc4a25eaac2eddd1bef51e3f00c21f98ed32d..b246954f6e1422c732780c8f568b3beb0e386964:/uip/packf.c

diff --git a/uip/packf.c b/uip/packf.c
index d82ef782..0fd1af17 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -1,6 +1,4 @@
-
-/*
- * packf.c -- pack a nmh folder into a file
+/* 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
@@ -11,7 +9,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 +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;
@@ -118,7 +109,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);
     }
@@ -182,7 +173,7 @@ main (int argc, char **argv)
     return 1;
 }
 
-static void
+static void NORETURN
 mbxclose_done (int status)
 {
     mbx_close (file, md);