X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=933e6127b2d379a43ebc7ebd61a110c5d6e50017;hb=ce714369c64051d5307ef7ac9af2c53b6edfbb4a;hp=6a4a865bf2df8eb2ae961dffcc34277ba0d0b140;hpb=e2de563d1ecb4585ce68521bd42f3ef45ac79f16;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 6a4a865..933e612 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -1,6 +1,8 @@
 /*
  Copyright 2015 IoT.bzh
 
+ author: José Bollo <jose.bollo@iot.bzh>
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -17,7 +19,6 @@
 #define _GNU_SOURCE
 
 #include <errno.h>
-#include <syslog.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
@@ -28,6 +29,7 @@
 #include "wgt.h"
 #include "wgt-info.h"
 #include "secmgr-wrap.h"
+#include "utils-dir.h"
 
 static int check_defined(const void *data, const char *name)
 {
@@ -126,7 +128,8 @@ static int install_icon(const struct wgt_desc *desc)
 	char target[PATH_MAX];
 	int rc;
 
-	rc = snprintf(link, sizeof link, "%s/%s@%s", ICONDESTDIR, desc->id, desc->version);
+	create_directory(FWK_ICON_DIR, 0755, 1);
+	rc = snprintf(link, sizeof link, "%s/%s@%s", FWK_ICON_DIR, desc->id, desc->version);
 	if (rc >= sizeof link) {
 		ERROR("link to long in install_icon");
 		errno = EINVAL;
@@ -213,14 +216,15 @@ error:
 }
 
 /* install the widget of the file */
-void install_widget(const char *wgtfile, const char *root, int force)
+int install_widget(const char *wgtfile, const char *root, int force)
 {
 	struct wgt_info *ifo;
 	const struct wgt_desc *desc;
 
-	NOTICE("-- INSTALLING widget %s --", wgtfile);
+	NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
 
 	/* workdir */
+	create_directory(root, 0755, 1);
 	if (make_workdir_base(root, "TMP", 0)) {
 		ERROR("failed to create a working directory");
 		goto error1;
@@ -249,7 +253,7 @@ void install_widget(const char *wgtfile, const char *root, int force)
 	if (install_security(desc))
 		goto error3;
 	
-	return;
+	return 0;
 
 error3:
 	wgt_info_unref(ifo);
@@ -258,6 +262,6 @@ error2:
 	remove_workdir();
 
 error1:
-	return;
+	return -1;
 }