diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-05 19:44:16 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-05 20:29:05 +0100 |
commit | 5141c8fc02d0d20c0eaffb5de2ed8e4164fe2a94 (patch) | |
tree | cf2a2d0e29f45fa30294a762c1c335f1ab705d50 /fish/more.c | |
parent | b8be128caa27fa5e1636e9e4caff3e23a6dc761f (diff) | |
download | libguestfs-5141c8fc02d0d20c0eaffb5de2ed8e4164fe2a94.tar.gz libguestfs-5141c8fc02d0d20c0eaffb5de2ed8e4164fe2a94.tar.xz libguestfs-5141c8fc02d0d20c0eaffb5de2ed8e4164fe2a94.zip |
fish: copy-in, copy-out, edit, more commands can use win:... prefix.
Diffstat (limited to 'fish/more.c')
-rw-r--r-- | fish/more.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/fish/more.c b/fish/more.c index 2065abb4..01443fff 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 @@ -32,6 +32,7 @@ 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, size_t 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, size_t argc, char *argv[]) unlink (filename); if (r != 0) { perror (buf); + free (remote); return -1; } + free (remote); return 0; } |