X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fmore.c;h=01443fffc6af819a5b8e607eb1444848ff6cff22;hb=900c9626b9d4f567b21aae433493b4b3b1d09f6d;hp=e8a6d052a89f1146a01148d6e18d56ede3a1664e;hpb=c9c0ac7d362fd19214c2c5e5bb7dcd9059950887;p=libguestfs.git

diff --git a/fish/more.c b/fish/more.c
index e8a6d05..01443ff 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
@@ -28,10 +28,11 @@
 #include "fish.h"
 
 int
-run_more (const char *cmd, int argc, char *argv[])
+run_more (const char *cmd, size_t argc, char *argv[])
 {
   TMP_TEMPLATE_ON_STACK (filename);
   char buf[256];
+  char *remote;
   const char *pager;
   int r, fd;
 
@@ -49,24 +50,34 @@ run_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;
   }
 
   snprintf (buf, sizeof buf, "/dev/fd/%d", fd);
 
-  if (guestfs_download (g, argv[0], buf) == -1) {
+  if (guestfs_download (g, remote, buf) == -1) {
     close (fd);
     unlink (filename);
+    free (remote);
     return -1;
   }
 
   if (close (fd) == -1) {
     perror (filename);
     unlink (filename);
+    free (remote);
     return -1;
   }
 
@@ -78,8 +89,10 @@ run_more (const char *cmd, int argc, char *argv[])
   unlink (filename);
   if (r != 0) {
     perror (buf);
+    free (remote);
     return -1;
   }
 
+  free (remote);
   return 0;
 }