Avoid using reserved function name kill()

rdmark · rdmark · commit 63889c0b07d8 · 2023-12-10T10:54:05.000+09:00
diff --git a/cmd_kill.cgi b/cmd_kill.cgi
@@ -2,5 +2,5 @@
 
 require "vsftpd-lib.pl";
 
-kill();
+pkill();
 redirect("");
diff --git a/vsftpd-lib.pl b/vsftpd-lib.pl
@@ -37,7 +37,7 @@ ()
 	return "<pre>$out</pre>" if ($?);
 }
 
-sub kill() {
+sub pkill() {
 	# regex matches the path itself if it contains no / or the last element in a path
 	$config{'vsftpd_path'} =~ m!^((([^/])+)|(.*/([^/]+)))$!;
 	my $cmd = $2 . $5; # either one of these contains something

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ ()`
`37`	`37`	`return "<pre>$out</pre>" if ($?);`
`38`	`38`	`}`
`39`	`39`
`40`		`-sub kill() {`
	`40`	`+sub pkill() {`
`41`	`41`	`# regex matches the path itself if it contains no / or the last element in a path`
`42`	`42`	`$config{'vsftpd_path'} =~ m!^((([^/])+)\|(.*/([^/]+)))$!;`
`43`	`43`	`my $cmd = $2 . $5; # either one of these contains something`