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
Put strings in one place
[src/app-framework-main.git]
/
src
/
wgtpkg-info.c
diff --git
a/src/wgtpkg-info.c
b/src/wgtpkg-info.c
index
7854b09
..
f5d1b42
100644
(file)
--- a/
src/wgtpkg-info.c
+++ b/
src/wgtpkg-info.c
@@
-1,5
+1,7
@@
/*
/*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-14,19
+16,22
@@
limitations under the License.
*/
limitations under the License.
*/
-#define _BSD_SOURCE /* see readdir */
-
#include <stdlib.h>
#include <stdio.h>
#include <dirent.h>
#include <unistd.h>
#include <limits.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <dirent.h>
#include <unistd.h>
#include <limits.h>
#include <errno.h>
-#include <syslog.h>
#include <getopt.h>
#include <getopt.h>
+#include <libxml/tree.h>
+
#include "verbose.h"
#include "verbose.h"
-#include "wgtpkg.h"
+#include "wgtpkg-workdir.h"
+#include "wgtpkg-files.h"
+#include "wgtpkg-zip.h"
+#include "wgtpkg-digsig.h"
+#include "wgtpkg-xmlsec.h"
#include "wgt.h"
#include "wgt-info.h"
#include "wgt.h"
#include "wgt-info.h"
@@
-37,7
+42,7
@@
static void show(const char *wgtfile);
static void usage()
{
printf(
static void usage()
{
printf(
- "usage: %s [-
f] [-
q] [-v] wgtfile...\n"
+ "usage: %s [-q] [-v] wgtfile...\n"
"\n"
" -q quiet\n"
" -v verbose\n"
"\n"
" -q quiet\n"
" -v verbose\n"
@@
-59,7
+64,7
@@
int main(int ac, char **av)
int i;
char *wpath;
int i;
char *wpath;
-
openlog(appname, LOG_PERROR, LOG_USER
);
+
LOGUSER(appname
);
xmlsec_init();
xmlsec_init();
@@
-79,10
+84,10
@@
int main(int ac, char **av)
verbosity++;
break;
case ':':
verbosity++;
break;
case ':':
-
syslog(LOG_ERR,
"missing argument value");
+
ERROR(
"missing argument value");
return 1;
default:
return 1;
default:
-
syslog(LOG_ERR,
"unrecognized option");
+
ERROR(
"unrecognized option");
return 1;
}
}
return 1;
}
}
@@
-92,7
+97,7
@@
int main(int ac, char **av)
for (i = 0 ; av[i] != NULL ; i++) {
wpath = realpath(av[i], NULL);
if (wpath == NULL) {
for (i = 0 ; av[i] != NULL ; i++) {
wpath = realpath(av[i], NULL);
if (wpath == NULL) {
-
syslog(LOG_ERR,
"error while getting realpath of %dth widget: %s", i+1, av[i]);
+
ERROR(
"error while getting realpath of %dth widget: %s", i+1, av[i]);
return 1;
}
av[i] = wpath;
return 1;
}
av[i] = wpath;
@@
-120,11
+125,11
@@
static int check_and_show()
/* install the widget of the file */
static void show(const char *wgtfile)
{
/* install the widget of the file */
static void show(const char *wgtfile)
{
-
notice
("-- INFO for widget %s --", wgtfile);
+
NOTICE
("-- INFO for widget %s --", wgtfile);
/* workdir */
/* workdir */
- if (make_workdir
_base
("/tmp", "UNPACK", 0)) {
-
syslog(LOG_ERR,
"failed to create a working directory");
+ if (make_workdir("/tmp", "UNPACK", 0)) {
+
ERROR(
"failed to create a working directory");
return;
}
return;
}