publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vncserver: refactor

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-09 23:24:10 +12:00
parent 8a3cf76f82
commit 649868241c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unix/vncserver
View File

@@ -178,7 +178,7 @@ sub CheckGeometryAndDepthAreSensible
sub GetLowestAvailableDisplayNumber sub GetLowestAvailableDisplayNumber
{ {
foreach $n (1..99) { foreach $n (1..99) {
if (&CheckDisplayNumber($n)) { if (&CheckVncIsntRunningOnDisplay($n)) {
return $n+0; # Bruce Mah's workaround for bug in perl 5.005_02 return $n+0; # Bruce Mah's workaround for bug in perl 5.005_02
} }
} }
@@ -188,12 +188,12 @@ sub GetLowestAvailableDisplayNumber
# #
# CheckDisplayNumber checks if the given display number is available. A # CheckVncIsntRunningOnDisplay checks if the given display number is available. A
# display number n is taken if something is listening on the VNC server port # display number n is taken if something is listening on the VNC server port
# (5900+n) or the X server port (6000+n). # (5900+n) or the X server port (6000+n).
# #
sub CheckDisplayNumber sub CheckVncIsntRunningOnDisplay
{ {
local ($n) = @_; local ($n) = @_;
@@ -759,7 +759,7 @@ sub DetectDisplayNumberFromCliArgs {
if ($ARGV[0] =~ /^:(\d+)$/) { if ($ARGV[0] =~ /^:(\d+)$/) {
$displayNumber = $1; $displayNumber = $1;
shift(@ARGV); shift(@ARGV);
if (!&CheckDisplayNumber($displayNumber)) { if (!&CheckVncIsntRunningOnDisplay($displayNumber)) {
die "A VNC server is already running as :$displayNumber\n"; die "A VNC server is already running as :$displayNumber\n";
} }
} }