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 a3c4c36726012fbe72645fb178e7ff8dec2d7825..20401a17134e2bd2e0b220b9e0c4452fa20130da 100644 (file)
--- 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;
        }