Officially declare war on LHFS

[citadel.git] / appimage / ctdlvisor.c

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index d08b63607381c1d90bf53829629cec54f02395ee..041d1a52c552c16cda1a97866134d1b5d431a5aa 100644 (file)
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -71,7 +71,15 @@ void signal_handler(int signal) {
                else {
                        what_exited = "unknown";
                }
-               fprintf(stderr, "ctdlvisor: pid=%d (%s) exited, status=%d, exitcode=%d\n", who_exited, what_exited, status, WEXITSTATUS(status));
+               if (WIFEXITED(status)) {
+                       fprintf(stderr, "ctdlvisor: %d (%s) exited, exitcode=%d\n", who_exited, what_exited, WEXITSTATUS(status));
+               }
+               else if (WIFSIGNALED(status)) {
+                       fprintf(stderr, "ctdlvisor: %d (%s) crashed, signal=%d\n", who_exited, what_exited, WTERMSIG(status));
+               }
+               else {
+                       fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status);
+               }
        } while (who_exited >= 0);
 
        ctdlvisor_exit(0);
@@ -99,7 +107,7 @@ pid_t start_citadel() {
        sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR"));
        pid_t pid = fork();
        if (pid == 0) {
-               fprintf(stderr, "ctdlvisor: executing %s\n", bin);
+               fprintf(stderr, "ctdlvisor: executing %s with data directory %s\n", bin, getenv("CTDL_DIR"));
                detach_from_tty();
                execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), NULL);
                exit(errno);