From f784d1f73c7b1fa9b53d34b531f2737e85b6d98f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 3 Nov 2013 05:16:39 +0100 Subject: add clean quiting and timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/cerberus.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'src/cerberus.c') diff --git a/src/cerberus.c b/src/cerberus.c index b27b3da..f61f56a 100644 --- a/src/cerberus.c +++ b/src/cerberus.c @@ -20,8 +20,16 @@ #include #include "passphrase.h" +#include "quit.h" +/* The number of seconds before the program times out */ +#ifndef TIMEOUT_SECONDS +#define TIMEOUT_SECONDS 60 +#endif + + +/* Free if declared */ #define xfree(VAR) ({ if (VAR) free(VAR); }) @@ -102,11 +110,28 @@ int main(int argc, char** argv) } - /* Get the passphrase, if -f has not been used */ + /* Print ant we want a passphrase, if -f has not been used */ if (skip_auth == 0) { printf("Passphrase: "); fflush(stdout); + } + /* Done early to make to program look like it is even faster than it is */ + + + /* Set up clean quiting and time out */ + signal(SIGALRM, timeout_quit); + signal(SIGQUIT, user_quit); + signal(SIGINT, user_quit); + siginterrupt(SIGALM, 1); + siginterrupt(SIGQUIT, 1); + siginterrupt(SIGINT, 1); + alarm(TIMEOUT_SECONDS); + + + /* Get the passphrase, if -f has not been used */ + if (skip_auth == 0) + { passphrase = get_passphrase(); printf("\n"); } -- cgit v1.2.3-70-g09d2