Fix pidfile operation failure

crouchggj · crouchggj · commit 8536c2e4678a · 2017-05-31T16:16:32.000+08:00
diff --git a/src/commandline.c b/src/commandline.c
@@ -93,7 +93,7 @@ parse_commandline(int argc, char **argv)
     i = 0;
     restartargv[i++] = safe_strdup(argv[0]);
 
-    while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vx:i:a:"))) {
+    while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vx:i:a:p:"))) {
 
         skiponrestart = 0;
 
diff --git a/src/gateway.c b/src/gateway.c
@@ -367,7 +367,7 @@ main_loop(void)
     }
 
 	/* save the pid file if needed */
-    if ((!config) && (!config->pidfile))
+    if (config && config->pidfile)
         save_pid_file(config->pidfile);
 
     /* If we don't have the Gateway IP address, get it. Can't fail. */

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ main_loop(void)`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`/* save the pid file if needed */`
`370`		`- if ((!config) && (!config->pidfile))`
	`370`	`+ if (config && config->pidfile)`
`371`	`371`	`save_pid_file(config->pidfile);`
`372`	`372`
`373`	`373`	`/* If we don't have the Gateway IP address, get it. Can't fail. */`