journalctl: fix counting of -n parameter

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

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index fc1fed277c4df6a0921b2be11f5d9125ad43097e..0e1fb66de6da8a5aa49af56369dbb4d6cf6d3cc7 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -148,6 +148,7 @@ int main(int argc, char *argv[]) {
         int r, i, fd;
         sd_journal *j = NULL;
         unsigned line = 0;
         int r, i, fd;
         sd_journal *j = NULL;
         unsigned line = 0;

+        bool need_seek = false;

 
         log_parse_environment();
         log_open();
 
         log_parse_environment();
         log_open();


@@ -184,16 +185,19 @@ int main(int argc, char *argv[]) {
                 }
 
                 r = sd_journal_previous_skip(j, arg_lines);
                 }
 
                 r = sd_journal_previous_skip(j, arg_lines);

-                if (r < 0) {
-                        log_error("Failed to iterate through journal: %s", strerror(-r));
-                        goto finish;
-                }

         } else {
                 r = sd_journal_seek_head(j);
                 if (r < 0) {
                         log_error("Failed to seek to head: %s", strerror(-r));
                         goto finish;
                 }
         } 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 iterate through journal: %s", strerror(-r));
+                goto finish;

         }
 
         if (!arg_no_pager && !arg_follow) {
         }
 
         if (!arg_no_pager && !arg_follow) {


@@ -210,11 +214,12 @@ int main(int argc, char *argv[]) {
                 struct pollfd pollfd;
 
                 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)
                         }
 
                         if (r == 0)


@@ -225,6 +230,8 @@ int main(int argc, char *argv[]) {
                         r = output_journal(j, arg_output, line, arg_show_all);
                         if (r < 0)
                                 goto finish;
                         r = output_journal(j, arg_output, line, arg_show_all);
                         if (r < 0)
                                 goto finish;

+
+                        need_seek = true;

                 }
 
                 if (!arg_follow)
                 }
 
                 if (!arg_follow)