From 2373ba34c24f6efcf287042feaa7664d423f63c7 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 8 Jun 2010 16:44:18 +0100 Subject: [PATCH] virt-df: Disallow -h and --csv options together (RHBZ#600977). Before this commit, if you used the -h and --csv options together you would get these warnings from virt-df: $ virt-df -h --csv Guest Virtual Machine,Filesystem,Size,Used,Available,Use% Argument "13.5G" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298. Argument "4.7G" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298. Argument "8.1G" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298. "/dev/vg_trick/RHEL55x64","/dev/VolGroup00/LogVol00",13,4,8,34.8% Argument "98.7M" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298. Argument "18.8M" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298. Argument "74.9M" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298. "/dev/vg_trick/RHEL55x64","/dev/vda1",98,18,74,19.0% We could fix this so that the human-readable numbers get written into the CSV file. However would probably be wrong for most uses of the CSV format (databases and spreadsheets) since they would not be able to interpret these human-readable numbers, or worse could misinterpret, eg. thinking that "1M" and "1G" are both 1. Therefore this commit disallows this combination of options. (cherry picked from commit aaf03a51a26ee501f5dbf2720bbb8a5e3b4e1e6b) --- tools/virt-df | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virt-df b/tools/virt-df index 4aa1063..45b7869 100755 --- a/tools/virt-df +++ b/tools/virt-df @@ -119,6 +119,8 @@ my $human; Print sizes in human-readable format. +You are not allowed to use I<-h> and I<--csv> at the same time. + =cut my $inodes; @@ -146,6 +148,9 @@ if ($version) { exit } +# RHBZ#600977 +die __"virt-df: cannot use -h and --csv options together\n" if $human && $csv; + # Open the guest handle. if (@ARGV == 0) { -- 1.8.3.1