use package libstring-shellquote-perl

This commit is contained in:
Dietmar Maurer 2011-10-25 13:35:08 +02:00
parent e38bcd3597
commit 7514b23af4
2 changed files with 3 additions and 18 deletions

View File

@ -14,6 +14,7 @@ use URI::Escape;
use Encode;
use Digest::SHA1;
use Text::ParseWords;
use String::ShellQuote;
our @EXPORT_OK = qw(
lock_file
@ -691,23 +692,7 @@ sub random_ether_addr {
sub shellquote {
my $str = shift;
return "''" if !defined ($str) || ($str eq '');
die "unable to quote string containing null (\\000) bytes"
if $str =~ m/\x00/;
# from String::ShellQuote
if ($str =~ m|[^\w!%+,\-./:@^]|) {
# ' -> '\''
$str =~ s/'/'\\''/g;
$str = "'$str'";
$str =~ s/^''//;
$str =~ s/''$//;
}
return $str;
return String::ShellQuote::shell_quote($str);
}
# split an shell argument string into an array,

2
debian/control vendored
View File

@ -7,6 +7,6 @@ Standards-Version: 3.8.4
Package: libpve-common-perl
Architecture: all
Depends: ${perl:Depends} ${misc:Depends}, libdevel-cycle-perl, libwww-perl, libjson-perl, liblinux-inotify2-perl, libio-stringy-perl, liburi-perl, libdigest-sha1-perl
Depends: ${perl:Depends} ${misc:Depends}, libdevel-cycle-perl, libwww-perl, libjson-perl, liblinux-inotify2-perl, libio-stringy-perl, liburi-perl, libdigest-sha1-perl, libstring-shellquote-perl
Description: Proxmox VE base library
This package contains the base library used by other Proxmox VE components.