X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=cbf9833184f06d852b55dc02e3315d1261eccc85;hb=08ace05beb1d09b6ebc5e9cafc2b972b39fa2437;hp=62bdcb7c68ec1ce10fcc9156dbdad1dd4602d6a7;hpb=2a7b539a82a45202c0e990c45da25ccdc487d633;p=elogind.git

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 62bdcb7c6..cbf983318 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -63,6 +63,7 @@ static bool arg_no_tail = false;
 static bool arg_quiet = false;
 static bool arg_merge = false;
 static bool arg_this_boot = false;
+static const char *arg_cursor = NULL;
 static const char *arg_directory = NULL;
 static int arg_priorities = 0xFF;
 static const char *arg_verify_key = NULL;
@@ -87,6 +88,7 @@ static int help(void) {
                "     --version           Show package version\n"
                "     --no-pager          Do not pipe output into a pager\n"
                "  -a --all               Show all fields, including long and unprintable\n"
+               "  -c --cursor=CURSOR     Jump to the specified cursor\n"
                "  -f --follow            Follow journal\n"
                "  -n --lines[=INTEGER]   Number of journal entries to show\n"
                "     --no-tail           Show all lines, even in follow mode\n"
@@ -148,6 +150,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "verify",       no_argument,       NULL, ARG_VERIFY       },
                 { "verify-key",   required_argument, NULL, ARG_VERIFY_KEY   },
                 { "disk-usage",   no_argument,       NULL, ARG_DISK_USAGE   },
+                { "cursor",       no_argument,       NULL, 'c'              },
                 { NULL,           0,                 NULL, 0                }
         };
 
@@ -156,7 +159,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hfo:an::qmbD:p:", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hfo:an::qmbD:p:c:", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -228,6 +231,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_directory = optarg;
                         break;
 
+                case 'c':
+                        arg_cursor = optarg;
+                        break;
+
                 case ARG_HEADER:
                         arg_action = ACTION_PRINT_HEADER;
                         break;
@@ -723,7 +730,6 @@ static int verify(sd_journal *j) {
 int main(int argc, char *argv[]) {
         int r;
         sd_journal *j = NULL;
-        unsigned line = 0;
         bool need_seek = false;
         sd_id128_t previous_boot_id;
         bool previous_boot_id_valid = false;
@@ -829,7 +835,16 @@ int main(int argc, char *argv[]) {
                 }
         }
 
-        if (arg_lines >= 0) {
+        if (arg_cursor) {
+                r = sd_journal_seek_cursor(j, arg_cursor);
+                if (r < 0) {
+                        log_error("Failed to seek to cursor: %s", strerror(-r));
+                        goto finish;
+                }
+
+                r = sd_journal_next(j);
+
+        } else if (arg_lines >= 0) {
                 r = sd_journal_seek_tail(j);
                 if (r < 0) {
                         log_error("Failed to seek to tail: %s", strerror(-r));
@@ -837,6 +852,7 @@ int main(int argc, char *argv[]) {
                 }
 
                 r = sd_journal_previous_skip(j, arg_lines);
+
         } else {
                 r = sd_journal_seek_head(j);
                 if (r < 0) {
@@ -887,9 +903,7 @@ int main(int argc, char *argv[]) {
                                 }
                         }
 
-                        line ++;
-
-                        r = output_journal(j, arg_output, line, 0, flags);
+                        r = output_journal(stdout, j, arg_output, 0, flags);
                         if (r < 0)
                                 goto finish;