From dbb09b527849bed91993d6c241a3b9bcaced706b Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 14 Nov 2022 00:04:25 +0200
Subject: [PATCH] Fix to adjust functions names

---
 xterm/shellserver.pl | 16 ++++++++--------
 xterm/xterm-lib.pl   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xterm/shellserver.pl b/xterm/shellserver.pl
index 2a43c1d97..178060b47 100755
--- a/xterm/shellserver.pl
+++ b/xterm/shellserver.pl
@@ -14,7 +14,7 @@ my @uinfo = getpwnam($user);
 my ($uid, $gid);
 if ($user ne "root" && !$<) {
 	if (!@uinfo) {
-		&cleanup_miniserv($port);
+		&remove_miniserv_websocket($port);
 		die "User $user does not exist!";
 		}
 	$uid = $uinfo[2];
@@ -68,7 +68,7 @@ my ($shellfh, $pid) = &proc::pty_process_exec($shellexec, $uid, $gid, $shelllogi
 &reset_environment();
 my $shcmd = "'$shellexec".($shelllogin ? " $shelllogin" : "")."'";
 if (!$pid) {
-	&cleanup_miniserv($port);
+	&remove_miniserv_websocket($port);
 	die "Failed to run shell with $shcmd\n";
 	}
 else {
@@ -87,7 +87,7 @@ untie(*STDIN);
 close(STDIN);
 
 $SIG{'ALRM'} = sub {
-	&cleanup_miniserv($port);
+	&remove_miniserv_websocket($port);
 	die "timeout waiting for connection";
 	};
 alarm(60);
@@ -137,13 +137,13 @@ Net::WebSocket::Server->new(
 					}
 				if (!syswrite($shellfh, $msg, length($msg))) {
 					print STDERR "write to shell failed : $!\n";
-					&cleanup_miniserv($port);
+					&remove_miniserv_websocket($port);
 					exit(1);
 					}
 				},
 			disconnect => sub {
 				print STDERR "websocket connection closed\n";
-				&cleanup_miniserv($port);
+				&remove_miniserv_websocket($port);
 				kill('KILL', $pid) if ($pid);
 				exit(0);
 				}
@@ -156,7 +156,7 @@ Net::WebSocket::Server->new(
 			my $ok = sysread($shellfh, $buf, 1024);
 			if ($ok <= 0) {
 				print STDERR "end of output from shell\n";
-				&cleanup_miniserv($port);
+				&remove_miniserv_websocket($port);
 				exit(0);
 				}
 			if ($wsconn) {
@@ -169,5 +169,5 @@ Net::WebSocket::Server->new(
 	],
 )->start;
 print STDERR "exited websockets server\n";
-&cleanup_miniserv($port);
-&cleanup_old_websockets([$port]);
\ No newline at end of file
+&remove_miniserv_websocket($port);
+&cleanup_miniserv_websockets([$port]);
\ No newline at end of file
diff --git a/xterm/xterm-lib.pl b/xterm/xterm-lib.pl
index 01fd02cd0..71f6ae9ab 100644
--- a/xterm/xterm-lib.pl
+++ b/xterm/xterm-lib.pl
@@ -22,10 +22,10 @@ if ($port) {
     }
 }
 
-# cleanup_miniserv(port)
+# remove_miniserv_websocket(port)
 # Remove old websocket info
 # from miniserv.conf
-sub cleanup_miniserv
+sub remove_miniserv_websocket
 {
 my ($port) = @_;
 my %miniserv;
@@ -42,10 +42,10 @@ if ($port) {
     }
 }
 
-# cleanup_old_websockets([&skip-ports])
+# cleanup_miniserv_websockets([&skip-ports])
 # Called by scheduled status collection to remove any
 # websockets in miniserv.conf that are no longer used
-sub cleanup_old_websockets
+sub cleanup_miniserv_websockets
 {
 my ($skip) = @_;
 $skip ||= [ ];