bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 444
by Teddy Hogeborn Update copyright year to "2010" wherever appropriate. | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 2 | /*
 | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 3 |  * Plymouth - Read a password from Plymouth and output it
 | 
| 444
by Teddy Hogeborn Update copyright year to "2010" wherever appropriate. | 4 |  * 
 | 
| 923
by Teddy Hogeborn Update copyright year to 2018 | 5 |  * Copyright © 2010-2018 Teddy Hogeborn
 | 
| 6 |  * Copyright © 2010-2018 Björn Påhlsson
 | |
| 444
by Teddy Hogeborn Update copyright year to "2010" wherever appropriate. | 7 |  * 
 | 
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 8 |  * This file is part of Mandos.
 | 
| 9 |  * 
 | |
| 10 |  * Mandos is free software: you can redistribute it and/or modify it
 | |
| 11 |  * under the terms of the GNU General Public License as published by
 | |
| 12 |  * the Free Software Foundation, either version 3 of the License, or
 | |
| 13 |  * (at your option) any later version.
 | |
| 14 |  * 
 | |
| 15 |  * Mandos is distributed in the hope that it will be useful, but
 | |
| 444
by Teddy Hogeborn Update copyright year to "2010" wherever appropriate. | 16 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
| 17 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 18 |  * General Public License for more details.
 | |
| 19 |  * 
 | |
| 20 |  * You should have received a copy of the GNU General Public License
 | |
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 21 |  * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 | 
| 444
by Teddy Hogeborn Update copyright year to "2010" wherever appropriate. | 22 |  * 
 | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 23 |  * Contact the authors at <mandos@recompile.se>.
 | 
| 444
by Teddy Hogeborn Update copyright year to "2010" wherever appropriate. | 24 |  */
 | 
| 25 | ||
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 26 | #define _GNU_SOURCE /* asprintf(), TEMP_FAILURE_RETRY() */ | 
| 27 | #include <signal.h> /* sig_atomic_t, struct sigaction, | |
| 28 | sigemptyset(), sigaddset(), SIGINT, | |
| 29 | SIGHUP, SIGTERM, sigaction(), | |
| 30 | kill(), SIG_IGN */ | |
| 31 | #include <stdbool.h> /* bool, false, true */ | |
| 32 | #include <fcntl.h> /* open(), O_RDONLY */ | |
| 33 | #include <iso646.h> /* and, or, not*/ | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 34 | #include <sys/types.h> /* size_t, ssize_t, pid_t, struct | 
| 35 | dirent, waitpid() */ | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 36 | #include <sys/wait.h> /* waitpid() */ | 
| 37 | #include <stddef.h> /* NULL */ | |
| 38 | #include <string.h> /* strchr(), memcmp() */ | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 39 | #include <stdio.h> /* asprintf(), perror(), fopen(), | 
| 485
by Teddy Hogeborn Merge from Björn. | 40 | fscanf(), vasprintf(), fprintf(), | 
| 41 | vfprintf() */ | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 42 | #include <unistd.h> /* close(), readlink(), read(), | 
| 43 | fork(), setsid(), chdir(), dup2(), | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 44 | STDERR_FILENO, execv(), access() */ | 
| 45 | #include <stdlib.h> /* free(), EXIT_FAILURE, realloc(), | |
| 46 | EXIT_SUCCESS, malloc(), _exit(), | |
| 47 | getenv() */ | |
| 48 | #include <dirent.h> /* scandir(), alphasort() */ | |
| 49 | #include <inttypes.h> /* intmax_t, strtoumax(), SCNuMAX */ | |
| 50 | #include <sys/stat.h> /* struct stat, lstat() */ | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 51 | #include <sysexits.h> /* EX_OSERR, EX_UNAVAILABLE */ | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 52 | #include <error.h> /* error() */ | 
| 53 | #include <errno.h> /* TEMP_FAILURE_RETRY */ | |
| 431
by teddy at bsnet * debian/watch: Also watch for "*.tar.xz" files. | 54 | #include <argz.h> /* argz_count(), argz_extract() */ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 55 | #include <stdarg.h> /* va_list, va_start(), ... */ | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 56 | |
| 57 | sig_atomic_t interrupted_by_signal = 0; | |
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 58 | |
| 59 | /* Used by Ubuntu 11.04 (Natty Narwahl) */
 | |
