build-sys: move public header files into a dir of their own

[elogind.git] / src / journal / journalctl.c

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 4c20ff66a89eaaa4135ac3540b3d69d0f9647487..2e708e959be1d8e73e2e545b16c61984bb6af2eb 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -30,30 +30,33 @@
 #include <time.h>
 #include <getopt.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "log.h"
 #include "util.h"
 #include "build.h"
 #include "pager.h"
 #include "logs-show.h"
 
-static output_mode arg_output = OUTPUT_SHORT;
-
+static OutputMode arg_output = OUTPUT_SHORT;
 static bool arg_follow = false;
 static bool arg_show_all = false;
 static bool arg_no_pager = false;
-
+static int arg_lines = -1;
+static bool arg_no_tail = false;
 
 static int help(void) {
 
         printf("%s [OPTIONS...] {COMMAND} ...\n\n"
-               "Send control commands to or query the login manager.\n\n"
+               "Send control commands to or query the journal.\n\n"
                "  -h --help           Show this help\n"
                "     --version        Show package version\n"
                "     --no-pager       Do not pipe output into a pager\n"
                "  -a --all            Show all properties, including long and unprintable\n"
                "  -f --follow         Follow journal\n"
-               "  -o --output=STRING  Change output mode (short, verbose, export, json)\n",
+               "  -n --lines=INTEGER  Journal entries to show\n"
+               "     --no-tail        Show all lines, even in follow mode\n"
+               "  -o --output=STRING  Change journal output mode (short, verbose, export, json)\n",
                program_invocation_short_name);
 
         return 0;
@@ -63,7 +66,8 @@ static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_VERSION = 0x100,
-                ARG_NO_PAGER
+                ARG_NO_PAGER,
+                ARG_NO_TAIL
         };
 
         static const struct option options[] = {
@@ -73,15 +77,17 @@ static int parse_argv(int argc, char *argv[]) {
                 { "follow",    no_argument,       NULL, 'f'           },
                 { "output",    required_argument, NULL, 'o'           },
                 { "all",       no_argument,       NULL, 'a'           },
+                { "lines",     required_argument, NULL, 'n'           },
+                { "no-tail",   no_argument,       NULL, ARG_NO_TAIL   },
                 { NULL,        0,                 NULL, 0             }
         };
 
-        int c;
+        int c, r;
 
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hfo:a", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -104,24 +110,30 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'o':
-                        if (streq(optarg, "short"))
-                                arg_output = OUTPUT_SHORT;
-                        else if (streq(optarg, "verbose"))
-                                arg_output = OUTPUT_VERBOSE;
-                        else if (streq(optarg, "export"))
-                                arg_output = OUTPUT_EXPORT;
-                        else if (streq(optarg, "json"))
-                                arg_output = OUTPUT_JSON;
-                        else {
+                        arg_output =  output_mode_from_string(optarg);
+                        if (arg_output < 0) {
                                 log_error("Unknown output '%s'.", optarg);
                                 return -EINVAL;
                         }
+
                         break;
 
                 case 'a':
                         arg_show_all = true;
                         break;
 
+                case 'n':
+                        r = safe_atoi(optarg, &arg_lines);
+                        if (r < 0 || arg_lines < 0) {
+                                log_error("Failed to parse lines '%s'", optarg);
+                                return -EINVAL;
+                        }
+                        break;
+
+                case ARG_NO_TAIL:
+                        arg_no_tail = true;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -131,6 +143,9 @@ static int parse_argv(int argc, char *argv[]) {
                 }
         }
 
+        if (arg_follow && !arg_no_tail)
+                arg_lines = 10;
+
         return 1;
 }
 
@@ -138,6 +153,7 @@ int main(int argc, char *argv[]) {
         int r, i, fd;
         sd_journal *j = NULL;
         unsigned line = 0;
+        bool need_seek = false;
 
         log_parse_environment();
         log_open();
@@ -166,9 +182,26 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = sd_journal_seek_head(j);
+        if (arg_lines >= 0) {
+                r = sd_journal_seek_tail(j);
+                if (r < 0) {
+                        log_error("Failed to seek to tail: %s", strerror(-r));
+                        goto finish;
+                }
+
+                r = sd_journal_previous_skip(j, arg_lines);
+        } else {
+                r = sd_journal_seek_head(j);
+                if (r < 0) {
+                        log_error("Failed to seek to head: %s", strerror(-r));
+                        goto finish;
+                }
+
+                r = sd_journal_next(j);
+        }
+
         if (r < 0) {
-                log_error("Failed to seek to head: %s", strerror(-r));
+                log_error("Failed to iterate through journal: %s", strerror(-r));
                 goto finish;
         }
 
@@ -183,14 +216,13 @@ int main(int argc, char *argv[]) {
         }
 
         for (;;) {
-                struct pollfd pollfd;
-
                 for (;;) {
-                        r = sd_journal_next(j);
-
-                        if (r < 0) {
-                                log_error("Failed to iterate through journal: %s", strerror(-r));
-                                goto finish;
+                        if (need_seek) {
+                                r = sd_journal_next(j);
+                                if (r < 0) {
+                                        log_error("Failed to iterate through journal: %s", strerror(-r));
+                                        goto finish;
+                                }
                         }
 
                         if (r == 0)
@@ -201,21 +233,16 @@ int main(int argc, char *argv[]) {
                         r = output_journal(j, arg_output, line, arg_show_all);
                         if (r < 0)
                                 goto finish;
+
+                        need_seek = true;
                 }
 
                 if (!arg_follow)
                         break;
 
-                zero(pollfd);
-                pollfd.fd = fd;
-                pollfd.events = POLLIN;
-
-                if (poll(&pollfd, 1, -1) < 0) {
-                        if (errno == EINTR)
-                                break;
-
-                        log_error("poll(): %m");
-                        r = -errno;
+                r = fd_wait_for_event(fd, POLLIN);
+                if (r < 0) {
+                        log_error("Couldn't wait for event: %s", strerror(-r));
                         goto finish;
                 }