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
wgtpkg-install: choose the port
[src/app-framework-main.git]
/
src
/
wgtpkg-installer.c
diff --git
a/src/wgtpkg-installer.c
b/src/wgtpkg-installer.c
index
7c27fd5
..
855e28d
100644
(file)
--- a/
src/wgtpkg-installer.c
+++ b/
src/wgtpkg-installer.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright 2015 IoT.bzh
+ Copyright 2015
, 2016, 2017
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-27,8
+27,13
@@
#include <errno.h>
#include <getopt.h>
#include <errno.h>
#include <getopt.h>
+#include <libxml/tree.h>
+
#include "verbose.h"
#include "verbose.h"
-#include "wgtpkg.h"
+#include "wgtpkg-permissions.h"
+#include "wgtpkg-xmlsec.h"
+#include "wgt-info.h"
+#include "wgtpkg-install.h"
static const char appname[] = "wgtpkg-installer";
static const char *root;
static const char appname[] = "wgtpkg-installer";
static const char *root;
@@
-61,7
+66,8
@@
static struct option options[] = {
/* install the widgets of the list */
int main(int ac, char **av)
{
/* install the widgets of the list */
int main(int ac, char **av)
{
- int i;
+ int i, rc;
+ struct wgt_info *ifo;
LOGAUTH(appname);
LOGAUTH(appname);
@@
-87,7
+93,11
@@
int main(int ac, char **av)
verbosity++;
break;
case 'p':
verbosity++;
break;
case 'p':
- grant_permission_list(optarg);
+ rc = grant_permission_list(optarg);
+ if (rc < 0) {
+ ERROR("Can't set granted permission list");
+ exit(1);
+ }
break;
case ':':
ERROR("missing argument value");
break;
case ':':
ERROR("missing argument value");
@@
-107,8
+117,11
@@
int main(int ac, char **av)
/* install widgets */
av += optind;
root = *av++;
/* install widgets */
av += optind;
root = *av++;
- for ( ; *av ; av++)
- install_widget(*av, root, force);
+ for ( ; *av ; av++) {
+ ifo = install_widget(*av, root, force);
+ if (ifo)
+ wgt_info_unref(ifo);
+ }
return 0;
}
return 0;
}