system-controller: bail out if creating directories fails.

Change-Id: I1dd534f347d32f52bf43507b948efa60d81e2e10

diff --git a/src/plugins/system-controller/plugin-system-controller.c b/src/plugins/system-controller/plugin-system-controller.c
index 8b88d37..6231e47 100644 (file)
--- a/src/plugins/system-controller/plugin-system-controller.c
+++ b/src/plugins/system-controller/plugin-system-controller.c
@@ -743,7 +743,10 @@ static int register_lua_bindings(sysctl_t *sc)
     mrp_resclnt_scripting_init(sc->L);
     mrp_application_scripting_init(sc->L);
     mrp_wayland_scripting_init(sc->L);
-    mrp_user_scripting_init(sc->L, sc->user_config_file, sc->user_dir, sc->ctx->ml);
+
+    if (!mrp_user_scripting_init(sc->L, sc->user_config_file, sc->user_dir,
+            sc->ctx->ml))
+        return FALSE;
 
     mrp_lua_create_object_class(sc->L, SYSCTL_LUA_CLASS);
 
@@ -772,6 +775,9 @@ static int plugin_init(mrp_plugin_t *plugin)
             sc->user_dir = tzplatform_mkpath(TZ_USER_HOME, "ico");
         }
 
+        if (!sc->user_dir)
+            goto fail;
+
         if (!transport_create(sc))
             goto fail;
 

diff --git a/src/plugins/system-controller/user/user.c b/src/plugins/system-controller/user/user.c
index eba2886..9e2de98 100644 (file)
--- a/src/plugins/system-controller/user/user.c
+++ b/src/plugins/system-controller/user/user.c
@@ -1095,12 +1095,12 @@ static bool user_deinit()
     return TRUE;
 }
 
-void mrp_user_scripting_init(lua_State *L, const char *config_file,
+bool mrp_user_scripting_init(lua_State *L, const char *config_file,
         const char *lastinfo_dir, mrp_mainloop_t *ml)
 {
     MRP_UNUSED(L);
 
-    user_init(ml, config_file, lastinfo_dir);
+    return user_init(ml, config_file, lastinfo_dir);
 }
 
 void mrp_user_scripting_deinit(lua_State *L)

diff --git a/src/plugins/system-controller/user/user.h b/src/plugins/system-controller/user/user.h
index 06e72e1..5acdc7b 100644 (file)
--- a/src/plugins/system-controller/user/user.h
+++ b/src/plugins/system-controller/user/user.h
@@ -30,7 +30,7 @@
 #include <lualib.h>
 #include <murphy/common.h>
 
-void mrp_user_scripting_init(lua_State *L, const char *config_file,
+bool mrp_user_scripting_init(lua_State *L, const char *config_file,
         const char *lasinfo_dir, mrp_mainloop_t *ml);
 
 void mrp_user_scripting_deinit(lua_State *L);