Commit 45fad189 45fad189bc2034ff7afcb8d15b57e7fa24d79860 by Sergey Poznyakoff

Add debug flag 'i' for symmetry with sieve. Minor fixes in diagnostic messages

1 parent df5021f7
...@@ -55,9 +55,10 @@ N_("GNU mail.local -- the local MDA\ ...@@ -55,9 +55,10 @@ N_("GNU mail.local -- the local MDA\
55 \v\ 55 \v\
56 Debug flags are:\n\ 56 Debug flags are:\n\
57 g - guimb stack traces\n\ 57 g - guimb stack traces\n\
58 T - mailutil traces (MU_DEBUG_TRACE)\n\ 58 T - mailutils traces (MU_DEBUG_TRACE)\n\
59 P - network protocols (MU_DEBUG_PROT)\n\ 59 P - network protocols (MU_DEBUG_PROT)\n\
60 t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n\ 60 t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n\
61 i - sieve instructions trace (MU_SIEVE_DEBUG_INSTR)\n\
61 l - sieve action logs\n\ 62 l - sieve action logs\n\
62 0-9 - Set mail.local debugging level\n"); 63 0-9 - Set mail.local debugging level\n");
63 64
...@@ -86,12 +87,12 @@ static struct argp_option options[] = ...@@ -86,12 +87,12 @@ static struct argp_option options[] =
86 N_("SQL query to retrieve mailbox quota"), 0 }, 87 N_("SQL query to retrieve mailbox quota"), 0 },
87 #endif 88 #endif
88 { "sieve", 'S', N_("PATTERN"), 0, 89 { "sieve", 'S', N_("PATTERN"), 0,
89 N_("Set name pattern for user-defined sieve mail filters"), 0 }, 90 N_("Set name pattern for user-defined Sieve mail filters"), 0 },
90 { "message-id-header", ARG_MESSAGE_ID_HEADER, N_("STRING"), 0, 91 { "message-id-header", ARG_MESSAGE_ID_HEADER, N_("STRING"), 0,
91 N_("Identify messages by the value of this header when logging Sieve actions"), 0 }, 92 N_("Identify messages by the value of this header when logging Sieve actions"), 0 },
92 #ifdef WITH_GUILE 93 #ifdef WITH_GUILE
93 { "source", 's', N_("PATTERN"), 0, 94 { "source", 's', N_("PATTERN"), 0,
94 N_("Set name pattern for user-defined mail filters"), 0 }, 95 N_("Set name pattern for user-defined Scheme mail filters"), 0 },
95 #endif 96 #endif
96 { "debug", 'x', N_("FLAGS"), 0, 97 { "debug", 'x', N_("FLAGS"), 0,
97 N_("Enable debugging"), 0 }, 98 N_("Enable debugging"), 0 },
...@@ -190,6 +191,10 @@ parse_opt (int key, char *arg, struct argp_state *state) ...@@ -190,6 +191,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
190 sieve_debug_flags |= MU_SIEVE_DEBUG_TRACE; 191 sieve_debug_flags |= MU_SIEVE_DEBUG_TRACE;
191 break; 192 break;
192 193
194 case 'i':
195 sieve_debug_flags |= MU_SIEVE_DEBUG_INSTR;
196 break;
197
193 case 'l': 198 case 'l':
194 sieve_enable_log = 1; 199 sieve_enable_log = 1;
195 break; 200 break;
......