correct the code style and add pid file support for wifidog daemon

Signed-off-by: tymon <[email protected]>

Author: tymon

src/commandline.c

@@ -165,15 +165,15 @@ parse_commandline(int argc, char **argv)
                 exit(1);
             }
             break;
-		case 'p':
-			if (optarg) {
-				config->save_pid = 1;
-				strncpy(config->pidfile, optarg, sizeof(config->pidfile));
-			} else {
-				fprintf(stdout, "The expected PID file path to the wifidog was not supplied!\n");
-				exit(1);
-			}
-			break;
+        case 'p':
+            if (optarg) {
+                free(config->pidfile);
+                config->pidfile = safe_strdup(optarg);
+            } else {
+                fprintf(stdout, "The expected PID file path to the wifidog was not supplied!\n");
+                exit(1);
+            }
+            break;
         default:
             usage();
             exit(1);

src/conf.h

@@ -162,8 +162,7 @@ typedef struct {
     char *internal_sock;                /**< @brief internal path to socket */
     int deltatraffic;                   /**< @brief reset each user's traffic (Outgoing and Incoming) value after each Auth operation. */
     int daemon;                 /**< @brief if daemon > 0, use daemon mode */
-    int save_pid;			/**< @brief if save_pid == 1, save the pid in file */
-    char pidfile[255];		/**< @brief pid file path of wifidog */
+    char *pidfile;            /**< @brief pid file path of wifidog */
     char *external_interface;   /**< @brief External network interface name for
 				     firewall rules */
     char *gw_id;                /**< @brief ID of the Gateway, sent to central

src/gateway.c

@@ -367,8 +367,8 @@ main_loop(void)
     }
 
 	/* save the pid file if needed */
-	if (config->save_pid)
-		save_pid_file(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. */
     if (!config->gw_address) {

src/util.c

@@ -397,13 +397,13 @@ rand16(void)
 void
 save_pid_file(const char *pf)
 {
-	if (pf) {
-		FILE *f = fopen(pf, "w");
-		if (f) {
-			fprintf(f, "%lu\n", getpid());
-			fclose(f);
-		}
-	}
-
-	return;
+    if (pf) {
+        FILE *f = fopen(pf, "w");
+        if (f) {
+            fprintf(f, "%zu\n", getpid());
+            fclose(f);
+        }
+    }
+
+    return;
 }

src/util.h

@@ -59,6 +59,6 @@ void close_icmp_socket(void);
 void icmp_ping(const char *);
 
 /** @brief Save pid of this wifidog in pid file */
-void save_pid_file(const char *pf);
+void save_pid_file(const char *);
 
 #endif                          /* _UTIL_H_ */