DIsk space function cleanups

diff --git a/mount/freebsd-lib.pl b/mount/freebsd-lib.pl
index 167e588..c756963 100755 (executable)
--- a/mount/freebsd-lib.pl
+++ b/mount/freebsd-lib.pl
@@ -319,7 +319,8 @@ sub disk_space
 {
 if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "proc" || $_[0] eq "swap") { return (); }
-&execute_command("df -k $_[1]", undef, \$out, undef, 0, 1);
+my $out;
+&execute_command("df -k ".quotemeta($_[1]), undef, \$out, undef, 0, 1);
 if ($out =~ /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/hpux-lib.pl b/mount/hpux-lib.pl
index a59b866..b66c767 100644 (file)
--- a/mount/hpux-lib.pl
+++ b/mount/hpux-lib.pl
@@ -230,8 +230,8 @@ if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "swap") {
        return ();
        }
-local $out;
-&execute_command("bdf $_[1]", undef, \$out, \$out, 0, 1);
+my $out;
+&execute_command("bdf ".quotemeta($_[1]), undef, \$out, \$out, 0, 1);
 if ($out =~ /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/irix-lib.pl b/mount/irix-lib.pl
index 4e3c418..26219d8 100644 (file)
--- a/mount/irix-lib.pl
+++ b/mount/irix-lib.pl
@@ -267,7 +267,7 @@ if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "fd" || $_[0] eq "proc" || $_[0] eq "swap" || $_[0] eq "autofs") {
        return ();
        }
-if (&backquote_command("df -k $_[1]", 1) =~
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
     /Mounted on\n\S+\s+\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/linux-lib.pl b/mount/linux-lib.pl
index 0aba425..0aef4df 100644 (file)
--- a/mount/linux-lib.pl
+++ b/mount/linux-lib.pl
@@ -830,7 +830,7 @@ sub disk_space
 if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "proc" || $_[0] eq "swap" ||
     $_[0] eq "auto" || $_[0] eq "autofs") { return (); }
-local $out = &backquote_command("LC_ALL='' LANG='' df -k $_[1]", 1);
+local $out = &backquote_command("LC_ALL='' LANG='' df -k ".quotemeta($_[1]), 1);
 if ($out =~ /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/macos-lib.pl b/mount/macos-lib.pl
index b41874b..e50e102 100755 (executable)
--- a/mount/macos-lib.pl
+++ b/mount/macos-lib.pl
@@ -107,7 +107,7 @@ sub disk_space
 {
 if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "proc" || $_[0] eq "swap") { return (); }
-if (&backquote_command("df -k $_[1]", 1) =~
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
     /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/netbsd-lib.pl b/mount/netbsd-lib.pl
index c8c8711..b7a9bef 100755 (executable)
--- a/mount/netbsd-lib.pl
+++ b/mount/netbsd-lib.pl
@@ -231,7 +231,7 @@ sub disk_space
 {
 if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "proc" || $_[0] eq "swap") { return (); }
-if (&backquote_command("df -k $_[1]", 1) =~
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
     /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/openbsd-lib.pl b/mount/openbsd-lib.pl
index c50e50d..b6d8770 100755 (executable)
--- a/mount/openbsd-lib.pl
+++ b/mount/openbsd-lib.pl
@@ -231,7 +231,7 @@ sub disk_space
 {
 if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "proc" || $_[0] eq "swap") { return (); }
-if (&backquote_command("df -k $_[1]", 1) =~
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
     /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/osf1-lib.pl b/mount/osf1-lib.pl
index 0c0fd38..9d4f798 100644 (file)
--- a/mount/osf1-lib.pl
+++ b/mount/osf1-lib.pl
@@ -262,7 +262,7 @@ if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "fd" || $_[0] eq "proc" || $_[0] eq "swap" || $_[0] eq "autofs") {
        return ();
        }
-if (&backquote_command("df -k $_[1]", 1) =~
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
     /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }

diff --git a/mount/solaris-lib.pl b/mount/solaris-lib.pl
index f8902c5..5f4a660 100644 (file)
--- a/mount/solaris-lib.pl
+++ b/mount/solaris-lib.pl
@@ -330,9 +330,15 @@ if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "fd" || $_[0] eq "proc" || $_[0] eq "swap" || $_[0] eq "autofs") {
        return ();
        }
-if (&backquote_command("df -k $_[1]", 1) =~
-    /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
-       return ($1, $2);
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
+    /Mounted on\n\S+\s+(\S+)\s+(\S+)\s+(\S+)/) {
+       if ($1 == 0) {
+               # Size is sometimes zero on Solaris? Fake it..
+               return ($2+$3, $3);
+               }
+       else {
+               return ($1, $3);
+               }
        }
 return ( );
 }

diff --git a/mount/unixware-lib.pl b/mount/unixware-lib.pl
index 320f87b..39f8d2f 100755 (executable)
--- a/mount/unixware-lib.pl
+++ b/mount/unixware-lib.pl
@@ -318,7 +318,7 @@ if (&get_mounted($_[1], "*") < 0) { return (); }
 if ($_[0] eq "fd" || $_[0] eq "proc" || $_[0] eq "swap" || $_[0] eq "autofs") {
        return ();
        }
-if (&backquote_command("df -k $_[1]", 1) =~
+if (&backquote_command("df -k ".quotemeta($_[1]), 1) =~
     /Mounted on\n\S+\s+(\S+)\s+\S+\s+(\S+)/) {
        return ($1, $2);
        }