projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights, links, email addresses and let Subversion update $Id$ keywords.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
2050c05
..
c1dd2d0
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-1,7
+1,7
@@
/*
process.c -- process management functions
/*
process.c -- process management functions
- Copyright (C) 1999-200
3 Ivo Timmermans <ivo@o2w.nl
>,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1999-200
4 Ivo Timmermans <ivo@tinc-vpn.org
>,
+ 2000-200
4 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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: process.c,v 1.1.2.75 2003/08/22 15:07:57 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-58,19
+58,6
@@
static void memory_full(int size)
/* Some functions the less gifted operating systems might lack... */
/* Some functions the less gifted operating systems might lack... */
-#ifndef HAVE_FCLOSEALL
-static int fcloseall(void)
-{
- fflush(stdin);
- fflush(stdout);
- fflush(stderr);
- fclose(stdin);
- fclose(stdout);
- fclose(stderr);
- return 0;
-}
-#endif
-
#ifdef HAVE_MINGW
extern char *identname;
extern char *program_name;
#ifdef HAVE_MINGW
extern char *identname;
extern char *program_name;
@@
-254,7
+241,7
@@
bool init_service(void) {
*/
static bool write_pidfile(void)
{
*/
static bool write_pidfile(void)
{
-
in
t pid;
+
pid_
t pid;
cp();
cp();
@@
-262,16
+249,18
@@
static bool write_pidfile(void)
if(pid) {
if(netname)
if(pid) {
if(netname)
- fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
- netname, pid);
+ fprintf(stderr, _("A tincd is already running for net `%s' with pid %
l
d.\n"),
+ netname,
(long)
pid);
else
else
- fprintf(stderr, _("A tincd is already running with pid %
d.\n"),
pid);
+ fprintf(stderr, _("A tincd is already running with pid %
ld.\n"), (long)
pid);
return false;
}
/* if it's locked, write-protected, or whatever */
return false;
}
/* if it's locked, write-protected, or whatever */
- if(!write_pid(pidfilename))
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
return false;
return false;
+ }
return true;
}
return true;
}
@@
-283,7
+272,7
@@
static bool write_pidfile(void)
bool kill_other(int signal)
{
#ifndef HAVE_MINGW
bool kill_other(int signal)
{
#ifndef HAVE_MINGW
-
in
t pid;
+
pid_
t pid;
cp();
cp();
@@
-348,8
+337,10
@@
bool detach(void)
/* Now UPDATE the pid in the pidfile, because we changed it... */
/* Now UPDATE the pid in the pidfile, because we changed it... */
- if(!write_pid(pidfilename))
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno));
return false;
return false;
+ }
#else
if(!statushandle)
exit(install_service());
#else
if(!statushandle)
exit(install_service());
@@
-440,13
+431,19
@@
bool execute_script(const char *name, char **envp)
static RETSIGTYPE sigterm_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "TERM");
static RETSIGTYPE sigterm_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "TERM");
- running = false;
+ if(running)
+ running = false;
+ else
+ exit(1);
}
static RETSIGTYPE sigquit_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
}
static RETSIGTYPE sigquit_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
- running = false;
+ if(running)
+ running = false;
+ else
+ exit(1);
}
static RETSIGTYPE fatal_signal_square(int a)
}
static RETSIGTYPE fatal_signal_square(int a)