Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix uninstall of widgets without icons
[src/app-framework-main.git]
/
src
/
wgtpkg-uninstall.c
diff --git
a/src/wgtpkg-uninstall.c
b/src/wgtpkg-uninstall.c
index
6156c0a
..
4fd7979
100644
(file)
--- a/
src/wgtpkg-uninstall.c
+++ b/
src/wgtpkg-uninstall.c
@@
-1,5
+1,6
@@
/*
/*
- Copyright 2015, 2016, 2017 IoT.bzh
+ Copyright (C) 2015-2020 IoT.bzh
+ Copyright (C) 2020 Konsulko Group
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-40,7
+41,7
@@
int uninstall_widget(const char *idaver, const char *root)
char *ver;
char path[PATH_MAX];
const char *at;
char *ver;
char path[PATH_MAX];
const char *at;
- int rc
, rc2
;
+ int rc;
struct unitconf uconf;
struct wgt_info *ifo;
struct unitconf uconf;
struct wgt_info *ifo;
@@
-72,7
+73,8
@@
int uninstall_widget(const char *idaver, const char *root)
}
uconf.installdir = path;
uconf.icondir = FWK_ICON_DIR;
}
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);
unit_uninstall(ifo, &uconf);
wgt_info_unref(ifo);
@@
-87,13
+89,15
@@
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);
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);
ERROR("can't remove '%s': %m", path);
+ return -1;
+ }
/* removes the parent directory if empty */
/* removes the parent directory if empty */
- rc
2
= snprintf(path, sizeof path, "%s/%s", root, id);
- assert(rc
2
< (int)sizeof path);
- rc
2
= 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) {
if (rc < 0 && errno == ENOTEMPTY)
return rc;
if (rc < 0) {
@@
-105,16
+109,16
@@
int uninstall_widget(const char *idaver, const char *root)
* parent directory removed: last occurrence of the application
* uninstall it for the security-manager
*/
* parent directory removed: last occurrence of the application
* uninstall it for the security-manager
*/
- rc
2
= secmgr_init(id);
- if (rc
2
) {
+ rc = secmgr_init(id);
+ if (rc) {
ERROR("can't init security manager context");
return -1;
}
ERROR("can't init security manager context");
return -1;
}
- rc
2
= secmgr_uninstall();
- if (rc
2
) {
+ rc = secmgr_uninstall();
+ if (rc) {
ERROR("can't uninstall security manager context");
return -1;
}
ERROR("can't uninstall security manager context");
return -1;
}
- return
rc
;
+ return
0
;
}
}