dovecot-2.0: lda: Cleaned up parameter handling.
dovecot at dovecot.org
dovecot at dovecot.org
Wed Oct 21 04:11:27 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/e248c1e53e00
changeset: 10125:e248c1e53e00
user: Timo Sirainen <tss at iki.fi>
date: Tue Oct 20 21:09:17 2009 -0400
description:
lda: Cleaned up parameter handling.
diffstat:
1 file changed, 15 insertions(+), 15 deletions(-)
src/lda/main.c | 30 +++++++++++++++---------------
diffs (56 lines):
diff -r 0598391a86e8 -r e248c1e53e00 src/lda/main.c
--- a/src/lda/main.c Tue Oct 20 20:55:55 2009 -0400
+++ b/src/lda/main.c Tue Oct 20 21:09:17 2009 -0400
@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
master_service = master_service_init("lda",
MASTER_SERVICE_FLAG_STANDALONE |
MASTER_SERVICE_FLAG_DONT_LOG_TO_STDERR,
- &argc, &argv, "a:d:p:ekm:nsf:");
+ &argc, &argv, "a:d:ef:km:p:");
memset(&ctx, 0, sizeof(ctx));
ctx.pool = pool_alloconly_create("mail deliver context", 256);
@@ -306,18 +306,13 @@ int main(int argc, char *argv[])
user = optarg;
service_flags |= MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
break;
- case 'p':
- /* input path */
- path = optarg;
- if (*path != '/') {
- /* expand relative paths before we chdir */
- if (getcwd(cwd, sizeof(cwd)) == NULL)
- i_fatal("getcwd() failed: %m");
- path = t_strconcat(cwd, "/", path, NULL);
- }
- break;
case 'e':
stderr_rejection = TRUE;
+ break;
+ case 'f':
+ /* envelope sender address */
+ ctx.src_envelope_sender =
+ p_strdup(ctx.pool, address_sanitize(optarg));
break;
case 'm':
/* destination mailbox.
@@ -333,10 +328,15 @@ int main(int argc, char *argv[])
p_strdup(ctx.pool, str_c(str));
} T_END;
break;
- case 'f':
- /* envelope sender address */
- ctx.src_envelope_sender =
- p_strdup(ctx.pool, address_sanitize(optarg));
+ case 'p':
+ /* input path */
+ path = optarg;
+ if (*path != '/') {
+ /* expand relative paths before we chdir */
+ if (getcwd(cwd, sizeof(cwd)) == NULL)
+ i_fatal("getcwd() failed: %m");
+ path = t_strconcat(cwd, "/", path, NULL);
+ }
break;
default:
print_help();
More information about the dovecot-cvs
mailing list