1 | /* |
1 | /* |
2 | util.C -- process management and other utility functions |
2 | util.C -- process management and other utility functions |
3 | Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> |
3 | Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> |
4 | |
4 | |
5 | Some of these are taken from tinc, see the AUTHORS file. |
5 | Some of these are taken from tinc, see the AUTHORS file. |
6 | |
6 | |
7 | This file is part of GVPE. |
7 | This file is part of GVPE. |
8 | |
8 | |
9 | GVPE is free software; you can redistribute it and/or modify |
9 | GVPE is free software; you can redistribute it and/or modify it |
10 | it under the terms of the GNU General Public License as published by |
10 | under the terms of the GNU General Public License as published by the |
11 | the Free Software Foundation; either version 2 of the License, or |
11 | Free Software Foundation; either version 3 of the License, or (at your |
12 | (at your option) any later version. |
12 | option) any later version. |
13 | |
13 | |
14 | This program is distributed in the hope that it will be useful, |
14 | This program is distributed in the hope that it will be useful, but |
15 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
17 | GNU General Public License for more details. |
17 | Public License for more details. |
18 | |
18 | |
19 | You should have received a copy of the GNU General Public License |
19 | You should have received a copy of the GNU General Public License along |
20 | along with gvpe; if not, write to the Free Software |
20 | with this program; if not, see <http://www.gnu.org/licenses/>. |
21 | Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | |
|
|
22 | Additional permission under GNU GPL version 3 section 7 |
|
|
23 | |
|
|
24 | If you modify this Program, or any covered work, by linking or |
|
|
25 | combining it with the OpenSSL project's OpenSSL library (or a modified |
|
|
26 | version of that library), containing parts covered by the terms of the |
|
|
27 | OpenSSL or SSLeay licenses, the licensors of this Program grant you |
|
|
28 | additional permission to convey the resulting work. Corresponding |
|
|
29 | Source for a non-source form of such a combination shall include the |
|
|
30 | source code for the parts of OpenSSL used as well as that of the |
|
|
31 | covered work. |
22 | */ |
32 | */ |
23 | |
33 | |
24 | #include "config.h" |
34 | #include "config.h" |
25 | |
35 | |
26 | #include <cstdio> |
36 | #include <cstdio> |
… | |
… | |
129 | return 0; |
139 | return 0; |
130 | } |
140 | } |
131 | |
141 | |
132 | bool run_script (const run_script_cb &cb, bool wait) |
142 | bool run_script (const run_script_cb &cb, bool wait) |
133 | { |
143 | { |
134 | int pid; |
144 | if (wait) |
|
|
145 | signal (SIGCHLD, SIG_DFL); // this is extremely ugly, but I did not feel like implementing a complete wait() event logic. It's easier to write this long comment to make your editor happy. |
135 | |
146 | |
136 | if ((pid = fork ()) == 0) |
147 | int pid = fork (); |
|
|
148 | |
|
|
149 | if (pid == 0) |
137 | { |
150 | { |
138 | execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0); |
151 | execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0); |
139 | exit (EXIT_FAILURE); |
152 | exit (EXIT_FAILURE); |
140 | } |
153 | } |
141 | else if (pid > 0) |
154 | else if (pid > 0) |
142 | { |
155 | { |
143 | if (wait) |
156 | if (wait) |
144 | { |
157 | { |
145 | int status; |
158 | int status; |
146 | |
|
|
147 | if (waitpid (pid, &status, 0) < 0) |
159 | int res = waitpid (pid, &status, 0); |
|
|
160 | |
|
|
161 | signal (SIGCHLD, SIG_IGN); |
|
|
162 | |
|
|
163 | if (res < 0) |
148 | { |
164 | { |
149 | slog (L_WARN, _("waiting for an external command failed: %s."), |
165 | slog (L_WARN, _("waiting for an external command failed: %s."), |
150 | strerror (errno)); |
166 | strerror (errno)); |
151 | return false; |
167 | return false; |
152 | } |
168 | } |
… | |
… | |
156 | WEXITSTATUS (status), status); |
172 | WEXITSTATUS (status), status); |
157 | return false; |
173 | return false; |
158 | } |
174 | } |
159 | } |
175 | } |
160 | } |
176 | } |
|
|
177 | else |
|
|
178 | { |
|
|
179 | slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno)); |
|
|
180 | exit (EXIT_FAILURE); |
|
|
181 | } |
161 | |
182 | |
162 | return true; |
183 | return true; |
163 | } |
184 | } |
164 | |
185 | |
165 | #if ENABLE_HTTP_PROXY |
186 | #if ENABLE_HTTP_PROXY |