diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2011-07-15 11:01:23 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2011-07-15 14:12:22 +0100 |
commit | 50c54d2814b13d7d51f659600e93565dc6921b28 (patch) | |
tree | 26bc08b683ef4cb133df4a3c1bf4247768889849 /fish/fish.c | |
parent | e187aa8431ccf0436d9aee03ee1e80b79f148217 (diff) | |
download | libguestfs-50c54d2814b13d7d51f659600e93565dc6921b28.tar.gz libguestfs-50c54d2814b13d7d51f659600e93565dc6921b28.tar.xz libguestfs-50c54d2814b13d7d51f659600e93565dc6921b28.zip |
fish: Register ^C handler to cancel long transfers.
Diffstat (limited to 'fish/fish.c')
-rw-r--r-- | fish/fish.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/fish/fish.c b/fish/fish.c index 750f50d5..2dbcdf01 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); @@ -72,7 +73,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; @@ -392,6 +393,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. @@ -515,6 +528,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 *); |