shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

Merge pull request #1548 from evverx/journalctl-catalog-ops-fixes

Browse Source 
Fix journalctl --dump-catalog, journalctl --list-catalog
This commit is contained in:
Lennart Poettering 2015-10-13 19:23:54 +02:00
commit e88a5a5bde
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/journal/journalctl.c
View File

@ -746,7 +746,7 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
if (arg_action != ACTION_SHOW && optind < argc) {
if (!IN_SET(arg_action, ACTION_SHOW, ACTION_DUMP_CATALOG, ACTION_LIST_CATALOG) && optind < argc) {
log_error("Extraneous arguments starting with '%s'", argv[optind]);
return -EINVAL;
}
@ -1877,6 +1877,7 @@ int main(int argc, char *argv[]) {
} else {
bool oneline = arg_action == ACTION_LIST_CATALOG;
pager_open_if_enabled();
if (optind < argc)
r = catalog_list_items(stdout, database,
oneline, argv + optind);