← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/doveadm/doveadm-instance.c

  • Committer: Package Import Robot
  • Author(s): Jaldhar H. Vyas
  • Date: 2013-09-09 00:57:32 UTC
  • mfrom: (1.13.11)
  • mto: (4.8.5 experimental) (1.16.1)
  • mto: This revision was merged to the branch mainline in revision 97.
  • Revision ID: package-import@ubuntu.com-20130909005732-dn1eell8srqbhh0e
Tags: upstream-2.2.5
Import upstream version 2.2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/doveadm/doveadm-instance.c
1
 
/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "master-instance.h"
 
5
#include "master-service-settings.h"
5
6
#include "doveadm.h"
6
7
#include "doveadm-print.h"
7
8
 
39
40
                                  (kill(pid, 0) < 0 && errno == ESRCH));
40
41
                }
41
42
        }
42
 
        (void)close(fd);
 
43
        i_close_fd(&fd);
43
44
        return found;
44
45
}
45
46
 
48
49
        struct master_instance_list *list;
49
50
        struct master_instance_list_iter *iter;
50
51
        const struct master_instance *inst;
51
 
        const char *pidfile_path;
 
52
        const char *instance_path, *pidfile_path;
52
53
        bool show_config = FALSE;
53
54
        int c;
54
55
 
71
72
                doveadm_print_header_simple("running");
72
73
        }
73
74
 
74
 
        list = master_instance_list_init(MASTER_INSTANCE_PATH);
 
75
        instance_path = t_strconcat(service_set->state_dir,
 
76
                                    "/"MASTER_INSTANCE_FNAME, NULL);
 
77
        list = master_instance_list_init(instance_path);
75
78
        iter = master_instance_list_iterate_init(list);
76
79
        while ((inst = master_instance_iterate_list_next(iter)) != NULL) {
77
80
                if (argv[0] != NULL && strcmp(argv[0], inst->name) != 0)
99
102
{
100
103
        struct master_instance_list *list;
101
104
        const struct master_instance *inst;
102
 
        const char *base_dir;
 
105
        const char *base_dir, *instance_path;
103
106
        int ret;
104
107
 
105
108
        if (argc != 2)
106
109
                instance_cmd_help(cmd_instance_remove);
107
110
 
108
 
        list = master_instance_list_init(MASTER_INSTANCE_PATH);
 
111
        instance_path = t_strconcat(service_set->state_dir,
 
112
                                    "/"MASTER_INSTANCE_FNAME, NULL);
 
113
        list = master_instance_list_init(instance_path);
109
114
        inst = master_instance_list_find_by_name(list, argv[1]);
110
115
        base_dir = inst != NULL ? inst->base_dir : argv[1];
111
116
        if ((ret = master_instance_list_remove(list, base_dir)) < 0) {