aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/burncd/burncd.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2008-12-23 17:57:17 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2008-12-23 17:57:17 +0000
commit11a2f37eed203da09cf1a391024e38d18b36eeb7 (patch)
tree8a07661ab77cc424247d6d0bc89fb0ebdb60fb9a /usr.sbin/burncd/burncd.c
parentcd5c694a562720b863c262080cbf76926d8bd491 (diff)
Make signal handler safer.
Submitted by: Jaakko Heinonen <jh@saunalahti.fi>
Notes
Notes: svn path=/head/; revision=186444
Diffstat (limited to 'usr.sbin/burncd/burncd.c')
-rw-r--r--usr.sbin/burncd/burncd.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 5be73e0f7c91..083568658dd4 100644
--- a/usr.sbin/burncd/burncd.c
+++ b/usr.sbin/burncd/burncd.c
@@ -58,7 +58,8 @@ struct track_info {
int addr;
};
static struct track_info tracks[100];
-static int global_fd_for_cleanup, quiet, verbose, saved_block_size, notracks;
+static int quiet, verbose, saved_block_size, notracks;
+static volatile int global_fd_for_cleanup;
void add_track(char *, int, int, int);
void do_DAO(int fd, int, int);
@@ -716,11 +717,12 @@ cleanup_flush(void)
}
void
-cleanup_signal(int sig __unused)
+cleanup_signal(int sig)
{
- cleanup_flush();
- fprintf(stderr, "\n");
- errx(EXIT_FAILURE, "Aborted");
+ signal(sig, SIG_IGN);
+ ioctl(global_fd_for_cleanup, CDRIOCFLUSH);
+ write(STDERR_FILENO, "\nAborted\n", 10);
+ _exit(EXIT_FAILURE);
}
void