| 915
by Teddy Hogeborn Plymouth plugin: Try the newest PID file location | 60 | const char plymouth_old_old_pid[] = "/dev/.initramfs/plymouth.pid"; | 
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 61 | /* Used by Ubuntu 11.10 (Oneiric Ocelot) */
 | 
| 915
by Teddy Hogeborn Plymouth plugin: Try the newest PID file location | 62 | const char plymouth_old_pid[] = "/run/initramfs/plymouth.pid"; | 
| 63 | /* Used by Debian 9 (stretch) */
 | |
| 64 | const char plymouth_pid[] = "/run/plymouth/pid"; | |
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 65 | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 66 | const char plymouth_path[] = "/bin/plymouth"; | 
| 67 | const char plymouthd_path[] = "/sbin/plymouthd"; | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 68 | const char *plymouthd_default_argv[] = {"/sbin/plymouthd", | 
| 69 | "--mode=boot", | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 70 | "--attach-to-session", | 
| 71 | NULL }; | |
| 72 | ||
| 73 | static void termination_handler(__attribute__((unused))int signum){ | |
| 74 | if(interrupted_by_signal){ | |
| 75 | return; | |
| 76 | } | |
| 77 | interrupted_by_signal = 1; | |
| 78 | }
 | |
| 79 | ||
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 80 | /* Function to use when printing errors */
 | 
| 533
by teddy at bsnet * plugins.d/splashy.c (error_plus): Check format string. | 81 | __attribute__((format (gnu_printf, 3, 4))) | 
| 485
by Teddy Hogeborn Merge from Björn. | 82 | void error_plus(int status, int errnum, const char *formatstring, | 
| 83 | ...){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 84 | va_list ap; | 
| 85 | char *text; | |
| 86 | int ret; | |
| 87 |   
 | |
| 88 | va_start(ap, formatstring); | |
| 89 | ret = vasprintf(&text, formatstring, ap); | |
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 90 | if(ret == -1){ | 
| 485
by Teddy Hogeborn Merge from Björn. | 91 | fprintf(stderr, "Mandos plugin %s: ", | 
| 92 | program_invocation_short_name); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 93 | vfprintf(stderr, formatstring, ap); | 
| 94 | fprintf(stderr, ": "); | |
| 95 | fprintf(stderr, "%s\n", strerror(errnum)); | |
| 96 | error(status, errno, "vasprintf while printing error"); | |
| 97 | return; | |
| 98 | } | |
| 99 | fprintf(stderr, "Mandos plugin "); | |
| 100 | error(status, errnum, "%s", text); | |
| 101 | free(text); | |
| 102 | }
 | |
| 103 | ||
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 104 | /* Create prompt string */
 | 
| 105 | char *makeprompt(void){ | |
| 106 | int ret = 0; | |
| 107 | char *prompt; | |
| 108 | const char *const cryptsource = getenv("cryptsource"); | |
| 109 | const char *const crypttarget = getenv("crypttarget"); | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 110 | const char prompt_start[] = "Unlocking the disk"; | 
| 111 | const char prompt_end[] = "Enter passphrase"; | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 112 |   
 | 
| 113 | if(cryptsource == NULL){ | |
| 114 | if(crypttarget == NULL){ | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 115 | ret = asprintf(&prompt, "%s\n%s", prompt_start, prompt_end); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 116 | } else { | 
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 117 | ret = asprintf(&prompt, "%s (%s)\n%s", prompt_start, | 
| 118 | crypttarget, prompt_end); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 119 | } | 
| 120 | } else { | |
| 121 | if(crypttarget == NULL){ | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 122 | ret = asprintf(&prompt, "%s %s\n%s", prompt_start, cryptsource, | 
| 123 | prompt_end); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 124 | } else { | 
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 125 | ret = asprintf(&prompt, "%s %s (%s)\n%s", prompt_start, | 
| 126 | cryptsource, crypttarget, prompt_end); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 127 | } | 
| 128 | } | |
| 129 | if(ret == -1){ | |
| 130 | return NULL; | |
| 131 | } | |
| 132 | return prompt; | |
| 133 | }
 | |
