ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/util.C
(Generate patch)

Comparing gvpe/src/util.C (file contents):
Revision 1.21 by pcg, Tue Apr 26 00:55:56 2005 UTC vs.
Revision 1.23 by pcg, Thu Aug 7 19:07:03 2008 UTC

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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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>
127 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__); 137 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
128 138
129 return 0; 139 return 0;
130} 140}
131 141
142pid_t
132bool run_script (const run_script_cb &cb, bool wait) 143run_script (const run_script_cb &cb, bool wait)
133{ 144{
145 sigset_t oldset;
146
134 if (wait) 147 if (wait)
135 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. 148 {
149 sigset_t sigchld;
150 sigemptyset (&sigchld);
151 sigaddset (&sigchld, SIGCHLD);
152 sigprocmask (SIG_BLOCK, &sigchld, &oldset);
153 }
136 154
137 int pid = fork (); 155 pid_t pid = fork ();
138 156
139 if (pid == 0) 157 if (pid == 0)
140 { 158 {
159 sigprocmask (SIG_SETMASK, &oldset, 0);
160
141 execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0); 161 execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
142 exit (EXIT_FAILURE); 162 exit (EXIT_FAILURE);
143 } 163 }
144 else if (pid > 0) 164 else if (pid > 0)
145 { 165 {
146 if (wait) 166 if (wait)
147 { 167 {
148 int status; 168 int status;
149 int res = waitpid (pid, &status, 0); 169 int res = waitpid (pid, &status, 0);
150 170
151 signal (SIGCHLD, SIG_IGN); 171 sigprocmask (SIG_SETMASK, &oldset, 0);
152 172
153 if (res < 0) 173 if (res < 0)
154 { 174 {
155 slog (L_WARN, _("waiting for an external command failed: %s."), 175 slog (L_WARN, _("waiting for an external command failed: %s."),
156 strerror (errno)); 176 strerror (errno));
157 return false; 177 return 0;
158 } 178 }
159 else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS) 179 else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
160 { 180 {
161 slog (L_WARN, _("external command returned with exit status %d (%04x)."), 181 slog (L_WARN, _("external command returned with exit status %d (%04x)."),
162 WEXITSTATUS (status), status); 182 WEXITSTATUS (status), status);
163 return false; 183 return 0;
164 } 184 }
165 } 185 }
166 } 186 }
167 else 187 else
168 { 188 {
169 slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno)); 189 slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno));
170 exit (EXIT_FAILURE); 190 exit (EXIT_FAILURE);
171 } 191 }
172 192
173 return true; 193 return pid;
174} 194}
175 195
176#if ENABLE_HTTP_PROXY 196#if ENABLE_HTTP_PROXY
177// works like strdup 197// works like strdup
178u8 * 198u8 *

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines