X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpackf.c;h=fc7fcba0337f404be5aa9d8038e3cfb8c430bf95;hp=a7b35ba145a85c949188f9afe6b0a0a0ad7ca439;hb=ef1216bc36bd48ceb7549ae76aa7c26e3be4d9e4;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1

diff --git a/uip/packf.c b/uip/packf.c
index a7b35ba..fc7fcba 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -15,20 +15,14 @@
 static struct swit switches[] = {
 #define FILESW  0
 	{ "file name", 0 },
-#define MBOXSW  1
-	{ "mbox", 0 },
-#define MMDFSW  2
-	{ "mmdf", 0 },
-#define VERSIONSW  3
+#define VERSIONSW  1
 	{ "version", 0 },
-#define HELPSW  4
+#define HELPSW  2
 	{ "help", 0 },
 	{ NULL, 0 }
 };
 
 static int md = NOTOK;
-static int mbx_style = MBOX_FORMAT;
-static int mapping = 0;
 
 static void mbxclose_done(int) NORETURN;
 
@@ -85,15 +79,6 @@ main(int argc, char **argv)
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
-
-			case MBOXSW:
-				mbx_style = MBOX_FORMAT;
-				mapping = 0;
-				continue;
-			case MMDFSW:
-				mbx_style = MMDF_FORMAT;
-				mapping = 1;
-				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
@@ -123,7 +108,7 @@ main(int argc, char **argv)
 
 	/* default is to pack whole folder */
 	if (!msgs.size)
-		app_msgarg(&msgs, "all");
+		app_msgarg(&msgs, seq_all);
 
 	if (!folder)
 		folder = getcurfol();
@@ -147,7 +132,7 @@ main(int argc, char **argv)
 	seq_setprev(mp);  /* set the previous-sequence */
 
 	/* open and lock new maildrop file */
-	if ((md = mbx_open(file, mbx_style, getuid(), getgid(), m_gmprot()))
+	if ((md = mbx_open(file, getuid(), getgid(), m_gmprot()))
 			== NOTOK)
 		adios(file, "unable to open");
 
@@ -160,8 +145,7 @@ main(int argc, char **argv)
 				break;
 			}
 
-			if (mbx_copy(file, mbx_style, md, fd, mapping, NULL, 1)
-					== NOTOK)
+			if (mbx_copy(md, fd) == NOTOK)
 				adios(file, "error writing to file");
 
 			close(fd);