← Back to branch summary

~ubuntu-branches/ubuntu/wily/dovecot/wily

« back to all changes in this revision

Viewing changes to src/doveadm/doveadm.c

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2015-05-24 15:01:19 UTC
  • mto: (4.1.53 sid)
  • mto: This revision was merged to the branch mainline in revision 102.
  • Revision ID: package-import@ubuntu.com-20150524150119-hsh6cbr1fqseapga
Tags: upstream-2.2.18
Import upstream version 2.2.18

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/doveadm/doveadm.c
5
5
#include "str.h"
6
6
#include "env-util.h"
7
7
#include "execv-const.h"
 
8
#include "dict.h"
8
9
#include "master-service-private.h"
9
10
#include "master-service-settings.h"
10
11
#include "settings-parser.h"
271
272
        /* "+" is GNU extension to stop at the first non-option.
272
273
           others just accept -+ option. */
273
274
        master_service = master_service_init("doveadm", service_flags,
274
 
                                             &argc, &argv, "+Df:v");
 
275
                                             &argc, &argv, "+Df:hv");
275
276
        while ((c = master_getopt(master_service)) > 0) {
276
277
                switch (c) {
277
278
                case 'D':
281
282
                case 'f':
282
283
                        doveadm_print_init(optarg);
283
284
                        break;
 
285
                case 'h':
 
286
                        doveadm_print_hide_titles = TRUE;
 
287
                        break;
284
288
                case 'v':
285
289
                        doveadm_verbose = TRUE;
286
290
                        break;
314
318
                quick_init = FALSE;
315
319
                doveadm_dump_init();
316
320
                doveadm_mail_init();
 
321
                dict_drivers_register_builtin();
317
322
                doveadm_load_modules();
318
323
 
319
324
                if (cmd_name == NULL) {
353
358
                doveadm_mail_deinit();
354
359
                doveadm_dump_deinit();
355
360
                doveadm_unload_modules();
 
361
                dict_drivers_unregister_builtin();
356
362
                doveadm_print_deinit();
357
363
        }
358
364
        doveadm_cmds_deinit();