X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpackf.c;h=62c09da3ace00f25d62afe9e842e95c3282a1b80;hb=de448e64862babc8ea92d6ee3f61f68ba3915128;hp=faf199c01fe8628c38c5a8bacc38c57e56548d56;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38;p=mmh

diff --git a/uip/packf.c b/uip/packf.c
index faf199c..62c09da 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 == '@') {
@@ -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(file, md, fd, 1) == NOTOK)
 				adios(file, "error writing to file");
 
 			close(fd);