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
Merge "afm-user-daemon: Remove it by default"
[src/app-framework-main.git]
/
src
/
wgtpkg-info.c
diff --git
a/src/wgtpkg-info.c
b/src/wgtpkg-info.c
index
f5d1b42
..
f32b265
100644
(file)
--- a/
src/wgtpkg-info.c
+++ b/
src/wgtpkg-info.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>
@@
-39,6
+39,20
@@
static const char appname[] = "wgtpkg-info";
static void show(const char *wgtfile);
static void show(const char *wgtfile);
+static void version()
+{
+ printf(
+ "\n"
+ " %s version="AFM_VERSION"\n"
+ "\n"
+ " Copyright (C) 2015-2019 \"IoT.bzh\"\n"
+ " AFB comes with ABSOLUTELY NO WARRANTY.\n"
+ " Licence Apache 2\n"
+ "\n",
+ appname
+ );
+}
+
static void usage()
{
printf(
static void usage()
{
printf(
@@
-46,6
+60,7
@@
static void usage()
"\n"
" -q quiet\n"
" -v verbose\n"
"\n"
" -q quiet\n"
" -v verbose\n"
+ " -V version\n"
"\n",
appname
);
"\n",
appname
);
@@
-55,6
+70,7
@@
static struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "quiet", no_argument, NULL, 'q' },
{ "verbose", no_argument, NULL, 'v' },
{ "help", no_argument, NULL, 'h' },
{ "quiet", no_argument, NULL, 'q' },
{ "verbose", no_argument, NULL, 'v' },
+ { "version", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0 }
};
{ NULL, 0, NULL, 0 }
};
@@
-69,7
+85,7
@@
int main(int ac, char **av)
xmlsec_init();
for (;;) {
xmlsec_init();
for (;;) {
- i = getopt_long(ac, av, "hqv", options, NULL);
+ i = getopt_long(ac, av, "hqv
V
", options, NULL);
if (i < 0)
break;
switch (i) {
if (i < 0)
break;
switch (i) {
@@
-83,6
+99,9
@@
int main(int ac, char **av)
case 'v':
verbosity++;
break;
case 'v':
verbosity++;
break;
+ case 'V':
+ version();
+ return 0;
case ':':
ERROR("missing argument value");
return 1;
case ':':
ERROR("missing argument value");
return 1;
@@
-136,11
+155,11
@@
static void show(const char *wgtfile)
if (zread(wgtfile, 0))
goto error2;
if (zread(wgtfile, 0))
goto error2;
- if (check_all_signatures(
))
+ if (check_all_signatures(
1)) /* info even on WGT without signature */
goto error2;
check_and_show();
goto error2;
check_and_show();
-
+
error2:
remove_workdir();
return;
error2:
remove_workdir();
return;