summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-05-28 15:06:33 -0400
committerScott Murray <scott.murray@konsulko.com>2020-05-28 15:24:50 -0400
commitf8cee78b734acf4636d134afa3f81ddcc06241e6 (patch)
tree4fa5b2639936c8c6e6f04ad6642b98b8ebc39c34
parentf8f2338aba84394e132fff55b6ebdef7d884292b (diff)
Fix uninstall of widgets without icons
Trying to uninstall a widget without an icon would remove the widget files, but report an error, and the widget would not be removed from the database until a reboot, preventing installation of a new version. To fix this, the error handling in uninstall_widget has been reworked to only explicitly return an error when the unlink of the icon file fails for reasons other than the file not being present. This then allows some code cleanup by removing the extra rc2 variable and fixing some error checks where rc and rc2 were being mixed. Bug-AGL: SPEC-3401 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ica4a91f41b2bd9e16e16dee4ce660f6fa1f7840b
-rw-r--r--src/wgtpkg-uninstall.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/wgtpkg-uninstall.c b/src/wgtpkg-uninstall.c
index dba667c..41bc693 100644
--- a/src/wgtpkg-uninstall.c
+++ b/src/wgtpkg-uninstall.c
@@ -1,5 +1,6 @@
/*
Copyright (C) 2015-2020 IoT.bzh
+ Copyright (C) 2020 Konsulko Group
author: José Bollo <jose.bollo@iot.bzh>
@@ -42,7 +43,7 @@ int uninstall_widget(const char *idaver, const char *root)
const char *at;
#endif
char path[PATH_MAX];
- int rc, rc2;
+ int rc;
struct unitconf uconf;
struct wgt_info *ifo;
@@ -95,14 +96,16 @@ int uninstall_widget(const char *idaver, const char *root)
rc = snprintf(path, sizeof path, "%s/%s", FWK_ICON_DIR, idaver);
assert(rc < (int)sizeof path);
rc = unlink(path);
- if (rc < 0 && errno != ENOENT)
+ if (rc < 0 && errno != ENOENT) {
ERROR("can't remove '%s': %m", path);
+ return -1;
+ }
#if DISTINCT_VERSIONS
/* removes the parent directory if empty */
- rc2 = snprintf(path, sizeof path, "%s/%s", root, id);
- assert(rc2 < (int)sizeof path);
- rc2 = rmdir(path);
+ rc = snprintf(path, sizeof path, "%s/%s", root, id);
+ assert(rc < (int)sizeof path);
+ rc = rmdir(path);
if (rc < 0 && errno == ENOTEMPTY)
return rc;
if (rc < 0) {
@@ -114,19 +117,18 @@ int uninstall_widget(const char *idaver, const char *root)
* parent directory removed: last occurrence of the application
* uninstall it for the security-manager
*/
- rc2 = secmgr_init(id);
+ rc = secmgr_init(id);
#else
- rc2 = secmgr_init(idaver);
+ rc = secmgr_init(idaver);
#endif
- if (rc2) {
+ if (rc) {
ERROR("can't init security manager context");
return -1;
}
- rc2 = secmgr_uninstall();
- if (rc2) {
+ rc = secmgr_uninstall();
+ if (rc) {
ERROR("can't uninstall security manager context");
return -1;
}
- return rc;
+ return 0;
}
-