picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journalctl: fix --update-catalog with not --root arg

Browse source 
grawity> `journalctl --update-catalog` from latest git prints:
         "Recursive mkdir .: Invalid argument" and
         "Failed to write : Invalid argument"
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-29 10:09:21 -04:00
parent 76877b46b6
commit 0db809489f
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/journal/journalctl.c
View file

@ -1032,11 +1032,16 @@ int main(int argc, char *argv[]) {
arg_action == ACTION_LIST_CATALOG ||
arg_action == ACTION_DUMP_CATALOG) {
char _cleanup_free_ *database;
database = strjoin(arg_root, "/", CATALOG_DATABASE, NULL);
if (!database) {
r = log_oom();
goto finish;
const char* database = CATALOG_DATABASE;
char _cleanup_free_ *copy = NULL;
if (arg_root) {
copy = strjoin(arg_root, "/", CATALOG_DATABASE, NULL);
if (!database) {
r = log_oom();
goto finish;
}
path_kill_slashes(copy);
database = copy;
}
if (arg_action == ACTION_UPDATE_CATALOG) {