← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel-stream-process.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-stream-process.c
93
93
        CamelStreamProcess *stream = CAMEL_STREAM_PROCESS (object);
94
94
 
95
95
        if (camel_verbose_debug)
96
 
                fprintf (stderr, "Process stream close. sockfd %d, childpid %d\n",
97
 
                         stream->sockfd, stream->childpid);
 
96
                fprintf (
 
97
                        stderr,
 
98
                        "Process stream close. sockfd %d, childpid %d\n",
 
99
                        stream->sockfd, stream->childpid);
98
100
 
99
101
        if (stream->sockfd != -1) {
100
102
                close (stream->sockfd);
106
108
                for (i = 0; i < 4; i++) {
107
109
                        ret = waitpid (stream->childpid, NULL, WNOHANG);
108
110
                        if (camel_verbose_debug)
109
 
                                fprintf (stderr, "waitpid() for pid %d returned %d (errno %d)\n",
110
 
                                         stream->childpid, ret, ret == -1 ? errno : 0);
 
111
                                fprintf (
 
112
                                        stderr,
 
113
                                        "waitpid() for pid %d returned %d (errno %d)\n",
 
114
                                        stream->childpid, ret, ret == -1 ? errno : 0);
111
115
                        if (ret == stream->childpid || errno == ECHILD)
112
116
                                break;
113
117
                        switch (i) {
114
118
                        case 0:
115
119
                                if (camel_verbose_debug)
116
 
                                        fprintf (stderr, "Sending SIGTERM to pid %d\n",
117
 
                                                 stream->childpid);
 
120
                                        fprintf (
 
121
                                                stderr,
 
122
                                                "Sending SIGTERM to pid %d\n",
 
123
                                                stream->childpid);
118
124
                                kill (stream->childpid, SIGTERM);
119
125
                                break;
120
126
                        case 2:
121
127
                                if (camel_verbose_debug)
122
 
                                        fprintf (stderr, "Sending SIGKILL to pid %d\n",
123
 
                                                 stream->childpid);
 
128
                                        fprintf (
 
129
                                                stderr,
 
130
                                                "Sending SIGKILL to pid %d\n",
 
131
                                                stream->childpid);
124
132
                                kill (stream->childpid, SIGKILL);
125
133
                                break;
126
134
                        case 1: