X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=df%2Fvirt-df.pl;h=21ba79177cd8f625b38628cd36dc10187c374a18;hp=2d666a03c3fe0816db46de9928e203d3f22ddc72;hb=a1c8c3e1be70a821a5e4dfeeee6c78979e587b7a;hpb=e547e639b14072bc238cf161669bc3d94a8d6e13

diff --git a/df/virt-df.pl b/df/virt-df.pl
index 2d666a0..21ba791 100755
--- a/df/virt-df.pl
+++ b/df/virt-df.pl
@@ -28,6 +28,7 @@ use Getopt::Long;
 use Data::Dumper;
 use File::Temp qw/tempdir/;
 use XML::Writer;
+use Locale::TextDomain 'libguestfs';
 
 =encoding utf8
 
@@ -82,6 +83,14 @@ Display brief help.
 
 =cut
 
+my $version;
+
+=item B<--version>
+
+Display version number and exit.
+
+=cut
+
 my $uri;
 
 =item B<--connect URI> | B<-c URI>
@@ -122,12 +131,19 @@ Print inodes instead of blocks.
 =cut
 
 GetOptions ("help|?" => \$help,
-	    "connect|c=s" => \$uri,
+            "version" => \$version,
+            "connect|c=s" => \$uri,
             "csv" => \$csv,
             "human-readable|human|h" => \$human,
             "inodes|i" => \$inodes,
     ) or pod2usage (2);
 pod2usage (1) if $help;
+if ($version) {
+    my $g = Sys::Guestfs->new ();
+    my %h = $g->version ();
+    print "$h{major}.$h{minor}.$h{release}$h{extra}\n";
+    exit
+}
 
 # Open the guest handle.
 
