[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH 3/3] virt-ls: Modify to use find0 instead of find.



-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming blog: http://rwmj.wordpress.com
Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
>From 52b6f03decc2bf8d9cfc3642aa96474df3322930 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones redhat com>
Date: Mon, 19 Oct 2009 17:59:00 +0100
Subject: [PATCH 3/3] virt-ls: Modify to use find0 instead of find.

find0 is more scalable than find.  virt-ls will no longer
crash if asked to recursively list / on a Linux guest.
---
 tools/virt-ls |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/virt-ls b/tools/virt-ls
index 8f9c96f..2abfb0c 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: $!";
+    my $r;
+    my $line;
+    while (($r = read (F, $line, 1024)) > 0) {
+	$line =~ tr{\0}{\n};
+	print $line;
+    }
+    close F;
 }
 
 =head1 SEE ALSO
-- 
1.6.5.rc2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]