From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Oct 2012 20:55:12 +0000 (+0200)
Subject: journalctl: honour -n if -F is used
X-Git-Tag: v195~54
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fd6e88753716d8136037277c7db2196e0f979675;hp=0902aa1838ecf3b252ab0d02842ce4f9c1cab58d

journalctl: honour -n if -F is used
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5980eb0b4..7564c48e1 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -926,11 +926,16 @@ int main(int argc, char *argv[]) {
                 SD_JOURNAL_FOREACH_UNIQUE(j, data, size) {
                         const void *eq;
 
+                        if (arg_lines > 0 && n_shown >= arg_lines)
+                                break;
+
                         eq = memchr(data, '=', size);
                         if (eq)
                                 printf("%.*s\n", (int) (size - ((const uint8_t*) eq - (const uint8_t*) data + 1)), (const char*) eq + 1);
                         else
                                 printf("%.*s\n", (int) size, (const char*) data);
+
+                        n_shown ++;
                 }
 
                 r = 0;