}
switch(cmd) {
case CMD_COMMIT:
- if (uci_commit(ctx, &p) != UCI_OK)
+ if (uci_commit(ctx, &p, false) != UCI_OK)
uci_perror(ctx, appname);
break;
case CMD_EXPORT:
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;
+
+ if (argc > 2)
+ return 255;
+
+ if (argc == 2)
+ name = argv[1];
+ else if (flags & CLI_FLAG_MERGE)
+ /* need a package to merge */
+ return 255;
+
+ if (flags & CLI_FLAG_MERGE) {
+ if (uci_load(ctx, name, &package) != UCI_OK)
+ package = NULL;
+ }
+ ret = uci_import(ctx, input, name, &package, (name != NULL));
+ if (ret == UCI_OK) {
+ if (flags & CLI_FLAG_MERGE) {
+ ret = uci_save(ctx, package);
+ } else {
+ struct uci_element *e;
+ /* loop through all config sections and overwrite existing data */
+ uci_foreach_element(&ctx->root, e) {
+ struct uci_package *p = uci_to_package(e);
+ ret = uci_commit(ctx, &p, true);
+ }
+ }
+ }
+
+ if (ret != UCI_OK) {
+ uci_perror(ctx, appname);
+ return 1;
+ }
+
return 0;
}
return 1;
}
- while((c = getopt(argc, argv, "sS")) != -1) {
+ while((c = getopt(argc, argv, "mfsS")) != -1) {
switch(c) {
case 'f':
input = fopen(optarg, "r");