/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

* plugins.d/password-prompt.c: Some white space fixes.  Break some
                               long lines.  Add more debug output.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-prompt.c
41
41
                                   getenv(), free() */
42
42
#include <dirent.h>             /* scandir(), alphasort() */
43
43
#include <stdio.h>              /* fprintf(), stderr, getline(),
44
 
                                   stdin, feof(), fputc(), vfprintf(),
45
 
                                   vasprintf() */
 
44
                                   stdin, feof(), fputc()
 
45
                                */
46
46
#include <errno.h>              /* errno, EBADF, ENOTTY, EINVAL,
47
47
                                   EFAULT, EFBIG, EIO, ENOSPC, EINTR
48
48
                                */
51
51
#include <stdbool.h>            /* bool, false, true */
52
52
#include <inttypes.h>           /* strtoumax() */
53
53
#include <sys/stat.h>           /* struct stat, lstat(), open() */
54
 
#include <string.h>             /* strlen, rindex, memcmp, strerror()
55
 
                                 */
 
54
#include <string.h>             /* strlen, rindex, memcmp */
56
55
#include <argp.h>               /* struct argp_option, struct
57
56
                                   argp_state, struct argp,
58
57
                                   argp_parse(), error_t,
61
60
#include <sysexits.h>           /* EX_SOFTWARE, EX_OSERR,
62
61
                                   EX_UNAVAILABLE, EX_IOERR, EX_OK */
63
62
#include <fcntl.h>              /* open() */
64
 
#include <stdarg.h>             /* va_list, va_start(), ... */
65
63
 
66
64
volatile sig_atomic_t quit_now = 0;
67
65
int signal_received;
71
69
 
72
70
/* Needed for conflict resolution */
73
71
const char plymouth_name[] = "plymouthd";
 
72
const char plymouth_alt_name[] = "plymouthd";
74
73
 
75
 
/* Function to use when printing errors */
76
 
void error_plus(int status, int errnum, const char *formatstring,
77
 
                ...){
78
 
  va_list ap;
79
 
  char *text;
80
 
  int ret;
81
 
  
82
 
  va_start(ap, formatstring);
83
 
  ret = vasprintf(&text, formatstring, ap);
84
 
  if (ret == -1){
85
 
    fprintf(stderr, "Mandos plugin %s: ",
86
 
            program_invocation_short_name);
87
 
    vfprintf(stderr, formatstring, ap);
88
 
    fprintf(stderr, ": ");
89
 
    fprintf(stderr, "%s\n", strerror(errnum));
90
 
    error(status, errno, "vasprintf while printing error");
91
 
    return;
92
 
  }
93
 
  fprintf(stderr, "Mandos plugin ");
94
 
  error(status, errnum, "%s", text);
95
 
  free(text);
96
 
}
97
74
 
98
75
static void termination_handler(int signum){
99
76
  if(quit_now){
136
113
    cl_fd = open(cmdline_filename, O_RDONLY);
137
114
    free(cmdline_filename);
138
115
    if(cl_fd == -1){
139
 
      if(errno != ENOENT){
140
 
        error(0, errno, "open");
141
 
      }
 
116
      error(0, errno, "open");
142
117
      return 0;
143
118
    }
144
119
    
192
167
      cmdline_base = cmdline;
193
168
    }
194
169
    
195
 
    if(strcmp(cmdline_base, plymouth_name) != 0){
 
170
    if((strcmp(cmdline_base, plymouth_name) != 0)
 
171
       and (strcmp(cmdline_base, plymouth_alt_name) != 0)){
196
172
      if(debug){
197
 
        fprintf(stderr, "\"%s\" is not \"%s\"\n", cmdline_base,
198
 
                plymouth_name);
 
173
        fprintf(stderr, "\"%s\" is not \"%s\" or \"%s\"\n",
 
174
                cmdline_base, plymouth_name, plymouth_alt_name);
199
175
      }
200
176
      free(cmdline);
201
177
      return 0;
202
178
    }
203
 
    if(debug){
204
 
      fprintf(stderr, "\"%s\" equals \"%s\"\n", cmdline_base,
205
 
              plymouth_name);
206
 
    }
 
179
    fprintf(stderr, "\"%s\" equals \"%s\" or \"%s\"\n",
 
180
            cmdline_base, plymouth_name, plymouth_alt_name);
207
181
    free(cmdline);
208
182
    return 1;
209
183
  }
210
184
  
211
 
  struct dirent **direntries = NULL;
 
185
  struct dirent **direntries;
212
186
  int ret;
213
187
  ret = scandir("/proc", &direntries, is_plymouth, alphasort);
214
188
  if (ret == -1){
215
189
    error(1, errno, "scandir");
216
190
  }
217
 
  free(dirent);
218
191
  return ret > 0;
219
192
}
220
193