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
Enforce numeric application IDs
[src/app-framework-main.git]
/
src
/
wgtpkg-uninstall.c
diff --git
a/src/wgtpkg-uninstall.c
b/src/wgtpkg-uninstall.c
index
653aea7
..
f435838
100644
(file)
--- a/
src/wgtpkg-uninstall.c
+++ b/
src/wgtpkg-uninstall.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright
2015, 2016, 2017
IoT.bzh
+ Copyright
(C) 2015-2019
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-72,7
+72,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,8
+88,8
@@
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)
- ERROR("can't remov
ing
'%s': %m", path);
+ if (rc < 0
&& errno != ENOENT
)
+ ERROR("can't remov
e
'%s': %m", path);
/* removes the parent directory if empty */
rc2 = snprintf(path, sizeof path, "%s/%s", root, id);
/* removes the parent directory if empty */
rc2 = snprintf(path, sizeof path, "%s/%s", root, id);
@@
-97,7
+98,7
@@
int uninstall_widget(const char *idaver, const char *root)
if (rc < 0 && errno == ENOTEMPTY)
return rc;
if (rc < 0) {
if (rc < 0 && errno == ENOTEMPTY)
return rc;
if (rc < 0) {
- ERROR("
error
while removing directory '%s': %m", path);
+ ERROR("while removing directory '%s': %m", path);
return -1;
}
return -1;
}