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

diff --git a/fish/more.c b/fish/more.c
index a32d5b4..9008bd1 100644
--- a/fish/more.c
+++ b/fish/more.c
@@ -1,5 +1,5 @@
 /* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -28,12 +28,12 @@
 #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];
+  char *remote;
   const char *pager;
-  char *content;
   int r, fd;
 
   if (argc != 1) {
@@ -50,31 +50,34 @@ do_more (const char *cmd, int argc, char *argv[])
       pager = "more";
   }
 
+  remote = argv[0];
+
+  /* Allow win:... prefix on remote. */
+  remote = win_prefix (remote);
+  if (remote == NULL)
+    return -1;
+
   /* Download the file and write it to a temporary. */
   fd = mkstemp (filename);
   if (fd == -1) {
     perror ("mkstemp");
+    free (remote);
     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, remote, buf) == -1) {
     close (fd);
     unlink (filename);
-    free (content);
+    free (remote);
     return -1;
   }
 
-  free (content);
-
   if (close (fd) == -1) {
     perror (filename);
     unlink (filename);
+    free (remote);
     return -1;
   }
 
@@ -86,8 +89,10 @@ do_more (const char *cmd, int argc, char *argv[])
   unlink (filename);
   if (r != 0) {
     perror (buf);
+    free (remote);
     return -1;
   }
 
+  free (remote);
   return 0;
 }