projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing 1.0.16.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
6d0e499
..
c659237
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-1,7
+1,7
@@
/*
process.c -- process management functions
Copyright (C) 1999-2005 Ivo Timmermans,
/*
process.c -- process management functions
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
11
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,6
+25,7
@@
#include "device.h"
#include "edge.h"
#include "logger.h"
#include "device.h"
#include "edge.h"
#include "logger.h"
+#include "net.h"
#include "node.h"
#include "pidfile.h"
#include "process.h"
#include "node.h"
#include "pidfile.h"
#include "process.h"
@@
-41,9
+42,10
@@
extern char *identname;
extern char *pidfilename;
extern char **g_argv;
extern bool use_logfile;
extern char *pidfilename;
extern char **g_argv;
extern bool use_logfile;
-extern volatile bool running;
-sigset_t emptysigset;
+#ifndef HAVE_MINGW
+static sigset_t emptysigset;
+#endif
static int saved_debug_level = -1;
static int saved_debug_level = -1;
@@
-354,7
+356,7
@@
bool detach(void) {
bool execute_script(const char *name, char **envp) {
#ifdef HAVE_SYSTEM
int status, len;
bool execute_script(const char *name, char **envp) {
#ifdef HAVE_SYSTEM
int status, len;
- char *scriptname
, *p
;
+ char *scriptname;
int i;
#ifndef HAVE_MINGW
int i;
#ifndef HAVE_MINGW
@@
-395,7
+397,7
@@
bool execute_script(const char *name, char **envp) {
for(i = 0; envp[i]; i++) {
char *e = strchr(envp[i], '=');
if(e) {
for(i = 0; envp[i]; i++) {
char *e = strchr(envp[i], '=');
if(e) {
-
p = alloca(e - envp[i] + 1)
;
+
char p[e - envp[i] + 1]
;
strncpy(p, envp[i], e - envp[i]);
p[e - envp[i]] = '\0';
putenv(p);
strncpy(p, envp[i], e - envp[i]);
p[e - envp[i]] = '\0';
putenv(p);
@@
-544,6
+546,7
@@
static struct {
{SIGCHLD, ignore_signal_handler},
{SIGALRM, sigalrm_handler},
{SIGWINCH, sigwinch_handler},
{SIGCHLD, ignore_signal_handler},
{SIGALRM, sigalrm_handler},
{SIGWINCH, sigwinch_handler},
+ {SIGABRT, SIG_DFL},
{0, NULL}
};
#endif
{0, NULL}
};
#endif