Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

splash-log: Retain last message to print it if we switch out of quiet mode

Browse Source
This commit is contained in:
K. Lange 2021-10-28 06:53:55 +09:00
parent 9acb4e1594
commit dbd8c018e8
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/splash-log.c
View File

@ -124,6 +124,7 @@ int main(int argc, char * argv[]) {
hashmap_t * cmdline = get_cmdline();
int quiet = 0;
char * last_message = NULL;
clock_t start = times(NULL);
if (!hashmap_has(cmdline, "debug")) {
@ -157,10 +158,26 @@ int main(int argc, char * argv[]) {
update_message((char*)p->data + (p->data[0] == ':' ? 1 : 0));
}
if (last_message) {
free(last_message);
last_message = NULL;
}
if (quiet) {
last_message = strdup((char*)p->data + (p->data[0] == ':' ? 1 : 0));
}
free(p);
} else if (quiet && times(NULL) - start > TIMEOUT_SECS * 1000000L) {
quiet = 0;
update_message("Startup is taking a while, enabling log.");
if (last_message) {
update_message("Startup is taking a while, enabling log. Last message was:");
update_message(last_message);
free(last_message);
last_message = NULL;
} else {
update_message("Startup is taking a while, enabling log.");
}
}
}
}