/mandos/release

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

« back to all changes in this revision

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

* plugin-runner.c: Whitespace changes only.

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,
53
52
                                   ARGP_ERR_UNKNOWN */
54
53
 
55
54
volatile sig_atomic_t quit_now = 0;
56
 
int signal_received;
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
 
  }
 
59
static void termination_handler(__attribute__((unused))int signum){
65
60
  quit_now = 1;
66
 
  signal_received = signum;
67
61
}
68
62
 
69
63
int main(int argc, char **argv){
129
123
  }
130
124
  
131
125
  sigemptyset(&new_action.sa_mask);
132
 
  ret = sigaddset(&new_action.sa_mask, SIGINT);
133
 
  if(ret == -1){
134
 
    perror("sigaddset");
135
 
    return EXIT_FAILURE;
136
 
  }
137
 
  ret = sigaddset(&new_action.sa_mask, SIGHUP);
138
 
  if(ret == -1){
139
 
    perror("sigaddset");
140
 
    return EXIT_FAILURE;
141
 
  }
142
 
  ret = sigaddset(&new_action.sa_mask, SIGTERM);
143
 
  if(ret == -1){
144
 
    perror("sigaddset");
145
 
    return EXIT_FAILURE;
146
 
  }
147
 
  /* Need to check if the handler is SIG_IGN before handling:
148
 
     | [[info:libc:Initial Signal Actions]] |
149
 
     | [[info:libc:Basic Signal Handling]]  |
150
 
  */
 
126
  sigaddset(&new_action.sa_mask, SIGINT);
 
127
  sigaddset(&new_action.sa_mask, SIGHUP);
 
128
  sigaddset(&new_action.sa_mask, SIGTERM);
151
129
  ret = sigaction(SIGINT, NULL, &old_action);
152
130
  if(ret == -1){
153
131
    perror("sigaction");
216
194
      const char *cryptsource = getenv("cryptsource");
217
195
      const char *crypttarget = getenv("crypttarget");
218
196
      const char *const prompt
219
 
        = "Enter passphrase to unlock the disk";
 
197
        = "Enter passphrase to unlock the disk";      
220
198
      if(cryptsource == NULL){
221
199
        if(crypttarget == NULL){
222
200
          fprintf(stderr, "%s: ", prompt);
264
242
    /* if(ret == 0), then the only sensible thing to do is to retry to
265
243
       read from stdin */
266
244
    fputc('\n', stderr);
267
 
    if(debug and not quit_now){
 
245
    if(debug and quit_now == 0){
268
246
      /* If quit_now is nonzero, we were interrupted by a signal, and
269
247
         will print that later, so no need to show this too. */
270
248
      fprintf(stderr, "getline() returned 0, retrying.\n");
280
258
    perror("tcsetattr+echo");
281
259
  }
282
260
  
283
 
  if(quit_now){
284
 
    sigemptyset(&old_action.sa_mask);
285
 
    old_action.sa_handler = SIG_DFL;
286
 
    ret = sigaction(signal_received, &old_action, NULL);
287
 
    if(ret == -1){
288
 
      perror("sigaction");
289
 
    }
290
 
    raise(signal_received);
291
 
  }
292
 
  
293
261
  if(debug){
294
262
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
295
263
            status);