From 95b7e51c30bd380af948a8469956625a810692bc Mon Sep 17 00:00:00 2001
From: Shawn Chain <shawn.chain@gmail.com>
Date: Fri, 9 Nov 2018 18:29:09 +0800
Subject: [PATCH] Extract pid file name to global defs

---
 GlobalDefines.h                     | 30 +++++++++++++++++------------
 ircDDBGateway/IRCDDBGatewayAppD.cpp |  4 ++--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/GlobalDefines.h b/GlobalDefines.h
index fbfa10b..08c68ba 100644
--- a/GlobalDefines.h
+++ b/GlobalDefines.h
@@ -2,22 +2,28 @@
 #define __GLOBAL_DEFS__
 
 #if defined(__APPLE__)
-#define DATA_DIR "/opt/mmdvm/conf/dstar"
-#define LOG_DIR  "/opt/mmdvm/logs"
-#define CONF_DIR "/opt/mmdvm/conf"
-#define CONF_FILE "ircDDBGateway.ini"
+#define DATA_DIR   "/opt/mmdvm/conf/dstar"
+#define LOG_DIR    "/opt/mmdvm/logs"
+#define CONF_DIR   "/opt/mmdvm/conf"
+#define CONF_FILE  "ircDDBGateway.ini"
+#define PID_FILE   "/tmp/ircDDBGateway.pid"
+#define PID_FILE_T "/tmp/ircDDBGateway_%s.pid"
 
 #elif defined(OPENWRT) && OPENWRT == 1
-#define DATA_DIR "/etc/mmdvm/dstar"
-#define LOG_DIR  "/var/log/mmdvm"
-#define CONF_DIR "/etc"
-#define CONF_FILE "ircDDBGateway.ini"
+#define DATA_DIR   "/etc/mmdvm/dstar"
+#define LOG_DIR    "/var/log/mmdvm"
+#define CONF_DIR   "/etc"
+#define CONF_FILE  "ircDDBGateway.ini"
+#define PID_FILE   "/tmp/ircDDBGateway.pid"
+#define PID_FILE_T "/tmp/ircDDBGateway_%s.pid"
 
 #else
-#define DATA_DIR "/usr/share/ircddbgateway"
-#define LOG_DIR  "/tmp"
-#define CONF_DIR "/etc"
-#define CONF_FILE "ircddbgateway"
+#define DATA_DIR   "/usr/share/ircddbgateway"
+#define LOG_DIR    "/tmp"
+#define CONF_DIR   "/etc"
+#define CONF_FILE  "ircddbgateway"
+#define PID_FILE   "/tmp/ircddbgateway.pid"
+#define PID_FILE_T "/tmp/ircddbgateway_%s.pid"
 
 #endif
 
diff --git a/ircDDBGateway/IRCDDBGatewayAppD.cpp b/ircDDBGateway/IRCDDBGatewayAppD.cpp
index a391c52..df485e3 100644
--- a/ircDDBGateway/IRCDDBGatewayAppD.cpp
+++ b/ircDDBGateway/IRCDDBGatewayAppD.cpp
@@ -124,9 +124,9 @@ int main(int argc, char** argv)
 
 	wxString pidFileName;
 	if (!name.IsEmpty())
-		pidFileName.Printf(wxT("/var/run/opendv/ircddbgateway_%s.pid"), name.c_str());
+		pidFileName.Printf(wxT(PID_FILE_T), name.c_str());
 	else
-		pidFileName = wxT("/var/run/opendv/ircddbgateway.pid");
+		pidFileName = wxT(PID_FILE);
 	pidFileName.Replace(wxT(" "), wxT("_"));
 
 	char fileName[128U];