X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=7b67bc1dab950d76e1cf5ac7e10457d502197659;hp=96b0ddd80f3fface13930b39eac1b62da54688ae;hb=f131770b1465fbf423881f16ba85523a05f846fe;hpb=c33b329709ebe2755181980a050d02ec7c81ed87 diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 96b0ddd80..7b67bc1da 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -501,10 +501,8 @@ static int parse_argv(int argc, char *argv[]) { case ARG_FILE: r = glob_extend(&arg_file, optarg); - if (r < 0) { - log_error_errno(r, "Failed to add paths: %m"); - return r; - }; + if (r < 0) + return log_error_errno(r, "Failed to add paths: %m"); break; case ARG_ROOT: @@ -749,10 +747,8 @@ static int generate_new_id128(void) { unsigned i; r = sd_id128_randomize(&id); - if (r < 0) { - log_error_errno(r, "Failed to generate ID: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to generate ID: %m"); printf("As string:\n" SD_ID128_FORMAT_STR "\n\n" @@ -798,10 +794,8 @@ static int add_matches(sd_journal *j, char **args) { p = canonicalize_file_name(*i); path = p ? p : *i; - if (stat(path, &st) < 0) { - log_error("Couldn't stat file: %m"); - return -errno; - } + if (stat(path, &st) < 0) + return log_error_errno(errno, "Couldn't stat file: %m"); if (S_ISREG(st.st_mode) && (0111 & st.st_mode)) { if (executable_is_script(path, &interpreter) > 0) { @@ -851,10 +845,8 @@ static int add_matches(sd_journal *j, char **args) { have_term = true; } - if (r < 0) { - log_error_errno(r, "Failed to add match '%s': %m", *i); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match '%s': %m", *i); } if (!strv_isempty(args) && !have_term) { @@ -1040,10 +1032,8 @@ static int add_boot(sd_journal *j) { sd_id128_to_string(arg_boot_id, match + 9); r = sd_journal_add_match(j, match, sizeof(match) - 1); - if (r < 0) { - log_error_errno(r, "Failed to add match: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match: %m"); r = sd_journal_add_conjunction(j); if (r < 0) @@ -1060,10 +1050,8 @@ static int add_dmesg(sd_journal *j) { return 0; r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel")); - if (r < 0) { - log_error_errno(r, "Failed to add match: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match: %m"); r = sd_journal_add_conjunction(j); if (r < 0) @@ -1263,10 +1251,8 @@ static int add_priorities(sd_journal *j) { match[sizeof(match)-2] = '0' + i; r = sd_journal_add_match(j, match, strlen(match)); - if (r < 0) { - log_error_errno(r, "Failed to add match: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add match: %m"); } r = sd_journal_add_conjunction(j); @@ -1315,10 +1301,8 @@ static int setup_keys(void) { struct stat st; r = stat("/var/log/journal", &st); - if (r < 0 && errno != ENOENT && errno != ENOTDIR) { - log_error("stat(\"%s\") failed: %m", "/var/log/journal"); - return -errno; - } + if (r < 0 && errno != ENOENT && errno != ENOTDIR) + return log_error_errno(errno, "stat(\"%s\") failed: %m", "/var/log/journal"); if (r < 0 || !S_ISDIR(st.st_mode)) { log_error("%s is not a directory, must be using persistent logging for FSS.", @@ -1327,16 +1311,12 @@ static int setup_keys(void) { } r = sd_id128_get_machine(&machine); - if (r < 0) { - log_error_errno(r, "Failed to get machine ID: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get machine ID: %m"); r = sd_id128_get_boot(&boot); - if (r < 0) { - log_error_errno(r, "Failed to get boot ID: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get boot ID: %m"); if (asprintf(&p, "/var/log/journal/" SD_ID128_FORMAT_STR "/fss", SD_ID128_FORMAT_VAL(machine)) < 0) @@ -1346,7 +1326,7 @@ static int setup_keys(void) { if (arg_force) { r = unlink(p); if (r < 0) { - log_error("unlink(\"%s\") failed: %m", p); + log_error_errno(errno, "unlink(\"%s\") failed: %m", p); r = -errno; goto finish; } @@ -1374,7 +1354,7 @@ static int setup_keys(void) { fd = open("/dev/random", O_RDONLY|O_CLOEXEC|O_NOCTTY); if (fd < 0) { - log_error("Failed to open /dev/random: %m"); + log_error_errno(errno, "Failed to open /dev/random: %m"); r = -errno; goto finish; } @@ -1401,7 +1381,7 @@ static int setup_keys(void) { safe_close(fd); fd = mkostemp_safe(k, O_WRONLY|O_CLOEXEC); if (fd < 0) { - log_error("Failed to open %s: %m", k); + log_error_errno(errno, "Failed to open %s: %m", k); r = -errno; goto finish; } @@ -1409,12 +1389,12 @@ static int setup_keys(void) { /* Enable secure remove, exclusion from dump, synchronous * writing and in-place updating */ if (ioctl(fd, FS_IOC_GETFLAGS, &attr) < 0) - log_warning("FS_IOC_GETFLAGS failed: %m"); + log_warning_errno(errno, "FS_IOC_GETFLAGS failed: %m"); attr |= FS_SECRM_FL|FS_NODUMP_FL|FS_SYNC_FL|FS_NOCOW_FL; if (ioctl(fd, FS_IOC_SETFLAGS, &attr) < 0) - log_warning("FS_IOC_SETFLAGS failed: %m"); + log_warning_errno(errno, "FS_IOC_SETFLAGS failed: %m"); zero(h); memcpy(h.signature, "KSHHRHLP", 8); @@ -1426,22 +1406,20 @@ static int setup_keys(void) { h.fsprg_secpar = htole16(FSPRG_RECOMMENDED_SECPAR); h.fsprg_state_size = htole64(state_size); - l = loop_write(fd, &h, sizeof(h), false); - if (l < 0 || (size_t) l != sizeof(h)) { - log_error_errno(EIO, "Failed to write header: %m"); - r = -EIO; + r = loop_write(fd, &h, sizeof(h), false); + if (r < 0) { + log_error_errno(r, "Failed to write header: %m"); goto finish; } - l = loop_write(fd, state, state_size, false); - if (l < 0 || (size_t) l != state_size) { - log_error_errno(EIO, "Failed to write state: %m"); - r = -EIO; + r = loop_write(fd, state, state_size, false); + if (r < 0) { + log_error_errno(r, "Failed to write state: %m"); goto finish; } if (link(k, p) < 0) { - log_error("Failed to link file: %m"); + log_error_errno(errno, "Failed to link file: %m"); r = -errno; goto finish; } @@ -1681,10 +1659,8 @@ static int flush_to_var(void) { /* OK, let's actually do the full logic, send SIGUSR1 to the * daemon and set up inotify to wait for the flushed file to appear */ r = bus_open_system_systemd(&bus); - if (r < 0) { - log_error_errno(r, "Failed to get D-Bus connection: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get D-Bus connection: %m"); r = sd_bus_call_method( bus, @@ -1703,37 +1679,27 @@ static int flush_to_var(void) { mkdir_p("/run/systemd/journal", 0755); watch_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC); - if (watch_fd < 0) { - log_error("Failed to create inotify watch: %m"); - return -errno; - } + if (watch_fd < 0) + return log_error_errno(errno, "Failed to create inotify watch: %m"); r = inotify_add_watch(watch_fd, "/run/systemd/journal", IN_CREATE|IN_DONT_FOLLOW|IN_ONLYDIR); - if (r < 0) { - log_error("Failed to watch journal directory: %m"); - return -errno; - } + if (r < 0) + return log_error_errno(errno, "Failed to watch journal directory: %m"); for (;;) { if (access("/run/systemd/journal/flushed", F_OK) >= 0) break; - if (errno != ENOENT) { - log_error("Failed to check for existance of /run/systemd/journal/flushed: %m"); - return -errno; - } + if (errno != ENOENT) + return log_error_errno(errno, "Failed to check for existence of /run/systemd/journal/flushed: %m"); r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY); - if (r < 0) { - log_error_errno(r, "Failed to wait for event: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to wait for event: %m"); r = flush_fd(watch_fd); - if (r < 0) { - log_error_errno(r, "Failed to flush inotify events: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to flush inotify events: %m"); } return 0; @@ -1966,9 +1932,13 @@ int main(int argc, char *argv[]) { else r = sd_journal_previous_skip(j, 1 + !!arg_after_cursor); - if (arg_after_cursor && r < 2 && !arg_follow) + if (arg_after_cursor && r < 2) { /* We couldn't find the next entry after the cursor. */ - arg_lines = 0; + if (arg_follow) + need_seek = true; + else + arg_lines = 0; + } } else if (arg_since_set && !arg_reverse) { r = sd_journal_seek_realtime_usec(j, arg_since);