#include <time.h>
#include <getopt.h>
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
#include "log.h"
#include "util.h"
#include "build.h"
#include "pager.h"
#include "logs-show.h"
-static output_mode arg_output = OUTPUT_SHORT;
-
+static OutputMode arg_output = OUTPUT_SHORT;
static bool arg_follow = false;
static bool arg_show_all = false;
static bool arg_no_pager = false;
static int arg_lines = -1;
+static bool arg_no_tail = false;
static int help(void) {
printf("%s [OPTIONS...] {COMMAND} ...\n\n"
- "Send control commands to or query the login manager.\n\n"
+ "Send control commands to or query the journal.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" -a --all Show all properties, including long and unprintable\n"
" -f --follow Follow journal\n"
- " -n --lines=INTEGER Lines to show\n"
- " -o --output=STRING Change output mode (short, verbose, export, json)\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, verbose, export, json)\n",
program_invocation_short_name);
return 0;
enum {
ARG_VERSION = 0x100,
- ARG_NO_PAGER
+ ARG_NO_PAGER,
+ ARG_NO_TAIL
};
static const struct option options[] = {
{ "output", required_argument, NULL, 'o' },
{ "all", no_argument, NULL, 'a' },
{ "lines", required_argument, NULL, 'n' },
+ { "no-tail", no_argument, NULL, ARG_NO_TAIL },
{ NULL, 0, NULL, 0 }
};
break;
case 'o':
- if (streq(optarg, "short"))
- arg_output = OUTPUT_SHORT;
- else if (streq(optarg, "verbose"))
- arg_output = OUTPUT_VERBOSE;
- else if (streq(optarg, "export"))
- arg_output = OUTPUT_EXPORT;
- else if (streq(optarg, "json"))
- arg_output = OUTPUT_JSON;
- else {
+ arg_output = output_mode_from_string(optarg);
+ if (arg_output < 0) {
log_error("Unknown output '%s'.", optarg);
return -EINVAL;
}
+
break;
case 'a':
case 'n':
r = safe_atoi(optarg, &arg_lines);
- if (r < 0) {
+ if (r < 0 || arg_lines < 0) {
log_error("Failed to parse lines '%s'", optarg);
return -EINVAL;
}
break;
+ case ARG_NO_TAIL:
+ arg_no_tail = true;
+ break;
+
case '?':
return -EINVAL;
}
}
+ if (arg_follow && !arg_no_tail)
+ arg_lines = 10;
+
return 1;
}
}
for (;;) {
- struct pollfd pollfd;
-
for (;;) {
if (need_seek) {
r = sd_journal_next(j);
if (!arg_follow)
break;
- zero(pollfd);
- pollfd.fd = fd;
- pollfd.events = POLLIN;
-
- if (poll(&pollfd, 1, -1) < 0) {
- if (errno == EINTR)
- break;
-
- log_error("poll(): %m");
- r = -errno;
+ r = fd_wait_for_event(fd, POLLIN);
+ if (r < 0) {
+ log_error("Couldn't wait for event: %s", strerror(-r));
goto finish;
}