From 79a21347f142da5c0d5af502316788e6fca5047f Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 13 Aug 2021 18:17:44 +1200
Subject: [PATCH] vncserver: extract DefineLogAndPidFilesForDisplayNumber()

---
 unix/vncserver | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index e1c96c4..0451503 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -33,8 +33,6 @@ use Time::HiRes qw (sleep);
 &SetGlobalVariables();
 
 &ParseAndProcessCliOptions();
-$desktopLog = "$vncUserDir/$host:$displayNumber.log";
-$pidFile = "$vncUserDir/$host:$displayNumber.pid";
 
 &CreateDotVncDir();
 
@@ -1024,6 +1022,8 @@ sub ParseAndProcessCliOptions {
   $displayNumber = &DetectDisplayNumberFromCliArgs() ||
   &GetLowestAvailableDisplayNumber();
   &CheckCliOptionsForBeingValid();
+
+  &DefineLogAndPidFilesForDisplayNumber();
 }
 
 sub PrepareDefaultsForPassingToXvnc {
@@ -1081,3 +1081,8 @@ sub IsProcessRunning {
 
   kill 0, $pid;
 }
+
+sub DefineLogAndPidFilesForDisplayNumber {
+  $desktopLog = "$vncUserDir/$host:$displayNumber.log";
+  $pidFile = "$vncUserDir/$host:$displayNumber.pid";
+}