From 3522000d1fedc315efd3edcdd79753f6ecabb791 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 13 Aug 2021 18:49:01 +1200
Subject: [PATCH] vncserver: extract PrepareLoggingAndXvncKillingFramework()

---
 unix/vncserver | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index ea987ab..3efacca 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -34,7 +34,7 @@ use Time::HiRes qw (sleep);
 
 &ParseAndProcessCliOptions();
 
-&CreateDotVncDir();
+&PrepareLoggingAndXvncKillingFramework();
 &DisableLegacyVncAuth();
 &SetupXauthorityFile();
 
@@ -1017,8 +1017,6 @@ sub ParseAndProcessCliOptions {
   $displayNumber = &DetectDisplayNumberFromCliArgs() ||
   &GetLowestAvailableDisplayNumber();
   &CheckCliOptionsForBeingValid();
-
-  &DefineLogAndPidFilesForDisplayNumber();
 }
 
 sub PrepareDefaultsForPassingToXvnc {
@@ -1081,3 +1079,8 @@ sub DefineLogAndPidFilesForDisplayNumber {
   $desktopLog = "$vncUserDir/$host:$displayNumber.log";
   $pidFile = "$vncUserDir/$host:$displayNumber.pid";
 }
+
+sub PrepareLoggingAndXvncKillingFramework {
+  &CreateDotVncDir();
+  &DefineLogAndPidFilesForDisplayNumber();
+}