diff options
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/Makefile.am | 1 | ||||
| -rw-r--r-- | fish/display.c | 95 | ||||
| -rw-r--r-- | fish/fish.h | 3 | ||||
| -rw-r--r-- | fish/guestfish.pod | 6 |
4 files changed, 105 insertions, 0 deletions
diff --git a/fish/Makefile.am b/fish/Makefile.am index 69540dd3..9e051702 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -75,6 +75,7 @@ guestfish_SOURCES = \ cmds_gperf.h \ copy.c \ destpaths.c \ + display.c \ echo.c \ edit.c \ fish.c \ diff --git a/fish/display.c b/fish/display.c new file mode 100644 index 00000000..4a46ea89 --- /dev/null +++ b/fish/display.c @@ -0,0 +1,95 @@ +/* guestfish - the filesystem interactive shell + * Copyright (C) 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> +#include <inttypes.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include "fish.h" + +int +run_display (const char *cmd, size_t argc, char *argv[]) +{ + TMP_TEMPLATE_ON_STACK (filename); + char *remote; + const char *display; + char buf[256]; + int r, fd; + + if (argc != 1) { + fprintf (stderr, _("display filename\n")); + return -1; + } + + /* Choose a display command. */ + display = getenv ("GUESTFISH_DISPLAY_IMAGE"); + if (display == NULL) + display = "display"; + + 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, remote, buf) == -1) { + close (fd); + unlink (filename); + free (remote); + return -1; + } + + if (close (fd) == -1) { + perror (filename); + unlink (filename); + free (remote); + return -1; + } + + /* View it. */ + snprintf (buf, sizeof buf, "%s %s", display, filename); + + r = system (buf); + unlink (filename); + if (r != 0) { + perror (buf); + free (remote); + return -1; + } + + free (remote); + return 0; +} diff --git a/fish/fish.h b/fish/fish.h index a885b891..6f242da7 100644 --- a/fish/fish.h +++ b/fish/fish.h @@ -102,6 +102,9 @@ extern int parse_size (const char *str, off_t *size_rtn); extern int run_copy_in (const char *cmd, size_t argc, char *argv[]); extern int run_copy_out (const char *cmd, size_t argc, char *argv[]); +/* in display.c */ +extern int run_display (const char *cmd, size_t argc, char *argv[]); + /* in echo.c */ extern int run_echo (const char *cmd, size_t argc, char *argv[]); diff --git a/fish/guestfish.pod b/fish/guestfish.pod index 77bf0ca3..a3d944d9 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -1023,6 +1023,11 @@ guestfish returns 0 if the commands completed without error, or The C<edit> command uses C<$EDITOR> as the editor. If not set, it uses C<vi>. +=item GUESTFISH_DISPLAY_IMAGE + +The C<display> command uses C<$GUESTFISH_DISPLAY_IMAGE> to +display images. If not set, it uses L<display(1)>. + =item GUESTFISH_PID Used with the I<--remote> option to specify the remote guestfish @@ -1169,6 +1174,7 @@ L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)>, +L<display(1)>, L<hexedit(1)>. =head1 AUTHORS |