file.c: lift the 4096 bytes line length limit.

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 8f32255..e425554 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"
 
@@ -168,6 +170,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, "'");
@@ -305,15 +319,19 @@ static int package_cmd(int cmd, char *tuple)
                }
                if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
                        cli_perror();
+                       goto out;
                }
                break;
        case CMD_EXPORT:
-               uci_export(ctx, stdout, ptr.p, true);
+               if (uci_export(ctx, stdout, ptr.p, true) != UCI_OK) {
+                       goto out;
+               }
                break;
        case CMD_SHOW:
                if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
                        ctx->err = UCI_ERR_NOTFOUND;
                        cli_perror();
+                       goto out;
                }
                switch(e->type) {
                        case UCI_TYPE_PACKAGE:
@@ -332,6 +350,8 @@ static int package_cmd(int cmd, char *tuple)
                break;
        }
 
+       ret = 0;
+
 out:
        if (ptr.p)
                uci_unload(ctx, ptr.p);
@@ -532,7 +552,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;
@@ -545,7 +565,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;
                }
        }
@@ -577,7 +597,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) {
@@ -667,7 +687,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;
        }
 
@@ -681,13 +701,14 @@ int main(int argc, char **argv)
                                break;
                        case 'f':
                                if (input != stdin) {
-                                       perror("uci");
+                                       fclose(input);
+                                       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;