/*
+ * cli - Command Line Interface for the Unified Configuration Interface
* Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify
* GNU General Public License for more details.
*/
#include <strings.h>
+#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include "uci.h"
-static const char *appname = "uci";
+#define MAX_ARGS 4 /* max command line arguments for batch mode */
+
+static const char *appname;
static enum {
- CLI_FLAG_MERGE = (1 << 0),
+ CLI_FLAG_MERGE = (1 << 0),
+ CLI_FLAG_QUIET = (1 << 1),
+ CLI_FLAG_NOCOMMIT = (1 << 2),
+ CLI_FLAG_BATCH = (1 << 3),
} flags;
-static FILE *input = stdin;
+
+static FILE *input;
static struct uci_context *ctx;
enum {
CMD_SET,
CMD_DEL,
CMD_RENAME,
+ CMD_REVERT,
/* package cmds */
CMD_SHOW,
- CMD_IMPORT,
+ CMD_CHANGES,
CMD_EXPORT,
CMD_COMMIT,
+ /* other cmds */
+ CMD_ADD,
+ CMD_IMPORT,
+ CMD_HELP,
};
-static void uci_usage(int argc, char **argv)
+static int uci_cmd(int argc, char **argv);
+
+static void uci_usage(void)
{
fprintf(stderr,
"Usage: %s [<options>] <command> [<arguments>]\n\n"
"Commands:\n"
+ "\tbatch\n"
"\texport [<config>]\n"
"\timport [<config>]\n"
+ "\tchanges [<config>]\n"
+ "\tadd <config> <section-type>\n"
"\tshow [<config>[.<section>[.<option>]]]\n"
"\tget <config>.<section>[.<option>]\n"
"\tset <config>.<section>[.<option>]=<value>\n"
"\trename <config>.<section>[.<option>]=<name>\n"
+ "\trevert <config>[.<section>[.<option>]]\n"
"\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-p <path> add a search path for config change files\n"
+ "\t-P <path> add a search path for config change files and use as default\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]
+ appname
);
- 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)
}
}
+static void uci_show_changes(struct uci_package *p)
+{
+ struct uci_element *e;
+
+ uci_foreach_element(&p->saved_history, e) {
+ struct uci_history *h = uci_to_history(e);
+
+ if (h->cmd == UCI_CMD_REMOVE)
+ printf("-");
+ printf("%s.%s", p->e.name, h->section);
+ if (e->name)
+ printf(".%s", e->name);
+ if (h->cmd != UCI_CMD_REMOVE)
+ printf("=%s", h->value);
+ printf("\n");
+ }
+}
static int package_cmd(int cmd, char *package)
{
struct uci_package *p = NULL;
+ int ret;
- if (uci_load(ctx, package, &p) != UCI_OK) {
- uci_perror(ctx, appname);
+ if (cmd == CMD_CHANGES)
+ ctx->flags |= UCI_FLAG_SAVED_HISTORY;
+ ret = uci_load(ctx, package, &p);
+ if (cmd == CMD_CHANGES)
+ ctx->flags &= ~UCI_FLAG_SAVED_HISTORY;
+
+ if (ret != UCI_OK) {
+ cli_perror();
return 1;
}
+ if (!p)
+ return 0;
switch(cmd) {
+ case CMD_CHANGES:
+ uci_show_changes(p);
+ break;
case CMD_COMMIT:
+ if (flags & CLI_FLAG_NOCOMMIT)
+ return 0;
if (uci_commit(ctx, &p, false) != UCI_OK)
- uci_perror(ctx, appname);
+ cli_perror();
break;
case CMD_EXPORT:
uci_export(ctx, stdout, p, true);
static int uci_do_import(int argc, char **argv)
{
struct uci_package *package = NULL;
- char **configs = NULL;
char *name = NULL;
int ret = UCI_OK;
- char **p;
+ bool merge = false;
if (argc > 2)
return 255;
if (flags & CLI_FLAG_MERGE) {
if (uci_load(ctx, name, &package) != UCI_OK)
package = NULL;
+ else
+ merge = true;
}
ret = uci_import(ctx, input, name, &package, (name != NULL));
if (ret == UCI_OK) {
- if (flags & CLI_FLAG_MERGE) {
+ if (merge) {
ret = uci_save(ctx, package);
} else {
struct uci_element *e;
}
if (ret != UCI_OK) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
return package_cmd(cmd, argv[1]);
if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
return 0;
}
+static int uci_do_add(int argc, char **argv)
+{
+ struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
+ int ret;
+
+ if (argc != 3)
+ return 255;
+
+ ret = uci_load(ctx, argv[1], &p);
+ if (ret != UCI_OK)
+ goto done;
+
+ ret = uci_add_section(ctx, p, argv[2], &s);
+ if (ret != UCI_OK)
+ goto done;
+
+ ret = uci_save(ctx, p);
+
+done:
+ if (ret != UCI_OK)
+ cli_perror();
+ else if (s)
+ fprintf(stdout, "%s\n", s->e.name);
+
+ return ret;
+}
static int uci_do_section_cmd(int cmd, int argc, char **argv)
{
}
if (uci_parse_tuple(ctx, argv[1], &package, §ion, &option, ptr) != UCI_OK)
return 1;
+ if (section && !section[0])
+ return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
+ if (!p)
+ return 0;
switch(cmd) {
case CMD_GET:
case CMD_RENAME:
ret = uci_rename(ctx, p, section, option, value);
break;
+ case CMD_REVERT:
+ ret = uci_revert(ctx, &p, section, option);
+ break;
case CMD_SET:
- ret = uci_set(ctx, p, section, option, value);
+ ret = uci_set(ctx, p, section, option, value, NULL);
break;
case CMD_DEL:
ret = uci_delete(ctx, p, section, option);
}
/* no save necessary for get */
- if (cmd == CMD_GET)
+ if ((cmd == CMD_GET) || (cmd == CMD_REVERT))
return 0;
/* save changes, but don't commit them yet */
ret = uci_save(ctx, p);
if (ret != UCI_OK) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
return 0;
}
+static int uci_batch_cmd(void)
+{
+ char *argv[MAX_ARGS];
+ char *str = NULL;
+ int ret = 0;
+ int i, j;
+
+ for(i = 0; i <= MAX_ARGS; i++) {
+ if (i == MAX_ARGS) {
+ fprintf(stderr, "Too many arguments\n");
+ return 1;
+ }
+ argv[i] = NULL;
+ if ((ret = uci_parse_argument(ctx, input, &str, &argv[i])) != UCI_OK) {
+ cli_perror();
+ i = 0;
+ break;
+ }
+ if (!argv[i][0])
+ break;
+ argv[i] = strdup(argv[i]);
+ if (!argv[i]) {
+ perror("uci");
+ return 1;
+ }
+ }
+ argv[i] = NULL;
+
+ if (i > 0) {
+ if (!strcasecmp(argv[0], "exit"))
+ return 254;
+ ret = uci_cmd(i, argv);
+ } else
+ return 0;
+
+ for (j = 0; j < i; j++) {
+ if (argv[j])
+ free(argv[j]);
+ }
+
+ return ret;
+}
+
+static int uci_batch(void)
+{
+ int ret = 0;
+
+ while (!feof(input)) {
+ struct uci_element *e, *tmp;
+
+ ret = uci_batch_cmd();
+ if (ret == 254)
+ return 0;
+ else if (ret == 255)
+ fprintf(stderr, "Unknown command\n");
+
+ /* clean up */
+ uci_foreach_element_safe(&ctx->root, tmp, e) {
+ uci_unload(ctx, uci_to_package(e));
+ }
+ }
+ return 0;
+}
+
static int uci_cmd(int argc, char **argv)
{
int cmd = 0;
- if (!strcasecmp(argv[0], "show"))
+ if (!strcasecmp(argv[0], "batch") && !(flags & CLI_FLAG_BATCH))
+ return uci_batch();
+ else if (!strcasecmp(argv[0], "show"))
cmd = CMD_SHOW;
+ else if (!strcasecmp(argv[0], "changes"))
+ cmd = CMD_CHANGES;
else if (!strcasecmp(argv[0], "export"))
cmd = CMD_EXPORT;
else if (!strcasecmp(argv[0], "commit"))
else if (!strcasecmp(argv[0], "ren") ||
!strcasecmp(argv[0], "rename"))
cmd = CMD_RENAME;
+ else if (!strcasecmp(argv[0], "revert"))
+ cmd = CMD_REVERT;
else if (!strcasecmp(argv[0], "del"))
cmd = CMD_DEL;
else if (!strcasecmp(argv[0], "import"))
cmd = CMD_IMPORT;
+ else if (!strcasecmp(argv[0], "help"))
+ cmd = CMD_HELP;
+ else if (!strcasecmp(argv[0], "add"))
+ cmd = CMD_ADD;
else
cmd = -1;
case CMD_SET:
case CMD_DEL:
case CMD_RENAME:
+ case CMD_REVERT:
return uci_do_section_cmd(cmd, argc, argv);
case CMD_SHOW:
case CMD_EXPORT:
case CMD_COMMIT:
+ case CMD_CHANGES:
return uci_do_package_cmd(cmd, argc, argv);
case CMD_IMPORT:
return uci_do_import(argc, argv);
+ case CMD_ADD:
+ return uci_do_add(argc, argv);
+ case CMD_HELP:
+ uci_usage();
+ return 0;
default:
return 255;
}
int ret;
int c;
+ appname = argv[0];
+ input = stdin;
ctx = uci_alloc_context();
if (!ctx) {
fprintf(stderr, "Out of memory\n");
return 1;
}
- while((c = getopt(argc, argv, "mfsS")) != -1) {
+ while((c = getopt(argc, argv, "f:mnNp:P:sSq")) != -1) {
switch(c) {
case 'f':
input = fopen(optarg, "r");
ctx->flags &= ~UCI_FLAG_STRICT;
ctx->flags |= UCI_FLAG_PERROR;
break;
- default:
- uci_usage(argc, argv);
+ case 'n':
+ ctx->flags |= UCI_FLAG_EXPORT_NAME;
break;
+ case 'N':
+ ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
+ break;
+ case 'p':
+ uci_add_history_path(ctx, optarg);
+ break;
+ case 'P':
+ uci_add_history_path(ctx, ctx->savedir);
+ uci_set_savedir(ctx, optarg);
+ flags |= CLI_FLAG_NOCOMMIT;
+ break;
+ case 'q':
+ flags |= CLI_FLAG_QUIET;
+ break;
+ default:
+ uci_usage();
+ return 0;
}
}
if (optind > 1)
argv += optind - 1;
argc -= optind - 1;
- if (argc < 2)
- uci_usage(argc, argv);
+ if (argc < 2) {
+ uci_usage();
+ return 0;
+ }
ret = uci_cmd(argc - 1, argv + 1);
if (input != stdin)
fclose(input);
- if (ret == 255)
- uci_usage(argc, argv);
+ if (ret == 255) {
+ uci_usage();
+ return 0;
+ }
uci_free_context(ctx);
projects / project / uci.git / blobdiff