From: Richard Jones <rjones@redhat.com>
Date: Thu, 9 Sep 2010 13:11:32 +0000 (+0100)
Subject: fish: Fix 'more' command to work with any file.
X-Git-Tag: 1.2.14~19
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d3496005cd5fcdeb1e2513d8fc188d9c43d25ac6;p=libguestfs.git

fish: Fix 'more' command to work with any file.
(cherry picked from commit 639ca1828b167bf59353f0cd3c8c79c6289bbd5d)
---

diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index 66e3e67..8fc720e 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -607,9 +607,6 @@ This is used to view a file.
 The default viewer is C<$PAGER>.  However if you use the alternate
 command C<less> you will get the C<less> command specifically.
 
-NOTE: This will not work reliably for large files
-(> 2 MB) or binary files containing \0 bytes.
-
 =head2 quit | exit
 
 This exits guestfish.  You can also use C<^D> key.
diff --git a/fish/more.c b/fish/more.c
index a32d5b4..55faefa 100644
--- a/fish/more.c
+++ b/fish/more.c
@@ -33,7 +33,6 @@ do_more (const char *cmd, int argc, char *argv[])
   char filename[] = "/tmp/guestfishXXXXXX";
   char buf[256];
   const char *pager;
-  char *content;
   int r, fd;
 
   if (argc != 1) {
@@ -57,21 +56,14 @@ do_more (const char *cmd, int argc, char *argv[])
     return -1;
   }
 
-  if ((content = guestfs_cat (g, argv[0])) == NULL) {
-    close (fd);
-    unlink (filename);
-    return -1;
-  }
+  snprintf (buf, sizeof buf, "/dev/fd/%d", fd);
 
-  if (xwrite (fd, content, strlen (content)) == -1) {
+  if (guestfs_download (g, argv[0], buf) == -1) {
     close (fd);
     unlink (filename);
-    free (content);
     return -1;
   }
 
-  free (content);
-
   if (close (fd) == -1) {
     perror (filename);
     unlink (filename);