diff options
author | Mattias Andrée <maandree@operamail.com> | 2013-11-03 05:16:39 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2013-11-03 05:16:39 +0100 |
commit | f784d1f73c7b1fa9b53d34b531f2737e85b6d98f (patch) | |
tree | 8da3daf890b3581805747263644134b1ef798c9b /src | |
parent | derp (diff) | |
download | libpassphrase-f784d1f73c7b1fa9b53d34b531f2737e85b6d98f.tar.gz libpassphrase-f784d1f73c7b1fa9b53d34b531f2737e85b6d98f.tar.bz2 libpassphrase-f784d1f73c7b1fa9b53d34b531f2737e85b6d98f.tar.xz |
add clean quiting and timeout
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/cerberus.c | 27 | ||||
-rw-r--r-- | src/quit.c | 48 | ||||
-rw-r--r-- | src/quit.h | 39 |
3 files changed, 113 insertions, 1 deletions
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 <unistd.h> #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"); } diff --git a/src/quit.c b/src/quit.c new file mode 100644 index 0000000..3a0911d --- /dev/null +++ b/src/quit.c @@ -0,0 +1,48 @@ +/** + * cerberus – Minimal login program + * + * Copyright © 2013 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "quit.h" + + +/** + * Quit function for timeout + * + * @param signal The signal the program received + */ +void timeout_quit(int signal) +{ + (void) signal; + printf("\nTimed out.\n"); + reenable_echo(); + _exit(10); +} + + +/** + * Quit function for user aborts + * + * @param signal The signal the program received + */ +void user_quit(int signal) +{ + (void) signal; + printf("\n"); + reenable_echo(); + _exit(130); +} + diff --git a/src/quit.h b/src/quit.h new file mode 100644 index 0000000..93eb799 --- /dev/null +++ b/src/quit.h @@ -0,0 +1,39 @@ +/** + * cerberus – Minimal login program + * + * Copyright © 2013 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include <stdio.h> +#include <unistd.h> + +#include "passphrase.h" + + +/** + * Quit function for timeout + * + * @param signal The signal the program received + */ +void timeout_quit(int signal); + + +/** + * Quit function for user aborts + * + * @param signal The signal the program received + */ +void user_quit(int signal); + |