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

vncserver: extract DetectDisplayNumberFromCliArgs()

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-07-31 01:11:26 +12:00
parent 55525a627b
commit c79da47c21
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
unix/vncserver
View File

@@ -78,19 +78,7 @@ chop($host = `uname -n`);
# Create the user's vnc directory if necessary. # Create the user's vnc directory if necessary.
&CreateDotVncDir(); &CreateDotVncDir();
# Find display number. &DetectDisplayNumberFromCliArgs();
if ((@ARGV > 0) && ($ARGV[0] =~ /^:(\d+)$/)) {
$displayNumber = $1;
shift(@ARGV);
if (!&CheckDisplayNumber($displayNumber)) {
die "A VNC server is already running as :$displayNumber\n";
}
} elsif ((@ARGV > 0) && ($ARGV[0] !~ /^-/) && ($ARGV[0] !~ /^\+/)) {
&Usage();
} else {
$displayNumber = &GetLowestAvailableDisplayNumber();
}
$vncPort = 5900 + $displayNumber; $vncPort = 5900 + $displayNumber;
if ($opt{'-name'}) { if ($opt{'-name'}) {
@@ -953,3 +941,20 @@ sub AskUserToChooseDeOrManualXstartup {
system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n"); system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n");
} }
} }
sub DetectDisplayNumberFromCliArgs {
if (@ARGV == 0) {
$displayNumber = &GetLowestAvailableDisplayNumber();
return;
}
if ($ARGV[0] =~ /^:(\d+)$/) {
$displayNumber = $1;
shift(@ARGV);
if (!&CheckDisplayNumber($displayNumber)) {
die "A VNC server is already running as :$displayNumber\n";
}
} elsif (($ARGV[0] !~ /^-/) && ($ARGV[0] !~ /^\+/)) {
&Usage();
}
}