X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fmore.c;h=2065abb4c4d1a7393daee756d9176bc7abe2b220;hb=8f30c3c3f8c063f7c5ff8c6154d881e07a820251;hp=9abb51bb2dec0bf7f6f0c49e5337a1c99d6ec604;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git

diff --git a/fish/more.c b/fish/more.c
index 9abb51b..2065abb 100644
--- a/fish/more.c
+++ b/fish/more.c
@@ -28,12 +28,11 @@
 #include "fish.h"
 
 int
-do_more (const char *cmd, int argc, char *argv[])
+run_more (const char *cmd, size_t argc, char *argv[])
 {
-  char filename[] = "/tmp/guestfishXXXXXX";
+  TMP_TEMPLATE_ON_STACK (filename);
   char buf[256];
   const char *pager;
-  char *content;
   int r, fd;
 
   if (argc != 1) {
@@ -42,7 +41,7 @@ do_more (const char *cmd, int argc, char *argv[])
   }
 
   /* Choose a pager. */
-  if (strcasecmp (cmd, "less") == 0)
+  if (STRCASEEQ (cmd, "less"))
     pager = "less";
   else {
     pager = getenv ("PAGER");
@@ -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);