X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=31ef7c4eb4547b96d61393f06112756438e85252;hb=bceaf2cc403176fd808d4e00be893671be3f4bb0;hp=9642c936abed98d8a4f92bab9ebd264e68047d16;hpb=63c180a63657bc7dd55bab423ea0c2751c87310b;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 9642c93..31ef7c4 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -40,6 +40,7 @@
 #include "wgtpkg-permissions.h"
 #include "wgtpkg-digsig.h"
 #include "wgtpkg-install.h"
+#include "wgtpkg-uninstall.h"
 #include "secmgr-wrap.h"
 #include "utils-dir.h"
 #include "wgtpkg-unit.h"
@@ -168,13 +169,13 @@ static int check_valid_string(const char *value, const char *name)
 	if (c == 0) {
 		ERROR("empty string forbidden in '%s' (temporary constraints)", name);
 		errno = EINVAL;
-		return -1;			
+		return -1;
 	}
 	do {
 		if (!isalnum(c) && !strchr(".-_", c)) {
 			ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
 			errno = EINVAL;
-			return -1;			
+			return -1;
 		}
 		c = value[++pos];
 	} while(c);
@@ -458,7 +459,7 @@ static int install_security(const struct wgt_desc *desc)
 	len--;
 	*head++ = '/';
 	icon = desc->icons ? desc->icons->src : NULL;
-	lic = (unsigned)strlen(icon);
+	lic = (unsigned)(icon ? strlen(icon) : 0);
 	n = file_count();
 	i = 0;
 	while(i < n) {
@@ -502,7 +503,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	struct wgt_info *ifo;
 	const struct wgt_desc *desc;
 	char installdir[PATH_MAX];
-	int port;
+	int port, err;
 	struct unitconf uconf;
 
 	NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
@@ -517,7 +518,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	if (zread(wgtfile, 0))
 		goto error2;
 
-	if (check_all_signatures())
+	if (check_all_signatures(DEFAULT_ALLOW_NO_SIGNATURE))
 		goto error2;
 
 	ifo = wgt_info_createat(workdirfd, NULL, 1, 1, 1);
@@ -532,6 +533,16 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
 	if (get_target_directory(installdir, root, desc))
 		goto error3;
 
+	if (access(installdir, F_OK) == 0) {
+		if (!force) {
+			ERROR("widget already installed");
+			errno = EEXIST;
+			goto error3;
+		}
+		if (uninstall_widget(desc->idaver, root))
+			goto error3;
+	}
+
 	if (move_widget_to(installdir, force))
 		goto error3;
 
@@ -567,7 +578,9 @@ error3:
 	wgt_info_unref(ifo);
 
 error2:
+	err = errno;
 	remove_workdir();
+	errno = err;
 
 error1:
 	file_reset();