| 134 | ||
| 135 | void kill_and_wait(pid_t pid){ | |
| 136 | TEMP_FAILURE_RETRY(kill(pid, SIGTERM)); | |
| 137 | TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); | |
| 138 | }
 | |
| 139 | ||
| 140 | bool become_a_daemon(void){ | |
| 141 | int ret = setuid(geteuid()); | |
| 142 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 143 | error_plus(0, errno, "setuid"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 144 | } | 
| 145 |     
 | |
| 146 | setsid(); | |
| 147 | ret = chdir("/"); | |
| 148 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 149 | error_plus(0, errno, "chdir"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 150 | return false; | 
| 151 | } | |
| 152 | ret = dup2(STDERR_FILENO, STDOUT_FILENO); /* replace our stdout */ | |
| 153 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 154 | error_plus(0, errno, "dup2"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 155 | return false; | 
| 156 | } | |
| 157 | return true; | |
| 158 | }
 | |
| 159 | ||
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 160 | __attribute__((nonnull (2, 3))) | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 161 | bool exec_and_wait(pid_t *pid_return, const char *path, | 
| 620
by Teddy Hogeborn * plugin-runner.c (main): Bug fix; do not ignore return value of | 162 | const char * const *argv, bool interruptable, | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 163 | bool daemonize){ | 
| 164 | int status; | |
| 165 | int ret; | |
| 166 | pid_t pid; | |
| 167 | pid = fork(); | |
| 168 | if(pid == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 169 | error_plus(0, errno, "fork"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 170 | return false; | 
| 171 | } | |
| 172 | if(pid == 0){ | |
| 173 | /* Child */ | |
| 174 | if(daemonize){ | |
| 175 | if(not become_a_daemon()){ | |
| 176 | _exit(EX_OSERR); | |
| 177 | } | |
| 178 | } | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 179 |     
 | 
| 833
by Teddy Hogeborn Client: Fix plymouth agent; broken since 1.7.2. | 180 | char **new_argv = malloc(sizeof(const char *)); | 
| 181 | if(new_argv == NULL){ | |
| 182 | error_plus(0, errno, "malloc"); | |
| 183 | _exit(EX_OSERR); | |
| 184 | } | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 185 | char **tmp; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 186 | int i = 0; | 
| 890
by Teddy Hogeborn Add spaces around all '=' signs in all C code. | 187 | for (; argv[i] != NULL; i++){ | 
| 833
by Teddy Hogeborn Client: Fix plymouth agent; broken since 1.7.2. | 188 | tmp = realloc(new_argv, sizeof(const char *) * ((size_t)i + 2)); | 
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 189 | if(tmp == NULL){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 190 | error_plus(0, errno, "realloc"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 191 | free(new_argv); | 
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 192 | _exit(EX_OSERR); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 193 | } | 
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 194 | new_argv = tmp; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 195 | new_argv[i] = strdup(argv[i]); | 
| 196 | } | |
| 462
by Teddy Hogeborn * plugins.d/plymouth.c: Fixed comment to "Plymouth" instead of "Usplash". | 197 | new_argv[i] = NULL; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 198 |     
 | 
| 199 | execv(path, (char *const *)new_argv); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 200 | error_plus(0, errno, "execv"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 201 | _exit(EXIT_FAILURE); | 
| 202 | } | |
| 203 | if(pid_return != NULL){ | |
| 204 | *pid_return = pid; | |
| 205 | } | |
| 206 | do { | |
| 207 | ret = waitpid(pid, &status, 0); | |
| 208 | } while(ret == -1 and errno == EINTR | |
| 209 | and ((not interrupted_by_signal) | |
| 210 | or (not interruptable))); | |
| 211 | if(interrupted_by_signal and interruptable){ | |
| 212 | return false; | |
| 213 | } | |
| 214 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 215 | error_plus(0, errno, "waitpid"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 216 | return false; | 
| 217 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 218 | if(WIFEXITED(status) and (WEXITSTATUS(status) == 0)){ | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 219 | return true; | 
| 220 | } | |
| 221 | return false; | |
| 222 | }
 | |
| 223 | ||
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 224 | __attribute__((nonnull)) | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 225 | int is_plymouth(const struct dirent *proc_entry){ | 
| 226 | int ret; | |
| 227 | { | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 228 | uintmax_t proc_id; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 229 | char *tmp; | 
| 230 | errno = 0; | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 231 | proc_id = strtoumax(proc_entry->d_name, &tmp, 10); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 232 | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 233 | if(errno != 0 or *tmp != '\0' | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 234 | or proc_id != (uintmax_t)((pid_t)proc_id)){ | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 235 | return 0; | 
| 236 | } | |
| 237 | } | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 238 | char exe_target[sizeof(plymouthd_path)]; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 239 | char *exe_link; | 
| 240 | ret = asprintf(&exe_link, "/proc/%s/exe", proc_entry->d_name); | |
| 241 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 242 | error_plus(0, errno, "asprintf"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 243 | return 0; | 
| 244 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 245 |   
 | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 246 | struct stat exe_stat; | 
| 247 | ret = lstat(exe_link, &exe_stat); | |
| 248 | if(ret == -1){ | |
| 249 | free(exe_link); | |
| 250 | if(errno != ENOENT){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 251 | error_plus(0, errno, "lstat"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 252 | } | 
| 253 | return 0; | |
| 254 | } | |
| 255 |   
 | |
| 256 | if(not S_ISLNK(exe_stat.st_mode) | |
| 257 | or exe_stat.st_uid != 0 | |
| 258 | or exe_stat.st_gid != 0){ | |
| 259 | free(exe_link); | |
| 260 | return 0; | |
| 261 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 262 |   
 | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 263 | ssize_t sret = readlink(exe_link, exe_target, sizeof(exe_target)); | 
| 264 | free(exe_link); | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 265 | if((sret != (ssize_t)sizeof(plymouthd_path)-1) or | 
| 266 | (memcmp(plymouthd_path, exe_target, | |
| 267 | sizeof(plymouthd_path)-1) != 0)){ | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 268 | return 0; | 
| 269 | } | |
| 270 | return 1; | |
| 271 | }
 | |
| 272 | ||
| 273 | pid_t get_pid(void){ | |
| 274 | int ret; | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 275 | uintmax_t proc_id = 0; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 276 | FILE *pidfile = fopen(plymouth_pid, "r"); | 
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 277 | /* Try the new pid file location */ | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 278 | if(pidfile != NULL){ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 279 | ret = fscanf(pidfile, "%" SCNuMAX, &proc_id); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 280 | if(ret != 1){ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 281 | proc_id = 0; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 282 | } | 
| 283 | fclose(pidfile); | |
| 284 | } | |
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 285 | /* Try the old pid file location */ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 286 | if(proc_id == 0){ | 
| 914
by Teddy Hogeborn Plymouth plugin bug fix: Actually try the old PID file location | 287 | pidfile = fopen(plymouth_old_pid, "r"); | 
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 288 | if(pidfile != NULL){ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 289 | ret = fscanf(pidfile, "%" SCNuMAX, &proc_id); | 
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 290 | if(ret != 1){ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 291 | proc_id = 0; | 
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 292 | } | 
| 293 | fclose(pidfile); | |
| 294 | } | |
| 295 | } | |
| 915
by Teddy Hogeborn Plymouth plugin: Try the newest PID file location | 296 | /* Try the old old pid file location */ | 
| 297 | if(proc_id == 0){ | |
| 298 | pidfile = fopen(plymouth_old_old_pid, "r"); | |
| 299 | if(pidfile != NULL){ | |
| 300 | ret = fscanf(pidfile, "%" SCNuMAX, &proc_id); | |
| 301 | if(ret != 1){ | |
| 302 | proc_id = 0; | |
| 303 | } | |
| 304 | fclose(pidfile); | |
| 305 | } | |
| 306 | } | |
| 504
by Teddy Hogeborn * plugins.d/plymouth.c (plymouth_pid): Changed to | 307 | /* Look for a plymouth process */ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 308 | if(proc_id == 0){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 309 | struct dirent **direntries = NULL; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 310 | ret = scandir("/proc", &direntries, is_plymouth, alphasort); | 
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 311 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 312 | error_plus(0, errno, "scandir"); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 313 | } | 
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 314 | if(ret > 0){ | 
| 913
by Teddy Hogeborn Fix another memory leak in plymouth plugin | 315 | for(int i = ret-1; i >= 0; i--){ | 
| 316 | if(proc_id == 0){ | |
| 317 | ret = sscanf(direntries[i]->d_name, "%" SCNuMAX, &proc_id); | |
| 318 | if(ret < 0){ | |
| 319 | error_plus(0, errno, "sscanf"); | |
| 320 | } | |
| 321 | } | |
| 322 | free(direntries[i]); | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 323 | } | 
| 324 | } | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 325 | /* scandir might preallocate for this variable (man page unclear). | 
| 485
by Teddy Hogeborn Merge from Björn. | 326 |        even if ret == 0, therefore we need to free it. */
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 327 | free(direntries); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 328 | } | 
| 329 | pid_t pid; | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 330 | pid = (pid_t)proc_id; | 
| 331 | if((uintmax_t)pid == proc_id){ | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 332 | return pid; | 
| 333 | } | |
| 334 |   
 | |
| 335 | return 0; | |
| 336 | }
 | |
| 337 | ||
| 912
by Teddy Hogeborn Fix memory leak in plymouth plugin | 338 | char **getargv(pid_t pid){ | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 339 | int cl_fd; | 
| 340 | char *cmdline_filename; | |
| 341 | ssize_t sret; | |
| 342 | int ret; | |
| 343 |   
 | |
| 344 | ret = asprintf(&cmdline_filename, "/proc/%" PRIuMAX "/cmdline", | |
| 345 | (uintmax_t)pid); | |
| 346 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 347 | error_plus(0, errno, "asprintf"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 348 | return NULL; | 
| 349 | } | |
| 350 |   
 | |
| 351 | /* Open /proc/<pid>/cmdline */ | |
| 352 | cl_fd = open(cmdline_filename, O_RDONLY); | |
| 353 | free(cmdline_filename); | |
| 354 | if(cl_fd == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 355 | error_plus(0, errno, "open"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 356 | return NULL; | 
| 357 | } | |
| 358 |   
 | |
| 359 | size_t cmdline_allocated = 0; | |
| 360 | size_t cmdline_len = 0; | |
| 361 | char *cmdline = NULL; | |
| 362 | char *tmp; | |
| 363 | const size_t blocksize = 1024; | |
| 364 | do { | |
| 365 | /* Allocate more space? */ | |
| 366 | if(cmdline_len + blocksize > cmdline_allocated){ | |
| 367 | tmp = realloc(cmdline, cmdline_allocated + blocksize); | |
| 368 | if(tmp == NULL){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 369 | error_plus(0, errno, "realloc"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 370 | free(cmdline); | 
| 371 | close(cl_fd); | |
| 372 | return NULL; | |
| 373 | } | |
| 374 | cmdline = tmp; | |
| 375 | cmdline_allocated += blocksize; | |
| 376 | } | |
| 377 |     
 | |
| 378 | /* Read data */ | |
| 379 | sret = read(cl_fd, cmdline + cmdline_len, | |
| 380 | cmdline_allocated - cmdline_len); | |
| 381 | if(sret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 382 | error_plus(0, errno, "read"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 383 | free(cmdline); | 
| 384 | close(cl_fd); | |
| 385 | return NULL; | |
| 386 | } | |
| 387 | cmdline_len += (size_t)sret; | |
| 388 | } while(sret != 0); | |
| 389 | ret = close(cl_fd); | |
| 390 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 391 | error_plus(0, errno, "close"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 392 | free(cmdline); | 
| 393 | return NULL; | |
| 394 | } | |
| 395 |   
 | |
| 396 | /* we got cmdline and cmdline_len, ignore rest... */ | |
| 432
by teddy at bsnet * plugins.d/usplash.c (main): BUG FIX: allocate space for the final | 397 | char **argv = malloc((argz_count(cmdline, cmdline_len) + 1) | 
| 431
by teddy at bsnet * debian/watch: Also watch for "*.tar.xz" files. | 398 | * sizeof(char *)); /* Get number of args */ | 
| 399 | if(argv == NULL){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 400 | error_plus(0, errno, "argv = malloc()"); | 
| 431
by teddy at bsnet * debian/watch: Also watch for "*.tar.xz" files. | 401 | free(cmdline); | 
| 402 | return NULL; | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 403 | } | 
| 431
by teddy at bsnet * debian/watch: Also watch for "*.tar.xz" files. | 404 | argz_extract(cmdline, cmdline_len, argv); /* Create argv */ | 
| 912
by Teddy Hogeborn Fix memory leak in plymouth plugin | 405 | return argv; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 406 | }
 | 
| 407 | ||
| 408 | int main(__attribute__((unused))int argc, | |
| 409 | __attribute__((unused))char **argv){ | |
| 410 | char *prompt; | |
| 411 | char *prompt_arg; | |
| 412 | pid_t plymouth_command_pid; | |
| 413 | int ret; | |
| 414 | bool bret; | |
| 415 | ||
| 416 | /* test -x /bin/plymouth */ | |
| 417 | ret = access(plymouth_path, X_OK); | |
| 418 | if(ret == -1){ | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 419 | /* Plymouth is probably not installed. Don't print an error | 
| 420 |        message, just exit. */
 | |
| 421 | exit(EX_UNAVAILABLE); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 422 | } | 
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 423 |   
 | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 424 | { /* Add signal handlers */ | 
| 425 | struct sigaction old_action, | |
| 426 | new_action = { .sa_handler = termination_handler, | |
| 427 | .sa_flags = 0 }; | |
| 428 | sigemptyset(&new_action.sa_mask); | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 429 | for(int *sig = (int[]){ SIGINT, SIGHUP, SIGTERM, 0 }; | 
| 430 | *sig != 0; sig++){ | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 431 | ret = sigaddset(&new_action.sa_mask, *sig); | 
| 432 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 433 | error_plus(EX_OSERR, errno, "sigaddset"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 434 | } | 
| 435 | ret = sigaction(*sig, NULL, &old_action); | |
| 436 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 437 | error_plus(EX_OSERR, errno, "sigaction"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 438 | } | 
| 439 | if(old_action.sa_handler != SIG_IGN){ | |
| 440 | ret = sigaction(*sig, &new_action, NULL); | |
| 441 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 442 | error_plus(EX_OSERR, errno, "sigaction"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 443 | } | 
| 444 | } | |
| 445 | } | |
| 446 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 447 |   
 | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 448 | /* plymouth --ping */ | 
| 449 | bret = exec_and_wait(&plymouth_command_pid, plymouth_path, | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 450 | (const char *[]) | 
| 451 | { plymouth_path, "--ping", NULL }, | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 452 | true, false); | 
| 453 | if(not bret){ | |
| 454 | if(interrupted_by_signal){ | |
| 455 | kill_and_wait(plymouth_command_pid); | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 456 | exit(EXIT_FAILURE); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 457 | } | 
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 458 | /* Plymouth is probably not running. Don't print an error | 
| 459 |        message, just exit. */
 | |
| 460 | exit(EX_UNAVAILABLE); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 461 | } | 
| 462 |   
 | |
| 463 | prompt = makeprompt(); | |
| 464 | ret = asprintf(&prompt_arg, "--prompt=%s", prompt); | |
| 465 | free(prompt); | |
| 466 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 467 | error_plus(EX_OSERR, errno, "asprintf"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 468 | } | 
| 469 |   
 | |
| 470 | /* plymouth ask-for-password --prompt="$prompt" */ | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 471 | bret = exec_and_wait(&plymouth_command_pid, | 
| 472 | plymouth_path, (const char *[]) | |
| 473 | { plymouth_path, "ask-for-password", | |
| 474 | prompt_arg, NULL }, | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 475 | true, false); | 
| 476 | free(prompt_arg); | |
| 477 | if(bret){ | |
| 478 | exit(EXIT_SUCCESS); | |
| 479 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 480 | if(not interrupted_by_signal){ | 
| 481 | /* exec_and_wait failed for some other reason */ | |
| 482 | exit(EXIT_FAILURE); | |
| 483 | } | |
| 484 | kill_and_wait(plymouth_command_pid); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 485 |   
 | 
| 912
by Teddy Hogeborn Fix memory leak in plymouth plugin | 486 | char **plymouthd_argv = NULL; | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 487 | pid_t pid = get_pid(); | 
| 488 | if(pid == 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 489 | error_plus(0, 0, "plymouthd pid not found"); | 
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 490 | } else { | 
| 491 | plymouthd_argv = getargv(pid); | |
| 492 | } | |
| 493 |   
 | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 494 | bret = exec_and_wait(NULL, plymouth_path, (const char *[]) | 
| 495 | { plymouth_path, "quit", NULL }, | |
| 496 | false, false); | |
| 497 | if(not bret){ | |
| 912
by Teddy Hogeborn Fix memory leak in plymouth plugin | 498 | if(plymouthd_argv != NULL){ | 
| 499 | free(*plymouthd_argv); | |
| 500 | free(plymouthd_argv); | |
| 501 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 502 | exit(EXIT_FAILURE); | 
| 503 | } | |
| 912
by Teddy Hogeborn Fix memory leak in plymouth plugin | 504 | bret = exec_and_wait(NULL, plymouthd_path, | 
| 505 | (plymouthd_argv != NULL) | |
| 506 | ? (const char * const *)plymouthd_argv | |
| 507 | : plymouthd_default_argv, | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 508 | false, true); | 
| 912
by Teddy Hogeborn Fix memory leak in plymouth plugin | 509 | if(plymouthd_argv != NULL){ | 
| 510 | free(*plymouthd_argv); | |
| 511 | free(plymouthd_argv); | |
| 512 | } | |
| 436
by teddy at bsnet * plugins.d/plymouth.c: Break lines, fix whitespace. Remove | 513 | if(not bret){ | 
| 514 | exit(EXIT_FAILURE); | |
| 515 | } | |
| 516 | exec_and_wait(NULL, plymouth_path, (const char *[]) | |
| 517 | { plymouth_path, "show-splash", NULL }, | |
| 518 | false, false); | |
| 24.1.157
by Björn Påhlsson added the actually plugin file for plymouth | 519 | exit(EXIT_FAILURE); | 
| 520 | }
 |