/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/password-prompt.c

  • Committer: Teddy Hogeborn
  • Date: 2009-01-18 00:18:50 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090118001850-pvg8xjwmbyt23fom
* debian/rules (install-indep): Removed "--no-start" from
                                dh_installinit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-prompt.c
1
 
/*  -*- coding: utf-8; mode: c; mode: orgtbl -*- */
 
1
/*  -*- coding: utf-8 -*- */
2
2
/*
3
3
 * Password-prompt - Read a password from the terminal and print it
4
4
 * 
33
33
#include <signal.h>             /* sig_atomic_t, raise(), struct
34
34
                                   sigaction, sigemptyset(),
35
35
                                   sigaction(), sigaddset(), SIGINT,
36
 
                                   SIGQUIT, SIGHUP, SIGTERM,
37
 
                                   raise() */
 
36
                                   SIGQUIT, SIGHUP, SIGTERM */
38
37
#include <stddef.h>             /* NULL, size_t, ssize_t */
39
38
#include <sys/types.h>          /* ssize_t */
40
39
#include <stdlib.h>             /* EXIT_SUCCESS, EXIT_FAILURE,
52
51
                                   ARGP_KEY_ARG, ARGP_KEY_END,
53
52
                                   ARGP_ERR_UNKNOWN */
54
53
 
55
 
volatile sig_atomic_t quit_now = 0;
56
 
int signal_received;
 
54
volatile bool quit_now = false;
57
55
bool debug = false;
58
56
const char *argp_program_version = "password-prompt " VERSION;
59
57
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
60
58
 
61
 
static void termination_handler(int signum){
62
 
  if(quit_now){
63
 
    return;
64
 
  }
65
 
  quit_now = 1;
66
 
  signal_received = signum;
 
59
static void termination_handler(__attribute__((unused))int signum){
 
60
  quit_now = true;
67
61
}
68
62
 
69
63
int main(int argc, char **argv){
86
80
      { .name = NULL }
87
81
    };
88
82
    
89
 
    error_t parse_opt (int key, char *arg, struct argp_state *state){
90
 
      switch (key){
 
83
    error_t parse_opt (int key, char *arg, struct argp_state *state) {
 
84
      switch (key) {
91
85
      case 'p':
92
86
        prefix = arg;
93
87
        break;
137
131
    perror("sigaction");
138
132
    return EXIT_FAILURE;
139
133
  }
140
 
  /* Need to check if the handler is SIG_IGN before handling:
141
 
     | [[info:libc:Initial Signal Actions]] |
142
 
     | [[info:libc:Basic Signal Handling]]  |
143
 
  */
144
134
  if(old_action.sa_handler != SIG_IGN){
145
135
    ret = sigaction(SIGINT, &new_action, NULL);
146
136
    if(ret == -1){
253
243
       read from stdin */
254
244
    fputc('\n', stderr);
255
245
    if(debug and not quit_now){
256
 
      /* If quit_now is nonzero, we were interrupted by a signal, and
 
246
      /* If quit_now is true, we were interrupted by a signal, and
257
247
         will print that later, so no need to show this too. */
258
248
      fprintf(stderr, "getline() returned 0, retrying.\n");
259
249
    }
268
258
    perror("tcsetattr+echo");
269
259
  }
270
260
  
271
 
  if(quit_now){
272
 
    sigemptyset(&old_action.sa_mask);
273
 
    old_action.sa_handler = SIG_DFL;
274
 
    ret = sigaction(signal_received, &old_action, NULL);
275
 
    if(ret == -1){
276
 
      perror("sigaction");
277
 
    }
278
 
    raise(signal_received);
279
 
  }
280
 
  
281
261
  if(debug){
282
262
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
283
263
            status);