lda: Cleaned up parameter handling.

--HG--
branch : HEAD

diff --git a/src/lda/main.c b/src/lda/main.c
index a17f7d902948f4f04c378c9b824e3bcf4550de09..74ef851a16afa21e3c1302fd23793b4103537308 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -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,19 +306,14 @@ 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.
                           Ignore -m "". This allows doing -m ${extension}
@@ -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();