From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Fri, 21 Nov 2008 15:55:17 +0000 (+0000)
Subject: fix issue where pid file is accidentally truncated (part2)
X-Git-Tag: v1.0.2~436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c10f201e4b7c28036e18bf1f06f2bcf1efd80b3;p=thirdparty%2Ffreeswitch.git

fix issue where pid file is accidentally truncated (part2)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10494 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/switch.c b/src/switch.c
index a3c4c36726..20401a1713 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -610,15 +610,13 @@ int main(int argc, char *argv[])
 						 pid_path,
 						 SWITCH_FOPEN_READ,
 						 SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE,
-						 pool) != SWITCH_STATUS_SUCCESS) {
-		fprintf(stderr, "Cannot open pid file %s.\n", pid_path);
-		return 255;
+						 pool) == SWITCH_STATUS_SUCCESS) {
+
+		old_pid_len = sizeof(old_pid_buffer);
+		switch_file_read(fd, old_pid_buffer, &old_pid_len);
+		switch_file_close(fd);
 	}
 
-	old_pid_len = sizeof(old_pid_buffer);
-	switch_file_read(fd, old_pid_buffer, &old_pid_len);
-	switch_file_close(fd);
-	
 	if (switch_file_open(&fd,
 						 pid_path,
 						 SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE | SWITCH_FOPEN_TRUNCATE,
@@ -631,7 +629,9 @@ int main(int argc, char *argv[])
 	if (switch_file_lock(fd, SWITCH_FLOCK_EXCLUSIVE | SWITCH_FLOCK_NONBLOCK) != SWITCH_STATUS_SUCCESS) {
 		fprintf(stderr, "Cannot lock pid file %s.\n", pid_path);
 		old_pid_len = strlen(old_pid_buffer);
-		switch_file_write(fd, old_pid_buffer, &old_pid_len);
+		if (strlen(old_pid_buffer)) {
+			switch_file_write(fd, old_pid_buffer, &old_pid_len);
+		}
 		return 255;
 	}