From 68e23b1c9e69b2a218b3be821ad1ba3b3b6a64f2 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 1 Sep 2001 12:36:53 +0000 Subject: [PATCH] Optional signal number for -k option. --- src/process.c | 6 +++--- src/process.h | 4 ++-- src/tincd.c | 17 +++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/process.c b/src/process.c index bf3d6b74..37b3186e 100644 --- a/src/process.c +++ b/src/process.c @@ -17,7 +17,7 @@ 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.23 2001/07/24 20:03:40 guus Exp $ + $Id: process.c,v 1.1.2.24 2001/09/01 12:36:53 guus Exp $ */ #include "config.h" @@ -121,7 +121,7 @@ cp /* kill older tincd for this net */ -int kill_other(void) +int kill_other(int signal) { int pid; cp @@ -136,7 +136,7 @@ cp errno = 0; /* No error, sometimes errno is only changed on error */ /* ESRCH is returned when no process with that pid is found */ - if(kill(pid, SIGTERM) && errno == ESRCH) + if(kill(pid, signal) && errno == ESRCH) fprintf(stderr, _("Removing stale lock file.\n")); remove_pid(pidfilename); cp diff --git a/src/process.h b/src/process.h index 9fb13c7c..fe7466ed 100644 --- a/src/process.h +++ b/src/process.h @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: process.h,v 1.1.2.8 2001/03/01 21:32:04 guus Exp $ + $Id: process.h,v 1.1.2.9 2001/09/01 12:36:53 guus Exp $ */ #ifndef __TINC_PROCESS_H__ @@ -30,7 +30,7 @@ extern int do_detach; extern void setup_signals(void); extern int execute_script(const char *); extern int detach(void); -extern int kill_other(void); +extern int kill_other(int); extern void cleanup_and_exit(int); #endif /* __TINC_PROCESS_H__ */ diff --git a/src/tincd.c b/src/tincd.c index 04ff4d0b..8eeef1d3 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tincd.c,v 1.10.4.51 2001/07/24 20:04:22 guus Exp $ + $Id: tincd.c,v 1.10.4.52 2001/09/01 12:36:53 guus Exp $ */ #include "config.h" @@ -78,12 +78,13 @@ char **environment; /* A pointer to the environment on static struct option const long_options[] = { { "config", required_argument, NULL, 'c' }, - { "kill", no_argument, NULL, 'k' }, + { "kill", optional_argument, NULL, 'k' }, { "net", required_argument, NULL, 'n' }, { "help", no_argument, &show_help, 1 }, { "version", no_argument, &show_version, 1 }, { "no-detach", no_argument, &do_detach, 0 }, { "generate-keys", optional_argument, NULL, 'K'}, + { "debug", optional_argument, NULL, 'd'}, { NULL, 0, NULL, 0 } }; @@ -97,8 +98,8 @@ usage(int status) printf(_("Usage: %s [option]...\n\n"), program_name); printf(_(" -c, --config=DIR Read configuration options from DIR.\n" " -D, --no-detach Don't fork and detach.\n" - " -d Increase debug level.\n" - " -k, --kill Attempt to kill a running tincd and exit.\n" + " -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" + " -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n" " -n, --net=NETNAME Connect to net NETNAME.\n")); printf(_(" -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n" " --help Display this help and exit.\n" @@ -114,7 +115,7 @@ parse_options(int argc, char **argv, char **envp) int r; int option_index = 0; - while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF) + while((r = getopt_long(argc, argv, "c:Dd::k::n:K::", long_options, &option_index)) != EOF) { switch(r) { @@ -134,7 +135,7 @@ parse_options(int argc, char **argv, char **envp) debug_lvl++; break; case 'k': /* kill old tincds */ - kill_tincd = 1; + kill_tincd = optarg?atoi(optarg):SIGTERM; break; case 'n': /* net name given */ netname = xmalloc(strlen(optarg)+1); @@ -214,7 +215,7 @@ int keygen(int bits) { fprintf(stderr, _("Error during key generation!\n")); return -1; - } + } else fprintf(stderr, _("Done.\n")); @@ -328,7 +329,7 @@ cp } if(kill_tincd) - exit(kill_other()); + exit(kill_other(kill_tincd)); if(read_server_config()) exit(1); -- 2.20.1