X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fvirt-ls;h=8add52e323d4831ee1cdcaa43ac2ed287aa3e9fb;hb=9ac07ee0c28fdd75e0a7393c69374ddff3a40ac9;hp=7e489a234f5ae888885c2f551eb2947697a1ead4;hpb=4dd6b77ff7037ee220b530cefb412ace3d880f61;p=libguestfs.git
diff --git a/tools/virt-ls b/tools/virt-ls
index 7e489a2..8add52e 100755
--- a/tools/virt-ls
+++ b/tools/virt-ls
@@ -26,6 +26,7 @@ use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
use Pod::Usage;
use Getopt::Long;
use Locale::TextDomain 'libguestfs';
+use File::Temp qw/tempdir/;
=encoding utf8
@@ -189,15 +190,22 @@ my $root_dev = $roots[0];
my $os = $oses->{$root_dev};
mount_operating_system ($g, $os);
-my @r;
unless ($mode) {
- @r = $g->ls ($directory);
+ my @r = $g->ls ($directory);
print "$_\n" foreach @r;
} elsif ($mode eq "l") {
print ($g->ll ($directory));
} else { # $mode eq "R"
- @r = $g->find ($directory);
- print "$_\n" foreach @r;
+ my $dir = tempdir (CLEANUP => 1);
+ $g->find0 ($directory, "$dir/find0");
+ open F, "$dir/find0" or die "$dir/find0: $!\n";
+ my $r;
+ my $line;
+ while (($r = read (F, $line, 1024)) > 0) {
+ $line =~ tr{\0}{\n};
+ print $line;
+ }
+ close F;
}
=head1 SEE ALSO
@@ -213,7 +221,7 @@ L.
=head1 AUTHOR
-Richard W.M. Jones L
+Richard W.M. Jones L
=head1 COPYRIGHT