From 96f276a21843574809395afdcbdd862c95e73b4b Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Mon, 14 Oct 2019 19:43:41 +0800
Subject: [PATCH] advance write_to_pid_file in fdfs_storaged.c

---
 storage/fdfs_storaged.c    | 17 ++++++++++-------
 tracker/fdfs_shared_func.c |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/storage/fdfs_storaged.c b/storage/fdfs_storaged.c
index 3aef64b..8ff7134 100644
--- a/storage/fdfs_storaged.c
+++ b/storage/fdfs_storaged.c
@@ -139,11 +139,18 @@ int main(int argc, char *argv[])
 	daemon_init(false);
 	umask(0);
 
+	if ((result=write_to_pid_file(pidFilename)) != 0)
+	{
+		log_destroy();
+		return result;
+	}
+
 	memset(g_bind_addr, 0, sizeof(g_bind_addr));
 	if ((result=storage_func_init(conf_filename, \
 			g_bind_addr, sizeof(g_bind_addr))) != 0)
 	{
 		logCrit("exit abnormally!\n");
+        delete_pid_file(pidFilename);
 		log_destroy();
 		return result;
 	}
@@ -152,6 +159,7 @@ int main(int argc, char *argv[])
 	if (sock < 0)
 	{
 		logCrit("exit abnormally!\n");
+        delete_pid_file(pidFilename);
 		log_destroy();
 		return result;
 	}
@@ -159,12 +167,7 @@ int main(int argc, char *argv[])
 	if ((result=tcpsetserveropt(sock, g_fdfs_network_timeout)) != 0)
 	{
 		logCrit("exit abnormally!\n");
-		log_destroy();
-		return result;
-	}
-
-	if ((result=write_to_pid_file(pidFilename)) != 0)
-	{
+        delete_pid_file(pidFilename);
 		log_destroy();
 		return result;
 	}
@@ -453,10 +456,10 @@ int main(int argc, char *argv[])
 		storage_trunk_destroy();
 	}
 
+	delete_pid_file(pidFilename);
 	logInfo("exit normally.\n");
 	log_destroy();
 	
-	delete_pid_file(pidFilename);
 	return 0;
 }
 
diff --git a/tracker/fdfs_shared_func.c b/tracker/fdfs_shared_func.c
index 2daab3e..44c6b2e 100644
--- a/tracker/fdfs_shared_func.c
+++ b/tracker/fdfs_shared_func.c
@@ -417,10 +417,10 @@ int fdfs_parse_server_info_ex(char *server_str, const int default_port,
     }
     else
     {
+        *pColon = '\0';
         port = atoi(pColon + 1);
     }
 
-    *pColon = '\0';
     conn = pServer->connections;
     pServer->count =  splitEx(server_str, ',',
             hosts, FDFS_MULTI_IP_MAX_COUNT);