[dovecot-cvs] dovecot/src/deliver deliver.c,1.12,1.13

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv5480

Modified Files:
	deliver.c 
Log Message:
Added -m parameter to store mail to non-INBOX mailbox without Sieve
scripting.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- deliver.c	3 Oct 2005 21:25:03 -0000	1.12
+++ deliver.c	16 Oct 2005 14:48:25 -0000	1.13
@@ -343,6 +343,7 @@
 int main(int argc, char *argv[])
 {
 	const char *auth_socket = DEFAULT_AUTH_SOCKET_PATH;
+	const char *mailbox = "INBOX";
 	const char *destination, *mail;
         const struct var_expand_table *table;
         enum mail_storage_flags flags;
@@ -378,6 +379,14 @@
 					"Missing auth socket path argument");
 			}
 			auth_socket = argv[i];
+		} else if (strcmp(argv[i], "-m") == 0) {
+			/* destination mailbox */
+			i++;
+			if (i == argc) {
+				i_fatal_status(EX_USAGE,
+					       "Missing mailbox argument");
+			}
+			mailbox = argv[i];
 		} else {
 			i_fatal_status(EX_USAGE,
 				       "Unknown argument: %s", argv[1]);
@@ -454,7 +463,7 @@
 
 	net_set_nonblock(0, TRUE);
 	input = i_stream_create_file(0, default_pool, 8192, FALSE);
-	if (save_mail(storage, "INBOX", input) < 0)
+	if (save_mail(storage, mailbox, input) < 0)
 		return EX_TEMPFAIL;
 	i_stream_unref(input);