X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=b3e4603f0e75aab29a24ded2ac79ee19edfbc681;hb=c0fc18e47e49dd4e3cc2f09452a19297dad63f9c;hp=37a47ffbcd5ce54a3ad196fffab2182265f7912d;hpb=12a227a2fc574cf0fd560453e1cdd15c50550abb;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 37a47ff..b3e4603 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,12 +29,13 @@
 #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)
 {
 	if (data)
 		return 0;
-	syslog(LOG_ERR, "widget has no defined '%s' (temporary constraints)", name);
+	ERROR("widget has no defined '%s' (temporary constraints)", name);
 	errno = EINVAL;
 	return -1;
 }
@@ -49,7 +51,7 @@ static int check_valid_string(const char *value, const char *name)
 	c = value[pos];
 	while(c) {
 		if (!isalnum(c) && !strchr(".-_", c)) {
-			syslog(LOG_ERR, "forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
+			ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
 			errno = EINVAL;
 			return -1;			
 		}
@@ -67,7 +69,7 @@ static int check_temporary_constraints(const struct wgt_desc *desc)
 	if (result)
 		return result;
 	if (desc->icons->next) {
-		syslog(LOG_ERR, "widget has more than one icon defined (temporary constraints)");
+		ERROR("widget has more than one icon defined (temporary constraints)");
 		errno = EINVAL;
 		result = -1;
 	}
@@ -78,13 +80,13 @@ static int check_permissions(const char *name, int required)
 {
 	if (permission_exists(name)) {
 		if (request_permission(name)) {
-			debug("granted permission: %s", name);
+			DEBUG("granted permission: %s", name);
 		} else if (required) {
-			syslog(LOG_ERR, "ungranted permission required: %s", name);
+			ERROR("ungranted permission required: %s", name);
 			errno = EPERM;
 			return 0;
 		} else {
-			notice("ungranted permission optional: %s", name);
+			INFO("ungranted permission optional: %s", name);
 		}
 	}
 	return 1;
@@ -112,7 +114,7 @@ static int move_widget(const char *root, const struct wgt_desc *desc, int force)
 
 	rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->version);
 	if (rc >= sizeof newdir) {
-		syslog(LOG_ERR, "path to long in move_widget");
+		ERROR("path to long in move_widget");
 		errno = EINVAL;
 		return -1;
 	}
@@ -126,16 +128,17 @@ 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) {
-		syslog(LOG_ERR, "link to long in install_icon");
+		ERROR("link to long in install_icon");
 		errno = EINVAL;
 		return -1;
 	}
 
 	rc = snprintf(target, sizeof target, "%s/%s", workdir, desc->icons->src);
 	if (rc >= sizeof target) {
-		syslog(LOG_ERR, "target to long in install_icon");
+		ERROR("target to long in install_icon");
 		errno = EINVAL;
 		return -1;
 	}
@@ -143,7 +146,7 @@ static int install_icon(const struct wgt_desc *desc)
 	unlink(link);
 	rc = symlink(target, link);
 	if (rc)
-		syslog(LOG_ERR, "can't create link %s -> %s", link, target);
+		ERROR("can't create link %s -> %s", link, target);
 	return rc;
 }
 
@@ -168,7 +171,7 @@ static int install_security(const struct wgt_desc *desc)
 	assert(sizeof path > (head - path));
 	len = (int)(sizeof path - (head - path));
 	if (!len) {
-		syslog(LOG_ERR, "root path too long in install_security");
+		ERROR("root path too long in install_security");
 		errno = ENAMETOOLONG;
 		goto error2;
 	}
@@ -182,7 +185,7 @@ static int install_security(const struct wgt_desc *desc)
 		f = file_of_index(i++);
 		lf = (int)strlen(f->name);
 		if (lf >= len) {
-			syslog(LOG_ERR, "path too long in install_security");
+			ERROR("path too long in install_security");
 			errno = ENAMETOOLONG;
 			goto error2;
 		}
@@ -218,11 +221,12 @@ void 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 --", wgtfile);
 
 	/* workdir */
+	create_directory(root, 0755, 1);
 	if (make_workdir_base(root, "TMP", 0)) {
-		syslog(LOG_ERR, "failed to create a working directory");
+		ERROR("failed to create a working directory");
 		goto error1;
 	}