X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..6ac21a70e238ca31704f4a5be3a3b71af2c2d2d0:/ircd/restart.c

diff --git a/ircd/restart.c b/ircd/restart.c
index 499b291d..2db2a2ec 100644
--- a/ircd/restart.c
+++ b/ircd/restart.c
@@ -32,16 +32,16 @@
 #include "ircd_signal.h"
 
 /* external var */
-extern char **myargv;
+extern char * const *myargv;
 
 void
 restart(const char *mesg)
 {
-	static int was_here = NO;	/* redundant due to restarting flag below */
+	static bool was_here = false;	/* redundant due to restarting flag below */
 
 	if(was_here)
 		abort();
-	was_here = YES;
+	was_here = true;
 
 	ilog(L_MAIN, "Restarting Server because: %s", mesg);
 
@@ -72,10 +72,10 @@ server_reboot(void)
 		close(i);
 
 	unlink(pidFileName);
-	execv(SPATH, (void *)myargv);
+	execv(ircd_paths[IRCD_PATH_IRCD_EXEC], (void *)myargv);
 
 	/* use this if execv of SPATH fails */
-	snprintf(path, sizeof(path), "%s/bin/ircd", ConfigFileEntry.dpath);
+	snprintf(path, sizeof(path), "%s%cbin%circd", ConfigFileEntry.dpath, RB_PATH_SEPARATOR, RB_PATH_SEPARATOR);
 
 	execv(path, (void *)myargv);
 	exit(-1);