X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-uninstall.c;h=dba667c2777058a36f40a24feb1ba8252cf1ef91;hb=a855d14583b2ac2629dfac696fea788826bacc4d;hp=a919a863049af8b656cce0378b45e7f277b1fcc9;hpb=63c180a63657bc7dd55bab423ea0c2751c87310b;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-uninstall.c b/src/wgtpkg-uninstall.c
index a919a86..dba667c 100644
--- a/src/wgtpkg-uninstall.c
+++ b/src/wgtpkg-uninstall.c
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2015-2018 IoT.bzh
+ Copyright (C) 2015-2020 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -36,10 +36,12 @@
 /* uninstall the widget of idaver */
 int uninstall_widget(const char *idaver, const char *root)
 {
+#if DISTINCT_VERSIONS
 	char *id;
 	char *ver;
-	char path[PATH_MAX];
 	const char *at;
+#endif
+	char path[PATH_MAX];
 	int rc, rc2;
 	struct unitconf uconf;
 	struct wgt_info *ifo;
@@ -47,6 +49,7 @@ int uninstall_widget(const char *idaver, const char *root)
 	NOTICE("-- UNINSTALLING widget of id %s from %s --", idaver, root);
 
 	/* find the last '@' of the id */
+#if DISTINCT_VERSIONS
 	at = strrchr(idaver, '@');
 	if (at == NULL) {
 		ERROR("bad widget id '%s', no @", idaver);
@@ -58,6 +61,10 @@ int uninstall_widget(const char *idaver, const char *root)
 
 	/* compute the path */
 	rc = snprintf(path, sizeof path, "%s/%s/%s", root, id, ver);
+#else
+	rc = snprintf(path, sizeof path, "%s/%s", root, idaver);
+#endif
+
 	if (rc >= (int)sizeof path) {
 		ERROR("bad widget id '%s', too long", idaver);
 		errno = EINVAL;
@@ -72,7 +79,8 @@ int uninstall_widget(const char *idaver, const char *root)
 	}
 	uconf.installdir = path;
 	uconf.icondir = FWK_ICON_DIR;
-	uconf.port = 0;
+	uconf.new_afid = 0;
+	uconf.base_http_ports = 0;
 	unit_uninstall(ifo, &uconf);
 	wgt_info_unref(ifo);
 
@@ -90,6 +98,7 @@ int uninstall_widget(const char *idaver, const char *root)
 	if (rc < 0 && errno != ENOENT)
 		ERROR("can't remove '%s': %m", path);
 
+#if DISTINCT_VERSIONS
 	/* removes the parent directory if empty */
 	rc2 = snprintf(path, sizeof path, "%s/%s", root, id);
 	assert(rc2 < (int)sizeof path);
@@ -106,6 +115,9 @@ int uninstall_widget(const char *idaver, const char *root)
 	 * uninstall it for the security-manager
 	 */
 	rc2 = secmgr_init(id);
+#else
+	rc2 = secmgr_init(idaver);
+#endif
 	if (rc2) {
 		ERROR("can't init security manager context");
 		return -1;