@@ -135,9 +151,9 @@ if (@ARGV == 0) {
     my $conn;
 
     if ($uri) {
-	$conn = Sys::Virt->new (readonly => 1, address => $uri);
+        $conn = Sys::Virt->new (readonly => 1, address => $uri);
     } else {
-	$conn = Sys::Virt->new (readonly => 1);
+        $conn = Sys::Virt->new (readonly => 1);
     }
 
     my @doms = $conn->list_defined_domains ();
@@ -146,10 +162,10 @@ if (@ARGV == 0) {
     my @domnames = map { $_->get_name () } @doms;
 
     if (@domnames) {
-	print_title ();
-	foreach (@domnames) {
-	    do_df ($_);
-	}
+        print_title ();
+        foreach (@domnames) {
+            do_df ($_);
+        }
     }
 } else {
     print_title ();
@@ -161,13 +177,12 @@ sub do_df
     my $g;
 
     if ($uri) {
-	$g = open_guest (\@_, address => $uri);
+        $g = open_guest (\@_, address => $uri);
     } else {
-	$g = open_guest (\@_);
+        $g = open_guest (\@_);
     }
 
     $g->launch ();
-    $g->wait_ready ();
 
     my @partitions = get_partitions ($g);
 
@@ -179,15 +194,15 @@ sub do_df
 
     # Mount each partition in turn, and if mountable, do a statvfs on it.
     foreach my $partition (@partitions) {
-	my %stat;
-	eval {
-	    $g->mount_ro ($partition, "/");
-	    %stat = $g->statvfs ("/");
-	};
-	if (!$@) {
-	    print_stat ($domname, $partition, \%stat);
-	}
-	$g->umount_all ();
+        my %stat;
+        eval {
+            $g->mount_ro ($partition, "/");
+            %stat = $g->statvfs ("/");
+        };
+        if (!$@) {
+            print_stat ($domname, $partition, \%stat);
+        }
+        $g->umount_all ();
     }
 }
 
@@ -200,38 +215,38 @@ sub print_stat
     my @cols = ($domname, $partition);
 
     if (!$inodes) {
-	my $bsize = $stat->{bsize};	# block size
-	my $blocks = $stat->{blocks};	# total number of blocks
-	my $bfree = $stat->{bfree};	# blocks free (total)
-	my $bavail = $stat->{bavail};	# blocks free (for non-root users)
-
-	my $factor = $bsize / 1024;
-
-	push @cols, $blocks*$factor;	# total 1K blocks
-	push @cols, ($blocks-$bfree)*$factor; # total 1K blocks used
-	push @cols, $bavail*$factor;	# total 1K blocks available
-
-	# XXX %used column comes out different from the native 'df'
-	# program.  Need to check how 'df' calculates this.
-	push @cols, 100.0 - 100.0 * $bavail / $blocks;
-
-	if ($human) {
-	    $cols[2] = human_size ($cols[2]);
-	    $cols[3] = human_size ($cols[3]);
-	    $cols[4] = human_size ($cols[4]);
-	}
+        my $bsize = $stat->{bsize};	# block size
+        my $blocks = $stat->{blocks};	# total number of blocks
+        my $bfree = $stat->{bfree};	# blocks free (total)
+        my $bavail = $stat->{bavail};	# blocks free (for non-root users)
+
+        my $factor = $bsize / 1024;
+
+        push @cols, $blocks*$factor;	# total 1K blocks
+        push @cols, ($blocks-$bfree)*$factor; # total 1K blocks used
+        push @cols, $bavail*$factor;	# total 1K blocks available
+
+        # XXX %used column comes out different from the native 'df'
+        # program.  Need to check how 'df' calculates this.
+        push @cols, 100.0 - 100.0 * $bavail / $blocks;
+
+        if ($human) {
+            $cols[2] = human_size ($cols[2]);
+            $cols[3] = human_size ($cols[3]);
+            $cols[4] = human_size ($cols[4]);
+        }
     } else {
-	my $files = $stat->{files};	# total number of inodes
-	my $ffree = $stat->{ffree};	# inodes free (total)
-	my $favail = $stat->{favail};	# inodes free (for non-root users)
+        my $files = $stat->{files};	# total number of inodes
+        my $ffree = $stat->{ffree};	# inodes free (total)
+        my $favail = $stat->{favail};	# inodes free (for non-root users)
 
-	push @cols, $files;
-	push @cols, $files-$ffree;
-	push @cols, $ffree;
+        push @cols, $files;
+        push @cols, $files-$ffree;
+        push @cols, $ffree;
 
-	# XXX %used column comes out different from the native 'df'
-	# program.  Need to check how 'df' calculates this.
-	push @cols, 100.0 - 100.0 * $favail / $files;
+        # XXX %used column comes out different from the native 'df'
+        # program.  Need to check how 'df' calculates this.
+        push @cols, 100.0 - 100.0 * $favail / $files;
     }
 
     print_cols (@cols);
@@ -239,44 +254,44 @@ sub print_stat
 
 sub print_title
 {
-    my @cols = ("Virtual Machine", "Filesystem");
+    my @cols = (__"Virtual Machine", __"Filesystem");
     if (!$inodes) {
-	if (!$human) {
-	    push @cols, "1K-blocks";
-	} else {
-	    push @cols, "Size";
-	}
-	push @cols, "Used";
-	push @cols, "Available";
-	push @cols, "Use%";
+        if (!$human) {
+            push @cols, __"1K-blocks";
+        } else {
+            push @cols, __"Size";
+        }
+        push @cols, __"Used";
+        push @cols, __"Available";
+        push @cols, __"Use%";
     } else {
-	push @cols, "Inodes";
-	push @cols, "IUsed";
-	push @cols, "IFree";
-	push @cols, "IUse%";
+        push @cols, __"Inodes";
+        push @cols, __"IUsed";
+        push @cols, __"IFree";
+        push @cols, __"IUse%";
     }
 
     if (!$csv) {
-	# ignore $cols[0] in this mode
-	printf "%-36s%10s %10s %10s %5s\n",
-	  $cols[1], $cols[2], $cols[3], $cols[4], $cols[5];
+        # ignore $cols[0] in this mode
+        printf "%-36s%10s %10s %10s %5s\n",
+          $cols[1], $cols[2], $cols[3], $cols[4], $cols[5];
     } else {
-	print (join (",", @cols), "\n");
+        print (join (",", @cols), "\n");
     }
 }
 
 sub print_cols
 {
     if (!$csv) {
-	my $label = sprintf "%s:%s", $_[0], $_[1];
+        my $label = sprintf "%s:%s", $_[0], $_[1];
 
-	printf ("%-36s", $label);
-	print "\n"," "x32 if length ($label) > 36;
+        printf ("%-36s", $label);
+        print "\n"," "x36 if length ($label) > 36;
 
-	my $percent = sprintf "%3.1f%%", $_[5];
-	printf ("%10s %10s %10s %5s\n", $_[2], $_[3], $_[4], $percent);
+        my $percent = sprintf "%3.1f%%", $_[5];
+        printf ("%10s %10s %10s %5s\n", $_[2], $_[3], $_[4], $percent);
     } else {
-	printf ("\"%s\",\"%s\",%d,%d,%d,%.1f%%\n", @_);
+        printf ("\"%s\",\"%s\",%d,%d,%d,%.1f%%\n", @_);
     }
 }
 
@@ -286,11 +301,11 @@ sub human_size
     local $_ = shift;
 
     if ($_ < 1024) {
-	sprintf "%dK", $_;
+        sprintf "%dK", $_;
     } elsif ($_ < 1024 * 1024) {
-	sprintf "%.1fM", ($_ / 1024);
+        sprintf "%.1fM", ($_ / 1024);
     } else {
-	sprintf "%.1fG", ($_ / 1024 / 1024);
+        sprintf "%.1fG", ($_ / 1024 / 1024);
     }
 }