git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug: Segfault in Perl bindings.
[libguestfs.git]
/
fish
/
fish.c
diff --git
a/fish/fish.c
b/fish/fish.c
index
894e351
..
fa34510
100644
(file)
--- a/
fish/fish.c
+++ b/
fish/fish.c
@@
-26,7
+26,9
@@
#include <unistd.h>
#include <fcntl.h>
#include <getopt.h>
#include <unistd.h>
#include <fcntl.h>
#include <getopt.h>
+#include <signal.h>
#include <assert.h>
#include <assert.h>
+#include <ctype.h>
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
@@
-55,7
+57,6
@@
static void add_history_line (const char *);
/* Currently open libguestfs handle. */
guestfs_h *g;
/* Currently open libguestfs handle. */
guestfs_h *g;
-int g_launched = 0;
int read_only = 0;
int quit = 0;
int read_only = 0;
int quit = 0;
@@
-66,12
+67,11
@@
launch (guestfs_h *_g)
{
assert (_g == g);
{
assert (_g == g);
- if (
!g_launched
) {
+ if (
guestfs_is_config (g)
) {
if (guestfs_launch (g) == -1)
return -1;
if (guestfs_wait_ready (g) == -1)
return -1;
if (guestfs_launch (g) == -1)
return -1;
if (guestfs_wait_ready (g) == -1)
return -1;
- g_launched = 1;
}
return 0;
}
}
return 0;
}
@@
-333,6
+333,8
@@
script (int prompt)
char *p, *pend;
char *argv[64];
int i, len;
char *p, *pend;
char *argv[64];
int i, len;
+ int global_exit_on_error = !prompt;
+ int exit_on_error;
if (prompt)
printf ("\n"
if (prompt)
printf ("\n"
@@
-344,6
+346,8
@@
script (int prompt)
"\n");
while (!quit) {
"\n");
while (!quit) {
+ exit_on_error = global_exit_on_error;
+
buf = rl_gets (prompt);
if (!buf) {
quit = 1;
buf = rl_gets (prompt);
if (!buf) {
quit = 1;
@@
-351,6
+355,7
@@
script (int prompt)
}
/* Skip any initial whitespace before the command. */
}
/* Skip any initial whitespace before the command. */
+ again:
while (*buf && isspace (*buf))
buf++;
while (*buf && isspace (*buf))
buf++;
@@
-359,6
+364,30
@@
script (int prompt)
/* If the next character is '#' then this is a comment. */
if (*buf == '#') continue;
/* If the next character is '#' then this is a comment. */
if (*buf == '#') continue;
+ /* If the next character is '!' then pass the whole lot to system(3). */
+ if (*buf == '!') {
+ int r;
+
+ r = system (buf+1);
+ if (exit_on_error) {
+ if (r == -1 ||
+ (WIFSIGNALED (r) &&
+ (WTERMSIG (r) == SIGINT || WTERMSIG (r) == SIGQUIT)) ||
+ WEXITSTATUS (r) != 0)
+ exit (1);
+ }
+ continue;
+ }
+
+ /* If the next character is '-' allow the command to fail without
+ * exiting on error (just for this one command though).
+ */
+ if (*buf == '-') {
+ exit_on_error = 0;
+ buf++;
+ goto again;
+ }
+
/* Get the command (cannot be quoted). */
len = strcspn (buf, " \t");
/* Get the command (cannot be quoted). */
len = strcspn (buf, " \t");
@@
-386,12
+415,12
@@
script (int prompt)
len = strcspn (p, "\"");
if (p[len] == '\0') {
fprintf (stderr, "guestfish: unterminated double quote\n");
len = strcspn (p, "\"");
if (p[len] == '\0') {
fprintf (stderr, "guestfish: unterminated double quote\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
goto next_command;
}
if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
p[len] = '\0';
goto next_command;
}
p[len] = '\0';
@@
-401,12
+430,12
@@
script (int prompt)
len = strcspn (p, "'");
if (p[len] == '\0') {
fprintf (stderr, "guestfish: unterminated single quote\n");
len = strcspn (p, "'");
if (p[len] == '\0') {
fprintf (stderr, "guestfish: unterminated single quote\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
goto next_command;
}
if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
p[len] = '\0';
goto next_command;
}
p[len] = '\0';
@@
-423,12
+452,12
@@
script (int prompt)
}
if (c != 0) {
fprintf (stderr, "guestfish: unterminated \"[...]\" sequence\n");
}
if (c != 0) {
fprintf (stderr, "guestfish: unterminated \"[...]\" sequence\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
if (*pend && (*pend != ' ' && *pend != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
goto next_command;
}
if (*pend && (*pend != ' ' && *pend != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
*(pend-1) = '\0';
goto next_command;
}
*(pend-1) = '\0';
@@
-455,7
+484,7
@@
script (int prompt)
if (i == sizeof argv / sizeof argv[0]) {
fprintf (stderr, "guestfish: too many arguments\n");
if (i == sizeof argv / sizeof argv[0]) {
fprintf (stderr, "guestfish: too many arguments\n");
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
goto next_command;
}
goto next_command;
}
@@
-463,7
+492,7
@@
script (int prompt)
got_command:
if (issue_command (cmd, argv) == -1) {
got_command:
if (issue_command (cmd, argv) == -1) {
- if (
!prompt
) exit (1);
+ if (
exit_on_error
) exit (1);
}
next_command:;
}
next_command:;
@@
-523,6
+552,8
@@
issue_command (const char *cmd, char *argv[])
else if (strcasecmp (cmd, "alloc") == 0 ||
strcasecmp (cmd, "allocate") == 0)
return do_alloc (cmd, argc, argv);
else if (strcasecmp (cmd, "alloc") == 0 ||
strcasecmp (cmd, "allocate") == 0)
return do_alloc (cmd, argc, argv);
+ else if (strcasecmp (cmd, "echo") == 0)
+ return do_echo (cmd, argc, argv);
else if (strcasecmp (cmd, "edit") == 0 ||
strcasecmp (cmd, "vi") == 0 ||
strcasecmp (cmd, "emacs") == 0)
else if (strcasecmp (cmd, "edit") == 0 ||
strcasecmp (cmd, "vi") == 0 ||
strcasecmp (cmd, "emacs") == 0)
@@
-543,6
+574,8
@@
list_builtin_commands (void)
printf ("%-20s %s\n",
"alloc", "allocate an image");
printf ("%-20s %s\n",
printf ("%-20s %s\n",
"alloc", "allocate an image");
printf ("%-20s %s\n",
+ "echo", "display a line of text");
+ printf ("%-20s %s\n",
"edit", "edit a file in the image");
/* actions are printed after this (see list_commands) */
"edit", "edit a file in the image");
/* actions are printed after this (see list_commands) */
@@
-570,6
+603,11
@@
display_builtin_command (const char *cmd)
" <nn>M or <nn>MB number of megabytes\n"
" <nn>G or <nn>GB number of gigabytes\n"
" <nn>sects number of 512 byte sectors\n");
" <nn>M or <nn>MB number of megabytes\n"
" <nn>G or <nn>GB number of gigabytes\n"
" <nn>sects number of 512 byte sectors\n");
+ else if (strcasecmp (cmd, "echo") == 0)
+ printf ("echo - display a line of text\n"
+ " echo [<params> ...]\n"
+ "\n"
+ " This echos the parameters to the terminal.\n");
else if (strcasecmp (cmd, "edit") == 0 ||
strcasecmp (cmd, "vi") == 0 ||
strcasecmp (cmd, "emacs") == 0)
else if (strcasecmp (cmd, "edit") == 0 ||
strcasecmp (cmd, "vi") == 0 ||
strcasecmp (cmd, "emacs") == 0)