X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=0619b256b9598a6685eb7205126d4eb7abbd9e90;hb=020d59000f86b3d98be763eaee6a2671f0427e46;hp=d406daeae99d6fecca6d3c942d108e424e9da213;hpb=73e231abde39f22097df50542c745e01de879836;p=elogind.git

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index d406daeae..0619b256b 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -658,6 +658,11 @@ static int parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
+        if (arg_action != ACTION_SHOW && optind < argc) {
+                log_error("Extraneous arguments starting with '%s'", argv[optind]);
+                return -EINVAL;
+        }
+
         return 1;
 }
 
@@ -1651,7 +1656,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (arg_action == ACTION_DISK_USAGE) {
-                uint64_t bytes;
+                uint64_t bytes = 0;
                 char sbytes[FORMAT_BYTES_MAX];
 
                 r = sd_journal_get_usage(j, &bytes);