diff --git a/webtools/bonsai/CGI.pl b/webtools/bonsai/CGI.pl index 59afd95f0c49..d15f9bffba8a 100644 --- a/webtools/bonsai/CGI.pl +++ b/webtools/bonsai/CGI.pl @@ -85,13 +85,6 @@ sub url_encode3 { return $s; } -# Quotify a string, suitable for invoking a shell process -sub shell_escape { - my ($file) = @_; - $file =~ s/([ \"\'\`\~\?\$\&\|\!<>\(\)\[\]\;\:])/\\$1/g; - return $file; -} - # Make sure CVS revisions are in a specific format sub sanitize_revision { my ($rev) = @_; diff --git a/webtools/bonsai/globals.pl b/webtools/bonsai/globals.pl index 48cd076b98f2..eeefdf212f34 100644 --- a/webtools/bonsai/globals.pl +++ b/webtools/bonsai/globals.pl @@ -1248,4 +1248,11 @@ sub Fix_BonsaiLink { return $bonsai_path; } +# Quotify a string, suitable for invoking a shell process +sub shell_escape { + my ($file) = @_; + $file =~ s/([ \"\'\`\~\^\?\$\&\|\!<>\(\)\[\]\;\:])/\\$1/g; + return $file; +} + 1; diff --git a/webtools/bonsai/multidiff.cgi b/webtools/bonsai/multidiff.cgi index f0e8faf5a80a..8003e5faa3ab 100755 --- a/webtools/bonsai/multidiff.cgi +++ b/webtools/bonsai/multidiff.cgi @@ -27,7 +27,6 @@ use strict; -require 'CGI.pl'; require 'globals.pl'; $|=1;