X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=efc74b26571eb191d2ca448b96e588b02d06f509;hb=4bd1a5060bc95d8d933efa52f8d4aa26ecc118f5;hp=750f50d5a781568d4da0685445384da6ed1642e7;hpb=e187aa8431ccf0436d9aee03ee1e80b79f148217;p=libguestfs.git

diff --git a/fish/fish.c b/fish/fish.c
index 750f50d..efc74b2 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -53,6 +53,7 @@ struct parsed_command {
   char *argv[64];
 };
 
+static void user_cancel (int);
 static void set_up_terminal (void);
 static void prepare_drives (struct drv *drv);
 static int launch (void);
@@ -63,6 +64,7 @@ static void cmdline (char *argv[], int optind, int argc);
 static struct parsed_command parse_command_line (char *buf, int *exit_on_error_rtn);
 static int parse_quoted_string (char *p);
 static int execute_and_inline (const char *cmd, int exit_on_error);
+static void error_cb (guestfs_h *g, void *data, const char *msg);
 static void initialize_readline (void);
 static void cleanup_readline (void);
 #ifdef HAVE_LIBREADLINE
@@ -72,7 +74,7 @@ static void add_history_line (const char *);
 static int override_progress_bars = -1;
 
 /* Currently open libguestfs handle. */
-guestfs_h *g;
+guestfs_h *g = NULL;
 
 int read_only = 0;
 int live = 0;
@@ -90,6 +92,8 @@ int utf8_mode = 0;
 int have_terminfo = 0;
 int progress_bars = 0;
 int is_interactive = 0;
+const char *input_file = NULL;
+int input_lineno = 0;
 
 static void __attribute__((noreturn))
 usage (int status)
@@ -392,6 +396,18 @@ main (int argc, char *argv[])
    */
   is_interactive = !file && isatty (0);
 
+  /* Register a ^C handler.  We have to do this before launch could
+   * possibly be called below.
+   */
+  if (is_interactive) {
+    memset (&sa, 0, sizeof sa);
+    sa.sa_handler = user_cancel;
+    sa.sa_flags = SA_RESTART;
+    sigaction (SIGINT, &sa, NULL);
+
+    guestfs_set_pgroup (g, 1);
+  }
+
   /* Old-style -i syntax?  Since -a/-d/-N and -i was disallowed
    * previously, if we have -i without any drives but with something
    * on the command line, it must be old-style syntax.
@@ -490,6 +506,18 @@ main (int argc, char *argv[])
     }
   }
 
+  /* Get the name of the input file, for error messages, and replace
+   * the default error handler.
+   */
+  if (!is_interactive) {
+    if (file)
+      input_file = file;
+    else
+      input_file = "*stdin*";
+    guestfs_set_error_handler (g, error_cb, NULL);
+  }
+  input_lineno = 0;
+
   /* Decide if we display progress bars. */
   progress_bars =
     override_progress_bars >= 0
@@ -515,6 +543,13 @@ main (int argc, char *argv[])
   exit (EXIT_SUCCESS);
 }
 
+static void
+user_cancel (int sig)
+{
+  if (g)
+    guestfs_user_cancel (g);
+}
+
 /* The <term.h> header file which defines this has "issues". */
 extern int tgetent (char *, const char *);
 
@@ -648,6 +683,8 @@ script (int prompt)
       break;
     }
 
+    input_lineno++;
+
     pcmd = parse_command_line (buf, &exit_on_error);
     if (pcmd.status == -1 && exit_on_error)
       exit (EXIT_FAILURE);
@@ -1172,6 +1209,14 @@ extended_help_message (void)
              "For complete documentation:         man guestfish\n"));
 }
 
+/* Error callback.  This replaces the standard libguestfs error handler. */
+static void
+error_cb (guestfs_h *g, void *data, const char *msg)
+{
+  fprintf (stderr, _("%s:%d: libguestfs: error: %s\n"),
+	   input_file, input_lineno, msg);
+}
+
 void
 free_strings (char **argv)
 {