Complain when livecoredumper is needed and not installed

This brings back functionality dropped in 22a0cccdad ("Simplify
struct crash_info setup").

Change-Id: If5ddddee6b99784d7ada9a93e89d3ad975facb6b

diff --git a/src/crash-manager/crash-manager.c b/src/crash-manager/crash-manager.c
index d8060da..f075ca6 100644 (file)
--- a/src/crash-manager/crash-manager.c
+++ b/src/crash-manager/crash-manager.c
@@ -85,6 +85,11 @@ config_t config;
 static char* crash_dump_path;
 static char* crash_temp_path;
 
+bool have_livecoredumper(void)
+{
+       return access(LIVEDUMPER_BIN_PATH, X_OK) == 0;
+}
+
 /* pkgmgrinfo filter list function for getting application ID */
 static int appinfo_get_appid_func(pkgmgrinfo_appinfo_h handle,
                void *user_data)

diff --git a/src/crash-manager/crash-manager.h b/src/crash-manager/crash-manager.h
index 7e284e8..6051f82 100644 (file)
--- a/src/crash-manager/crash-manager.h
+++ b/src/crash-manager/crash-manager.h
@@ -54,4 +54,6 @@ bool crash_manager_direct(struct crash_info *cinfo);
 bool crash_manager_livedump_pid(pid_t pid, const char *dump_reason, char *report_path, size_t report_path_len);
 void crash_info_init(struct crash_info *cinfo);
 void crash_manager_free(struct crash_info *cinfo);
+
+bool have_livecoredumper(void);
 #endif

diff --git a/src/crash-manager/main.c b/src/crash-manager/main.c
index 0b34d3b..26b8e95 100644 (file)
--- a/src/crash-manager/main.c
+++ b/src/crash-manager/main.c
@@ -113,6 +113,11 @@ static bool parse_args(struct crash_info *cinfo, int argc, char *argv[])
                }
        }
 
+       if (cinfo->livedump && !have_livecoredumper()) {
+               printf("livecoredumper not available - can not perform livedump.\n");
+               return false;
+       }
+
        if (!pid_set || (!cinfo->livedump && (!gid_set || !uid_set || !sig_set))) {
                printf("Not enough parameters.\n\n");
                print_help(argv[0]);

diff --git a/src/crash-service/crash-service.c b/src/crash-service/crash-service.c
index 7b0a798..0917fcb 100644 (file)
--- a/src/crash-service/crash-service.c
+++ b/src/crash-service/crash-service.c
@@ -315,6 +315,11 @@ static bool dbus_init(void)
 
 int main(void)
 {
+       if (!have_livecoredumper()) {
+               _E("livecoredumper not available - can not provide livedump API. Terminating.\n");
+               return EXIT_FAILURE;
+       }
+
        loop = g_main_loop_new(NULL, false);
 
        if (!dbus_init()) {