X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futil.c;h=7f9f2b36a239be98f40ad69d0e7160b3179172d8;hp=973cee15e31a2d55fc49be2f2a9366d449f8a039;hb=9381a72403f622f66294ab10315240a4c4fd71cd;hpb=274914f99191e466bc523eadba74f52db8433189 diff --git a/src/util.c b/src/util.c index 973cee15e..7f9f2b36a 100644 --- a/src/util.c +++ b/src/util.c @@ -2605,6 +2605,15 @@ int make_stdio(int fd) { return 0; } +int make_null_stdio(void) { + int null_fd; + + if ((null_fd = open("/dev/null", O_RDWR|O_NOCTTY)) < 0) + return -errno; + + return make_stdio(null_fd); +} + bool is_clean_exit(int code, int status) { if (code == CLD_EXITED) @@ -2987,7 +2996,7 @@ void status_welcome(void) { else if (startswith(r, "Fedora")) status_printf("Welcome to \x1B[0;34m%s\x1B[0m!\n", r); /* Blue for Fedora */ else - status_printf("Welcome to %s!\n", r); + status_printf("Welcome to \x1B[1m%s\x1B[0m!\n", r); /* Highlight for everything else */ free(r); @@ -3364,168 +3373,101 @@ int signal_from_string_try_harder(const char *s) { return signo; } -int ask_password_tty(const char *message, usec_t until, const char *flag_file, char **_passphrase) { - struct termios old_termios, new_termios; - char passphrase[LINE_MAX]; - size_t p = 0; - int r, ttyfd = -1, notify = -1; - struct pollfd pollfd[2]; - bool reset_tty = false; - enum { - POLL_TTY, - POLL_INOTIFY - }; - - assert(message); - assert(_passphrase); +void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t) { - if (flag_file) { - if ((notify = inotify_init1(IN_CLOEXEC)) < 0) { - r = -errno; - goto finish; - } - - if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) { - r = -errno; - goto finish; - } - } - - if ((ttyfd = open("/dev/tty", O_RDWR|O_NOCTTY|O_CLOEXEC)) >= 0) { + assert(f); + assert(name); + assert(t); - if (tcgetattr(ttyfd, &old_termios) < 0) { - r = -errno; - goto finish; - } + if (!dual_timestamp_is_set(t)) + return; - loop_write(ttyfd, "\x1B[1m", 4, false); - loop_write(ttyfd, message, strlen(message), false); - loop_write(ttyfd, ": ", 2, false); - loop_write(ttyfd, "\x1B[0m", 4, false); + fprintf(f, "%s=%llu %llu\n", + name, + (unsigned long long) t->realtime, + (unsigned long long) t->monotonic); +} - new_termios = old_termios; - new_termios.c_lflag &= ~(ICANON|ECHO); - new_termios.c_cc[VMIN] = 1; - new_termios.c_cc[VTIME] = 0; +void dual_timestamp_deserialize(const char *value, dual_timestamp *t) { + unsigned long long a, b; - if (tcsetattr(ttyfd, TCSADRAIN, &new_termios) < 0) { - r = -errno; - goto finish; - } + assert(value); + assert(t); - reset_tty = true; + if (sscanf(value, "%lli %llu", &a, &b) != 2) + log_debug("Failed to parse finish timestamp value %s", value); + else { + t->realtime = a; + t->monotonic = b; } +} - zero(pollfd); - - pollfd[POLL_TTY].fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO; - pollfd[POLL_TTY].events = POLLIN; - pollfd[POLL_INOTIFY].fd = notify; - pollfd[POLL_INOTIFY].events = POLLIN; - - for (;;) { - char c; - int sleep_for = -1, k; - ssize_t n; - - if (until > 0) { - usec_t y; - - y = now(CLOCK_MONOTONIC); - - if (y > until) { - r = -ETIMEDOUT; - goto finish; - } - - sleep_for = (int) ((until - y) / USEC_PER_MSEC); - } - - if (flag_file) - if (access(flag_file, F_OK) < 0) { - r = -errno; - goto finish; - } +char *fstab_node_to_udev_node(const char *p) { + char *dn, *t, *u; + int r; - if ((k = poll(pollfd, notify > 0 ? 2 : 1, sleep_for)) < 0) { + /* FIXME: to follow udev's logic 100% we need to leave valid + * UTF8 chars unescaped */ - if (errno == EINTR) - continue; + if (startswith(p, "LABEL=")) { - r = -errno; - goto finish; - } else if (k == 0) { - r = -ETIMEDOUT; - goto finish; - } + if (!(u = unquote(p+6, "\"\'"))) + return NULL; - if (notify > 0 && pollfd[POLL_INOTIFY].revents != 0) - flush_fd(notify); + t = xescape(u, "/ "); + free(u); - if (pollfd[POLL_TTY].revents == 0) - continue; + if (!t) + return NULL; - if ((n = read(ttyfd >= 0 ? ttyfd : STDIN_FILENO, &c, 1)) < 0) { + r = asprintf(&dn, "/dev/disk/by-label/%s", t); + free(t); - if (errno == EINTR || errno == EAGAIN) - continue; + if (r < 0) + return NULL; - r = -errno; - goto finish; + return dn; + } - } else if (n == 0) - break; + if (startswith(p, "UUID=")) { - if (c == '\n') - break; - else if (c == 21) { + if (!(u = unquote(p+5, "\"\'"))) + return NULL; - while (p > 0) { - p--; + t = xescape(u, "/ "); + free(u); - if (ttyfd >= 0) - loop_write(ttyfd, "\b \b", 3, false); - } + if (!t) + return NULL; - } else if (c == '\b' || c == 127) { - if (p > 0) { - p--; + r = asprintf(&dn, "/dev/disk/by-uuid/%s", ascii_strlower(t)); + free(t); - if (ttyfd >= 0) - loop_write(ttyfd, "\b \b", 3, false); - } - } else { - passphrase[p++] = c; + if (r < 0) + return NULL; - if (ttyfd >= 0) - loop_write(ttyfd, "*", 1, false); - } + return dn; } - if (ttyfd >= 0) - loop_write(ttyfd, "\n", 1, false); - - passphrase[p] = 0; + return strdup(p); +} - if (!(*_passphrase = strdup(passphrase))) { - r = -ENOMEM; - goto finish; - } +void filter_environ(const char *prefix) { + int i, j; + assert(prefix); - r = 0; + if (!environ) + return; -finish: - if (notify >= 0) - close_nointr_nofail(notify); + for (i = 0, j = 0; environ[i]; i++) { - if (ttyfd >= 0) { - if (reset_tty) - tcsetattr(ttyfd, TCSADRAIN, &old_termios); + if (startswith(environ[i], prefix)) + continue; - close_nointr_nofail(ttyfd); + environ[j++] = environ[i]; } - return r; + environ[j] = NULL; } static const char *const ioprio_class_table[] = {