mdeliver: deliver to new/ by default, use -c for cur/ now

man/mdeliver.1

@@ -6,7 +6,7 @@
 .Nd deliver message or mailbox into Maildir
 .Sh SYNOPSIS
 .Nm
-.Op Fl n
+.Op Fl c
 .Op Fl v
 .Op Fl X Ar flags
 .Ar dir
@@ -14,7 +14,7 @@
 .Ar message
 .Nm
 .Fl M
-.Op Fl n
+.Op Fl c
 .Op Fl v
 .Op Fl X Ar flags
 .Ar dir
@@ -54,11 +54,11 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl M
 Deliver each message of an mbox.
-.It Fl n
+.It Fl c
 Deliver messages into
-.Pa new/ ,
+.Pa cur/ ,
 not
-.Pa cur/
+.Pa new/
 (the default).
 .It Fl v
 Print each message filename after delivery.

mdeliver.c

@@ -19,12 +19,11 @@ design rationale:
   MBOX-O fine
 - date from Date: since From lines are usually crap
 - proper maildir delivery because it's not that hard
-- messages end up in cur/ by default because you are usually importing archives
 - no creation of maildirs, should be a separate tool
 */
 
+static int cflag;
 static int Mflag;
-static int nflag;
 static int vflag;
 static char *Xflag;
 
@@ -156,7 +155,7 @@ tryagain:
 		*f = 0;
 
 		snprintf(dst, sizeof dst, "%s/%s/%s:2,%s",
-			 targetdir, nflag ? "new" : "cur", id,
+			 targetdir, cflag ? "cur" : "new", id,
 			 Xflag ? Xflag : statusflags);
 		if (rename(tmp, dst) != 0)
 			return -1;
@@ -171,16 +170,16 @@ int
 main(int argc, char *argv[])
 {
 	int c;
-	while ((c = getopt(argc, argv, "MnvX:")) != -1)
+	while ((c = getopt(argc, argv, "cMvX:")) != -1)
 		switch(c) {
+		case 'c': cflag = 1; break;
 		case 'M': Mflag = 1; break;
-		case 'n': nflag = 1; break;
 		case 'v': vflag = 1; break;
 		case 'X': Xflag = optarg; break;
 		default:
 			fprintf(stderr,
-"Usage: mdeliver [-n] [-v] [-X flags] dir < message\n"
+"Usage: mdeliver [-c] [-v] [-X flags] dir < message\n"
-"       mdeliver -M [-n] [-v] [-X flags] dir < mbox\n"
+"       mdeliver -M [-c] [-v] [-X flags] dir < mbox\n"
 				);
 			exit(1);
 		}