From 69a2f9a13b3469fa9b34317cb36d1f937f89935c Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Mon, 2 Aug 2021 23:26:17 +1200
Subject: [PATCH] vncserver: extract CreateUserConfigIfNeeded()

---
 unix/vncserver | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 2000a39..e84a90f 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -129,14 +129,7 @@ if (! $skipxstartup) {
    &CreateXstartupIfNeeded();
 }
 
-# Create the user's config file if necessary.
-if (!(-e "$vncUserDir/config")) {
-    warn "Creating default config $vncUserDir/config\n";
-    open(VNCUSERCONFIG, ">$vncUserDir/config");
-    print VNCUSERCONFIG $defaultConfig;
-    close(VNCUSERCONFIG);
-    chmod 0644, "$vncUserDir/config";
-}
+&CreateUserConfigIfNeeded();
 
 # Run the X startup script.
 if (! $skipxstartup) {
@@ -958,3 +951,15 @@ sub WaitForXvncToStart {
 sub UsingSafeFontPath {
    $fontPath eq $defFontPath
 }
+
+sub CreateUserConfigIfNeeded {
+   if (-e "$vncUserDir/config") {
+      return;
+   }
+
+   warn "Creating default config $vncUserDir/config\n";
+   open(VNCUSERCONFIG, ">$vncUserDir/config");
+   print VNCUSERCONFIG $defaultConfig;
+   close(VNCUSERCONFIG);
+   chmod 0644, "$vncUserDir/config";
+}