uci: fix atomicity of uci_add_list

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index deb670b62583679234fc68477d4fe6be38b84f71..b4c4f9574b4daf1948a3e4be703ee48cd75fd5e6 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -100,10 +100,9 @@ uci_lookup_section_ref(struct uci_section *s)
                ti = ti->next;
        }
        if (!ti) {
-               ti = malloc(sizeof(struct uci_type_list));
+               ti = calloc(1, sizeof(struct uci_type_list));
                if (!ti)
                        return NULL;
-               memset(ti, 0, sizeof(struct uci_type_list));
                ti->next = type_list;
                type_list = ti;
                ti->name = s->type;
@@ -113,8 +112,16 @@ uci_lookup_section_ref(struct uci_section *s)
                maxlen = strlen(s->type) + 1 + 2 + 10;
                if (!typestr) {
                        typestr = malloc(maxlen);
+                       if (!typestr)
+                               return NULL;
                } else {
-                       typestr = realloc(typestr, maxlen);
+                       void *p = realloc(typestr, maxlen);
+                       if (!p) {
+                               free(typestr);
+                               return NULL;
+                       }
+
+                       typestr = p;
                }
 
                if (typestr)
@@ -156,8 +163,11 @@ static void uci_usage(void)
                "\t-d <str>   set the delimiter for list values in uci show\n"
                "\t-f <file>  use <file> as input instead of stdin\n"
                "\t-m         when importing, merge data into an existing package\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-t <path>  set save path for config change files\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"
@@ -175,6 +185,7 @@ static void cli_perror(void)
        uci_perror(ctx, appname);
 }
 
+__attribute__((format(printf, 1, 2)))
 static void cli_error(const char *fmt, ...)
 {
        va_list ap;
@@ -561,7 +572,7 @@ static int uci_batch_cmd(void)
                        return 1;
                }
                argv[i] = NULL;
-               if ((ret = uci_parse_argument(ctx, input, &str, &argv[i])) != UCI_OK) {
+               if (uci_parse_argument(ctx, input, &str, &argv[i]) != UCI_OK) {
                        cli_perror();
                        i = 0;
                        break;
@@ -696,7 +707,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) {
+       while((c = getopt(argc, argv, "c:d:f:LmnNp:P:qsSt:X")) != -1) {
                switch(c) {
                        case 'c':
                                uci_set_confdir(ctx, optarg);
@@ -727,24 +738,28 @@ int main(int argc, char **argv)
                                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 'p':
                                uci_add_delta_path(ctx, optarg);
                                break;
                        case 'P':
-                               uci_add_delta_path(ctx, ctx->savedir);
                                uci_set_savedir(ctx, optarg);
                                flags |= CLI_FLAG_NOCOMMIT;
                                break;
                        case 'q':
                                flags |= CLI_FLAG_QUIET;
                                break;
+                       case 't':
+                               uci_set_savedir(ctx, optarg);
+                               break;
                        case 'X':
                                flags &= ~CLI_FLAG_SHOW_EXT;
                                break;
-                       case 'n':
-                       case 'N':
-                               /* obsolete */
-                               break;
                        default:
                                uci_usage();
                                return 0;