summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-06-28 18:58:54 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-06-28 18:58:54 +0100
commitdfb89e3556c02bcc5fbe62f90e3c716a2cbe93da (patch)
tree678d93ea370f60afc6d6e1f2fe5bb815e9f78aeb
parent7f16c346bbeba2f2fe3c31ccb85158178a284d84 (diff)
downloadlibguestfs-dfb89e3556c02bcc5fbe62f90e3c716a2cbe93da.tar.gz
libguestfs-dfb89e3556c02bcc5fbe62f90e3c716a2cbe93da.tar.xz
libguestfs-dfb89e3556c02bcc5fbe62f90e3c716a2cbe93da.zip
fish: Add 'display' command for displaying graphical files.
-rw-r--r--fish/Makefile.am1
-rw-r--r--fish/display.c95
-rw-r--r--fish/fish.h3
-rw-r--r--fish/guestfish.pod6
-rw-r--r--generator/generator_actions.ml14
-rw-r--r--po/POTFILES.in1
6 files changed, 120 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
diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index d741dfb5..b0b4af45 100644
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -6060,6 +6060,20 @@ them with the help of L</glob> like this:
glob copy-out /home/* .");
+ ("display", (RErr,[], []), -1, [], [],
+ "display an image",
+ " display filename
+
+Use C<display> (a graphical display program) to display an image
+file. It downloads the file, and runs C<display> on it.
+
+To use an alternative program, set the C<GUESTFISH_DISPLAY_IMAGE>
+environment variable. For example to use the GNOME display program:
+
+ export GUESTFISH_DISPLAY_IMAGE=eog
+
+See also L<display(1)>.");
+
("echo", (RErr,[], []), -1, [], [],
"display a line of text",
" echo [params ...]
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3f671a9..069ccb1c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -87,6 +87,7 @@ fish/completion.c
fish/config.c
fish/copy.c
fish/destpaths.c
+fish/display.c
fish/echo.c
fish/edit.c
fish/fish.c