projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some extra null pointer checks
[project/uci.git]
/
cli.c
diff --git
a/cli.c
b/cli.c
index
0c68d08
..
845fc2a
100644
(file)
--- a/
cli.c
+++ b/
cli.c
@@
-18,8
+18,9
@@
static const char *appname = "uci";
static enum {
CLI_FLAG_MERGE = (1 << 0),
static const char *appname = "uci";
static enum {
CLI_FLAG_MERGE = (1 << 0),
+ CLI_FLAG_QUIET = (1 << 1)
} flags;
} flags;
-static FILE *input
= stdin
;
+static FILE *input;
static struct uci_context *ctx;
enum {
static struct uci_context *ctx;
enum {
@@
-50,7
+51,10
@@
static void uci_usage(int argc, char **argv)
"Options:\n"
"\t-f <file> use <file> as input instead of stdin\n"
"\t-m when importing, merge data into an existing package\n"
"Options:\n"
"\t-f <file> use <file> as input instead of stdin\n"
"\t-m when importing, merge data into an existing package\n"
- "\t-s force strict mode (stop on parser errors)\n"
+ "\t-n name unnamed sections on export (default)\n"
+ "\t-N don't name unnamed sections\n"
+ "\t-q quiet mode (don't print error messages)\n"
+ "\t-s force strict mode (stop on parser errors, default)\n"
"\t-S disable strict mode\n"
"\n",
argv[0]
"\t-S disable strict mode\n"
"\n",
argv[0]
@@
-58,6
+62,14
@@
static void uci_usage(int argc, char **argv)
exit(255);
}
exit(255);
}
+static void cli_perror(void)
+{
+ if (flags & CLI_FLAG_QUIET)
+ return;
+
+ uci_perror(ctx, appname);
+}
+
static void uci_show_section(struct uci_section *p)
{
struct uci_element *e;
static void uci_show_section(struct uci_section *p)
{
struct uci_element *e;
@@
-86,13
+98,15
@@
static int package_cmd(int cmd, char *package)
struct uci_package *p = NULL;
if (uci_load(ctx, package, &p) != UCI_OK) {
struct uci_package *p = NULL;
if (uci_load(ctx, package, &p) != UCI_OK) {
-
uci_perror(ctx, appname
);
+
cli_perror(
);
return 1;
}
return 1;
}
+ if (!p)
+ return 0;
switch(cmd) {
case CMD_COMMIT:
if (uci_commit(ctx, &p, false) != UCI_OK)
switch(cmd) {
case CMD_COMMIT:
if (uci_commit(ctx, &p, false) != UCI_OK)
-
uci_perror(ctx, appname
);
+
cli_perror(
);
break;
case CMD_EXPORT:
uci_export(ctx, stdout, p, true);
break;
case CMD_EXPORT:
uci_export(ctx, stdout, p, true);
@@
-140,7
+154,7
@@
static int uci_do_import(int argc, char **argv)
}
if (ret != UCI_OK) {
}
if (ret != UCI_OK) {
-
uci_perror(ctx, appname
);
+
cli_perror(
);
return 1;
}
return 1;
}
@@
-159,7
+173,7
@@
static int uci_do_package_cmd(int cmd, int argc, char **argv)
return package_cmd(cmd, argv[1]);
if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
return package_cmd(cmd, argv[1]);
if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
-
uci_perror(ctx, appname
);
+
cli_perror(
);
return 1;
}
return 1;
}
@@
-197,9
+211,11
@@
static int uci_do_section_cmd(int cmd, int argc, char **argv)
return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
-
uci_perror(ctx, appname
);
+
cli_perror(
);
return 1;
}
return 1;
}
+ if (!p)
+ return 0;
switch(cmd) {
case CMD_GET:
switch(cmd) {
case CMD_GET:
@@
-240,7
+256,7
@@
static int uci_do_section_cmd(int cmd, int argc, char **argv)
ret = uci_save(ctx, p);
if (ret != UCI_OK) {
ret = uci_save(ctx, p);
if (ret != UCI_OK) {
-
uci_perror(ctx, appname
);
+
cli_perror(
);
return 1;
}
return 1;
}
@@
-293,13
+309,14
@@
int main(int argc, char **argv)
int ret;
int c;
int ret;
int c;
+ input = stdin;
ctx = uci_alloc_context();
if (!ctx) {
fprintf(stderr, "Out of memory\n");
return 1;
}
ctx = uci_alloc_context();
if (!ctx) {
fprintf(stderr, "Out of memory\n");
return 1;
}
- while((c = getopt(argc, argv, "mf:sS")) != -1) {
+ while((c = getopt(argc, argv, "mf:sS
nNq
")) != -1) {
switch(c) {
case 'f':
input = fopen(optarg, "r");
switch(c) {
case 'f':
input = fopen(optarg, "r");
@@
-318,6
+335,15
@@
int main(int argc, char **argv)
ctx->flags &= ~UCI_FLAG_STRICT;
ctx->flags |= UCI_FLAG_PERROR;
break;
ctx->flags &= ~UCI_FLAG_STRICT;
ctx->flags |= UCI_FLAG_PERROR;
break;
+ case 'n':
+ ctx->flags |= UCI_FLAG_EXPORT_NAME;
+ break;
+ case 'N':
+ ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
+ break;
+ case 'q':
+ flags |= CLI_FLAG_QUIET;
+ break;
default:
uci_usage(argc, argv);
break;
default:
uci_usage(argc, argv);
break;