X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-ls;h=9518cf06c54dc9869b1bc1ac1c1999808022361a;hp=7e489a234f5ae888885c2f551eb2947697a1ead4;hb=e3851914de6bad3deb869ba865d2a6eb53c83151;hpb=4dd6b77ff7037ee220b530cefb412ace3d880f61

diff --git a/tools/virt-ls b/tools/virt-ls
index 7e489a2..9518cf0 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
 
@@ -109,6 +110,23 @@ at all.
 
 =cut
 
+my $format;
+
+=item B<--format> raw
+
+Specify the format of disk images given on the command line.  If this
+is omitted then the format is autodetected from the content of the
+disk image.
+
+If disk images are requested from libvirt, then this program asks
+libvirt for this information.  In this case, the value of the format
+parameter is ignored.
+
+If working with untrusted raw-format guest disk images, you should
+ensure the format is always specified.
+
+=cut
+
 my $mode;
 
 =item B<-l> | B<--long>
@@ -122,8 +140,8 @@ C<virt-ls -l> produces a "long listing", which shows more detail (just
 like the plain C<ls -l> command).
 
 C<virt-ls -R> produces a recursive list of files starting at the named
-directory.  See the documentation for the C<guestfs_find> command
-L<guestfs(3)> for precise details.
+directory.  See the documentation for L<guestfs(3)/guestfs_find>
+for precise details.
 
 You cannot combine these options.
 
@@ -146,6 +164,7 @@ sub set_mode_R
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
+            "format=s" => \$format,
             "long|l" => \&set_mode_l,
             "recursive|R" => \&set_mode_R,
     ) or pod2usage (2);
@@ -164,9 +183,9 @@ my $directory = pop @ARGV;
 
 my $g;
 if ($uri) {
-    $g = open_guest (\@ARGV, address => $uri);
+    $g = open_guest (\@ARGV, address => $uri, format => $format);
 } else {
-    $g = open_guest (\@ARGV);
+    $g = open_guest (\@ARGV, format => $format);
 }
 
 $g->launch ();
@@ -182,24 +201,37 @@ my %fses =
 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);
 
-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 SHELL QUOTING
+
+Libvirt guest names can contain arbitrary characters, some of which
+have meaning to the shell such as C<#> and space.  You may need to
+quote or escape these characters on the command line.  See the shell
+manual page L<sh(1)> for details.
+
 =head1 SEE ALSO
 
 L<guestfs(3)>,
@@ -213,7 +245,7 @@ L<http://libguestfs.org/>.
 
 =head1 AUTHOR
 
-Richard W.M. Jones L<http://et.redhat.com/~rjones/>
+Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 
 =head1 COPYRIGHT