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
Update date in copyrights
[src/app-framework-main.git]
/
src
/
wgtpkg-pack.c
diff --git
a/src/wgtpkg-pack.c
b/src/wgtpkg-pack.c
index
e7fa752
..
53ab9dc
100644
(file)
--- a/
src/wgtpkg-pack.c
+++ b/
src/wgtpkg-pack.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright
2015
IoT.bzh
+ Copyright
(C) 2015-2019
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-28,20
+28,26
@@
#include <fcntl.h>
#include "verbose.h"
#include <fcntl.h>
#include "verbose.h"
-#include "wgtpkg.h"
-
-#if !defined(MAXCERT)
-#define MAXCERT 20
-#endif
-#if !defined(DEFAULT_KEY_FILE)
-#define DEFAULT_KEY_FILE "key.pem"
-#endif
-#if !defined(DEFAULT_CERT_FILE)
-#define DEFAULT_CERT_FILE "cert.pem"
-#endif
+#include "wgtpkg-files.h"
+#include "wgtpkg-workdir.h"
+#include "wgtpkg-zip.h"
const char appname[] = "wgtpkg-pack";
const char appname[] = "wgtpkg-pack";
+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(
@@
-51,6
+57,7
@@
static void usage()
" -f force overwriting\n"
" -q quiet\n"
" -v verbose\n"
" -f force overwriting\n"
" -q quiet\n"
" -v verbose\n"
+ " -V version\n"
"\n",
appname
);
"\n",
appname
);
@@
-62,6
+69,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 }
};
@@
-77,7
+85,7
@@
int main(int ac, char **av)
force = 0;
wgtfile = directory = NULL;
for (;;) {
force = 0;
wgtfile = directory = NULL;
for (;;) {
- i = getopt_long(ac, av, "qvhfo:", options, NULL);
+ i = getopt_long(ac, av, "qv
V
hfo:", options, NULL);
if (i < 0)
break;
switch (i) {
if (i < 0)
break;
switch (i) {
@@
-97,6
+105,9
@@
int main(int ac, char **av)
case 'h':
usage();
return 0;
case 'h':
usage();
return 0;
+ case 'V':
+ version();
+ return 0;
case ':':
ERROR("missing argument");
return 1;
case ':':
ERROR("missing argument");
return 1;
@@
-150,13
+161,17
@@
int main(int ac, char **av)
/* compute absolutes paths */
x = realpath(wgtfile, NULL);
if (x == NULL) {
/* compute absolutes paths */
x = realpath(wgtfile, NULL);
if (x == NULL) {
- ERROR("realpath failed for %s",wgtfile);
+ ERROR("realpath failed for %s",
wgtfile);
return 1;
}
wgtfile = x;
/* set and enter the workdir */
return 1;
}
wgtfile = x;
/* set and enter the workdir */
- if (set_workdir(directory, 0))
+ if (chdir(directory)) {
+ ERROR("failed to enter directory %s", directory);
+ return 1;
+ }
+ if (set_workdir(".", 0))
return 1;
return 1;