chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd: added new dependency PartOf
[elogind.git]
/
src
/
journal
/
journalctl.c
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index 0d37107874f262f41b128e48a04e689a4fb8d431..a9cf9cd957445441b045b345b3ca22a89e1a74f5 100644
(file)
--- a/
src/journal/journalctl.c
+++ b/
src/journal/journalctl.c
@@
-256,7
+256,7
@@
static int add_matches(sd_journal *j, char **args) {
t = strappend("_EXE=", path);
if (!t) {
free(p);
t = strappend("_EXE=", path);
if (!t) {
free(p);
- log_error("Out of memory");
+ log_error("Out of memory
.
");
return -ENOMEM;
}
return -ENOMEM;
}
@@
-312,6
+312,7
@@
int main(int argc, char *argv[]) {
bool need_seek = false;
sd_id128_t previous_boot_id;
bool previous_boot_id_valid = false;
bool need_seek = false;
sd_id128_t previous_boot_id;
bool previous_boot_id_valid = false;
+ bool have_pager;
log_parse_environment();
log_open();
log_parse_environment();
log_open();
@@
-397,10
+398,7
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- if (!arg_no_pager && !arg_follow) {
- columns();
- pager_open();
- }
+ have_pager = !arg_no_pager && !arg_follow && pager_open();
if (arg_output == OUTPUT_JSON) {
fputc('[', stdout);
if (arg_output == OUTPUT_JSON) {
fputc('[', stdout);
@@
-410,6
+408,8
@@
int main(int argc, char *argv[]) {
for (;;) {
for (;;) {
sd_id128_t boot_id;
for (;;) {
for (;;) {
sd_id128_t boot_id;
+ int flags = (arg_show_all*OUTPUT_SHOW_ALL |
+ have_pager*OUTPUT_FULL_WIDTH);
if (need_seek) {
r = sd_journal_next(j);
if (need_seek) {
r = sd_journal_next(j);
@@
-434,7
+434,7
@@
int main(int argc, char *argv[]) {
line ++;
line ++;
- r = output_journal(j, arg_output, line, 0,
arg_show_all
);
+ r = output_journal(j, arg_output, line, 0,
flags
);
if (r < 0)
goto finish;
if (r < 0)
goto finish;