Revert "mandatory anonymous section identifier"

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index e1e0a66..f8b45db 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -14,6 +14,8 @@
 #include <strings.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
 #include <unistd.h>
 #include "uci.h"
 
@@ -85,9 +87,10 @@ static char *
 uci_lookup_section_ref(struct uci_section *s)
 {
        struct uci_type_list *ti = type_list;
+       char *ret;
        int maxlen;
 
-       if (!s->anonymous || !(flags & CLI_FLAG_SHOW_EXT))
+       if (!(flags & CLI_FLAG_SHOW_EXT))
                return s->e.name;
 
        /* look up in section type list */
@@ -106,19 +109,25 @@ uci_lookup_section_ref(struct uci_section *s)
                ti->name = s->type;
        }
 
-       maxlen = strlen(s->type) + 1 + 2 + 10;
-       if (!typestr) {
-               typestr = malloc(maxlen);
+       if (s->anonymous) {
+               maxlen = strlen(s->type) + 1 + 2 + 10;
+               if (!typestr) {
+                       typestr = malloc(maxlen);
+               } else {
+                       typestr = realloc(typestr, maxlen);
+               }
+
+               if (typestr)
+                       sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+               ret = typestr;
        } else {
-               typestr = realloc(typestr, maxlen);
+               ret = s->e.name;
        }
 
-       if (typestr)
-               sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
-
        ti->idx++;
 
-       return typestr;
+       return ret;
 }
 
 static void uci_usage(void)
@@ -168,6 +177,18 @@ static void cli_perror(void)
        uci_perror(ctx, appname);
 }
 
+static void cli_error(const char *fmt, ...)
+{
+       va_list ap;
+
+       if (flags & CLI_FLAG_QUIET)
+               return;
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+}
+
 static void uci_print_value(FILE *f, const char *v)
 {
        fprintf(f, "'");
@@ -538,7 +559,7 @@ static int uci_batch_cmd(void)
 
        for(i = 0; i <= MAX_ARGS; i++) {
                if (i == MAX_ARGS) {
-                       fprintf(stderr, "Too many arguments\n");
+                       cli_error("Too many arguments\n");
                        return 1;
                }
                argv[i] = NULL;
@@ -551,7 +572,7 @@ static int uci_batch_cmd(void)
                        break;
                argv[i] = strdup(argv[i]);
                if (!argv[i]) {
-                       perror("uci");
+                       cli_error("uci: %s", strerror(errno));
                        return 1;
                }
        }
@@ -583,7 +604,7 @@ static int uci_batch(void)
                if (ret == 254)
                        return 0;
                else if (ret == 255)
-                       fprintf(stderr, "Unknown command\n");
+                       cli_error("Unknown command\n");
 
                /* clean up */
                uci_foreach_element_safe(&ctx->root, tmp, e) {
@@ -673,7 +694,7 @@ int main(int argc, char **argv)
        input = stdin;
        ctx = uci_alloc_context();
        if (!ctx) {
-               fprintf(stderr, "Out of memory\n");
+               cli_error("Out of memory\n");
                return 1;
        }
 
@@ -688,13 +709,13 @@ int main(int argc, char **argv)
                        case 'f':
                                if (input != stdin) {
                                        fclose(input);
-                                       perror("uci");
+                                       cli_error("Too many input files.\n");
                                        return 1;
                                }
 
                                input = fopen(optarg, "r");
                                if (!input) {
-                                       perror("uci");
+                                       cli_error("uci: %s", strerror(errno));
                                        return 1;
                                }
                                break;