/*
process.c -- process management functions
- Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1999-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+ 2000-2004 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
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"
/* 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;
*/
static bool write_pidfile(void)
{
- int pid;
+ pid_t pid;
cp();
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 %ld.\n"),
+ netname, (long)pid);
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 */
- if(!write_pid(pidfilename))
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
return false;
+ }
return true;
}
bool kill_other(int signal)
{
#ifndef HAVE_MINGW
- int pid;
+ pid_t pid;
cp();
/* 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;
+ }
#else
if(!statushandle)
exit(install_service());
int status, len;
struct stat s;
char *scriptname;
+ int i;
cp();
#ifdef HAVE_PUTENV
/* Set environment */
- while(*envp)
- putenv(*envp++);
+ for(i = 0; envp[i]; i++)
+ putenv(envp[i]);
#endif
scriptname[len - 1] = '\"';
free(scriptname);
- /* Unset environment? */
+ /* Unset environment */
+
+ for(i = 0; envp[i]; i++) {
+ char *e = strchr(envp[i], '=');
+ if(e)
+ putenv(strndupa(envp[i], e - envp[i]));
+ }
#ifdef WEXITSTATUS
if(status != -1) {
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");
- running = false;
+ if(running)
+ running = false;
+ else
+ exit(1);
}
static RETSIGTYPE fatal_signal_square(int a)