chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket: add option for SO_PASSEC
[elogind.git]
/
src
/
journal
/
journalctl.c
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index b2ebc7a498735a5a884761eca90ab152cac46654..8db3fc92014ee428c0debc43054e14b319ab25aa 100644
(file)
--- a/
src/journal/journalctl.c
+++ b/
src/journal/journalctl.c
@@
-57,7
+57,8
@@
static int help(void) {
" -f --follow Follow journal\n"
" -n --lines=INTEGER Journal entries to show\n"
" --no-tail Show all lines, even in follow mode\n"
" -f --follow Follow journal\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, short-monotonic, verbose, export, json)\n"
+ " -o --output=STRING Change journal output mode (short, short-monotonic,\n"
+ " verbose, export, json, cat)\n"
" --new-id128 Generate a new 128 Bit id\n",
program_invocation_short_name);
" --new-id128 Generate a new 128 Bit id\n",
program_invocation_short_name);
@@
-151,7
+152,7
@@
static int parse_argv(int argc, char *argv[]) {
}
}
}
}
- if (arg_follow && !arg_no_tail)
+ if (arg_follow && !arg_no_tail
&& arg_lines < 0
)
arg_lines = 10;
return 1;
arg_lines = 10;
return 1;
@@
-281,7
+282,7
@@
int main(int argc, char *argv[]) {
if (!arg_follow)
break;
if (!arg_follow)
break;
- r = fd_wait_for_event(fd, POLLIN);
+ r = fd_wait_for_event(fd, POLLIN
, (usec_t) -1
);
if (r < 0) {
log_error("Couldn't wait for event: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("Couldn't wait for event: %s", strerror(-r));
goto finish;