git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator: Add 'Key' parameter type.
[libguestfs.git]
/
tools
/
virt-ls
diff --git
a/tools/virt-ls
b/tools/virt-ls
index
7e489a2
..
8813d2f
100755
(executable)
--- 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 Pod::Usage;
use Getopt::Long;
use Locale::TextDomain 'libguestfs';
+use File::Temp qw/tempdir/;
=encoding utf8
=encoding utf8
@@
-182,22
+183,28
@@
my %fses =
my $oses = inspect_operating_systems ($g, \%fses);
my @roots = keys %$oses;
my $oses = inspect_operating_systems ($g, \%fses);
my @roots = keys %$oses;
-die __"no root device found in this operating system image\n" if @roots == 0;
die __"multiboot operating systems are not supported by virt-ls\n" if @roots > 1;
my $root_dev = $roots[0];
my $os = $oses->{$root_dev};
mount_operating_system ($g, $os);
die __"multiboot operating systems are not supported by virt-ls\n" if @roots > 1;
my $root_dev = $roots[0];
my $os = $oses->{$root_dev};
mount_operating_system ($g, $os);
-my @r;
unless ($mode) {
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"
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
}
=head1 SEE ALSO
@@
-213,7
+220,7
@@
L<http://libguestfs.org/>.
=head1 AUTHOR
=head1 AUTHOR
-Richard W.M. Jones L<http://
et
.redhat.com/~rjones/>
+Richard W.M. Jones L<http://
people
.redhat.com/~rjones/>
=head1 COPYRIGHT
=head1 COPYRIGHT