X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fmore.c;h=2065abb4c4d1a7393daee756d9176bc7abe2b220;hb=01d613ae957431d65c700a34e369ef4c06dd6d8f;hp=a32d5b41b8b8063b7f7470d77f65bf85f24b9b40;hpb=9353c6253d5fac1648b13ad9958468a2d9f6ad6f;p=libguestfs.git

diff --git a/fish/more.c b/fish/more.c
index a32d5b4..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) {
@@ -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);