return true;
}
-static int output_short(sd_journal *j, unsigned line, bool show_all, bool monotonic_mode) {
+static int output_short(sd_journal *j, unsigned line, unsigned n_columns, bool show_all, bool monotonic_mode) {
int r;
const void *data;
size_t length;
} else if (comm && shall_print(show_all, comm, comm_len)) {
printf(" %.*s", (int) comm_len, comm);
n += comm_len + 1;
- }
+ } else
+ putchar(' ');
if (pid && shall_print(show_all, pid, pid_len)) {
printf("[%.*s]", (int) pid_len, pid);
if (show_all)
printf(": %.*s\n", (int) message_len, message);
- else if (contains_unprintable(message, message_len))
- fputs(": [blob data]\n", stdout);
- else if (message_len + n < columns())
+ else if (contains_unprintable(message, message_len)) {
+ char bytes[FORMAT_BYTES_MAX];
+ printf(": [%s blob data]\n", format_bytes(bytes, sizeof(bytes), message_len));
+ } else if (message_len + n < n_columns)
printf(": %.*s\n", (int) message_len, message);
- else if (n < columns()) {
+ else if (n < n_columns) {
char *e;
- e = ellipsize_mem(message, message_len, columns() - n - 2, 90);
+ e = ellipsize_mem(message, message_len, n_columns - n - 2, 90);
if (!e)
printf(": %.*s\n", (int) message_len, message);
return r;
}
-static int output_short_realtime(sd_journal *j, unsigned line, bool show_all) {
- return output_short(j, line, show_all, false);
+static int output_short_realtime(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
+ return output_short(j, line, n_columns, show_all, false);
}
-static int output_short_monotonic(sd_journal *j, unsigned line, bool show_all) {
- return output_short(j, line, show_all, true);
+static int output_short_monotonic(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
+ return output_short(j, line, n_columns, show_all, true);
}
-static int output_verbose(sd_journal *j, unsigned line, bool show_all) {
+static int output_verbose(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
const void *data;
size_t length;
char *cursor;
if (!show_all && (length > PRINT_THRESHOLD ||
contains_unprintable(data, length))) {
const char *c;
+ char bytes[FORMAT_BYTES_MAX];
c = memchr(data, '=', length);
if (!c) {
return -EINVAL;
}
- printf("\t%.*s=[blob data]\n",
+ printf("\t%.*s=[%s blob data]\n",
(int) (c - (const char*) data),
- (const char*) data);
+ (const char*) data,
+ format_bytes(bytes, sizeof(bytes), length - (c - (const char *) data) - 1));
} else
printf("\t%.*s\n", (int) length, (const char*) data);
}
return 0;
}
-static int output_export(sd_journal *j, unsigned line, bool show_all) {
+static int output_export(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
sd_id128_t boot_id;
char sid[33];
int r;
return r;
}
- printf(".cursor=%s\n"
- ".realtime=%llu\n"
- ".monotonic=%llu\n"
- ".boot_id=%s\n",
+ printf("__CURSOR=%s\n"
+ "__REALTIME_TIMESTAMP=%llu\n"
+ "__MONOTONIC_TIMESTAMP=%llu\n"
+ "_BOOT_ID=%s\n",
cursor,
(unsigned long long) realtime,
(unsigned long long) monotonic,
SD_JOURNAL_FOREACH_DATA(j, data, length) {
+ /* We already printed the boot id, from the data in
+ * the header, hence let's suppress it here */
+ if (length >= 9 &&
+ memcmp(data, "_BOOT_ID=", 9) == 0)
+ continue;
+
if (contains_unprintable(data, length)) {
const char *c;
uint64_t le64;
}
}
-static int output_json(sd_journal *j, unsigned line, bool show_all) {
+static int output_json(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
uint64_t realtime, monotonic;
char *cursor;
const void *data;
fputs(",\n", stdout);
printf("{\n"
- "\t\".cursor\" : \"%s\",\n"
- "\t\".realtime\" : %llu,\n"
- "\t\".monotonic\" : %llu,\n"
- "\t\".boot_id\" : \"%s\"",
+ "\t\"__CURSOR\" : \"%s\",\n"
+ "\t\"__REALTIME_TIMESTAMP\" : \"%llu\",\n"
+ "\t\"__MONOTONIC_TIMESTAMP\" : \"%llu\",\n"
+ "\t\"_BOOT_ID\" : \"%s\"",
cursor,
(unsigned long long) realtime,
(unsigned long long) monotonic,
SD_JOURNAL_FOREACH_DATA(j, data, length) {
const char *c;
+ /* We already printed the boot id, from the data in
+ * the header, hence let's suppress it here */
+ if (length >= 9 &&
+ memcmp(data, "_BOOT_ID=", 9) == 0)
+ continue;
+
c = memchr(data, '=', length);
if (!c) {
log_error("Invalid field.");
return 0;
}
-static int output_cat(sd_journal *j, unsigned line, bool show_all) {
+static int output_cat(sd_journal *j, unsigned line, unsigned n_columns, bool show_all) {
const void *data;
size_t l;
int r;
return 0;
}
-static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, bool show_all) = {
+static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, unsigned n_columns, bool show_all) = {
[OUTPUT_SHORT] = output_short_realtime,
[OUTPUT_SHORT_MONOTONIC] = output_short_monotonic,
[OUTPUT_VERBOSE] = output_verbose,
[OUTPUT_CAT] = output_cat
};
-int output_journal(sd_journal *j, OutputMode mode, unsigned line, bool show_all) {
+int output_journal(sd_journal *j, OutputMode mode, unsigned line, unsigned n_columns, bool show_all) {
assert(mode >= 0);
assert(mode < _OUTPUT_MODE_MAX);
- return output_funcs[mode](j, line, show_all);
+ if (n_columns <= 0)
+ n_columns = columns();
+
+ return output_funcs[mode](j, line, n_columns, show_all);
}
int show_journal_by_unit(
const char *unit,
OutputMode mode,
- const char *prefix,
unsigned n_columns,
usec_t not_before,
unsigned how_many,
if (how_many <= 0)
return 0;
- if (n_columns <= 0)
- n_columns = columns();
-
- if (!prefix)
- prefix = "";
-
if (asprintf(&m, "_SYSTEMD_UNIT=%s", unit) < 0) {
r = -ENOMEM;
goto finish;
line ++;
- r = output_journal(j, mode, line, show_all);
+ r = output_journal(j, mode, line, n_columns, show_all);
if (r < 0)
goto finish;
}
if (!follow)
break;
- r = fd_wait_for_event(fd, POLLIN);
+ r = fd_wait_for_event(fd, POLLIN, (usec_t) -1);
if (r < 0)
goto finish;