X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/64e8827c5d5def0325ab7181fe939623c77e807c..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 6f951914..94a18eff 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,6 +9,7 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
@@ -29,7 +28,6 @@ DEFINE_SWITCH_ARRAY(PACKF, switches);
 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
-static int mapping = 0;
 
 static void mbxclose_done(int) NORETURN;
 
@@ -46,13 +44,9 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
-    done=mbxclose_done;
-
-    setlocale(LC_ALL, "");
-    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;
@@ -87,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;
 	    }
 	}
@@ -115,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);
     }
@@ -160,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);
@@ -179,7 +171,7 @@ main (int argc, char **argv)
     return 1;
 }
 
-static void
+static void NORETURN
 mbxclose_done (int status)
 {
     mbx_close (file, md);