make HUP restart independent of path

common.c

@@ -48,6 +48,8 @@ uint8_t				  restarting = 0;
 uint8_t				  exit_ok = 0;
 pid_t				  pid = 0;
 
+char				 *self_abs_path;
+
 char				 *debug_names[] = {
 				    "error", "warn", "info", "debug"};
 int				 syslog_error_map[] = {
@@ -328,8 +330,9 @@ hgd_daemonise()
 void
 hgd_restart_myself()
 {
-	DPRINTF(HGD_D_INFO, "Caught SIGHUP, restarting");
-	if (execvp(hgd_component, cmd_line_args) < 0) {
+	DPRINTF(HGD_D_WARN, "Caught SIGHUP, restarting");
+
+	if (execv(self_abs_path, cmd_line_args) < 0) {
 		DPRINTF(HGD_D_ERROR, "Failed to restart"
 		    ", is %s in your path?: %s", hgd_component, SERROR);
 	}
@@ -341,3 +344,17 @@ hgd_restart_myself()
 	 */
 	DPRINTF(HGD_D_ERROR, "%s was interrupted or crashed", hgd_component);
 }
+
+
+int
+hgd_cache_abs_path(char *inv)
+{
+	if (*inv != '/') {
+		DPRINTF(HGD_D_ERROR,
+		    "HGD daemons must be started with an absolute path");
+		return (HGD_FAIL);
+	}
+
+	self_abs_path = inv;
+	return (HGD_OK);
+}

hgd-netd.c

@@ -1251,6 +1251,9 @@ main(int argc, char **argv)
 
 	cmd_line_args = argv; /* cache this incase of SIGHUP */
 
+	if (hgd_cache_abs_path(argv[0]) != HGD_OK)
+		hgd_exit_nicely();
+
 	/* as early as possible */
 	HGD_INIT_SYSLOG_DAEMON();
 

hgd-playd.c

@@ -364,6 +364,9 @@ main(int argc, char **argv)
 
 	cmd_line_args = argv; /* cache for restart */
 
+	if (hgd_cache_abs_path(argv[0]) != HGD_OK)
+		hgd_exit_nicely();
+
 	/* early as possible */
 	HGD_INIT_SYSLOG_DAEMON();
 

hgd.h

@@ -101,6 +101,7 @@ extern char			 *debug_names[];
 extern int			  syslog_error_map[];
 extern pid_t			  pid;
 extern const char		 *hgd_component;
+extern char			 *self_abs_path;
 
 extern char			 *state_path;
 extern char			 *filestore_path;
@@ -250,5 +251,6 @@ int				 hgd_readpassphrase_confirmed(
 				     char buf[HGD_MAX_PASS_SZ]);
 int				 hgd_daemonise(void);
 void				 hgd_restart_myself(void);
+int				 hgd_cache_abs_path(char *inv);
 
 #endif