Reject mixed type names / declarations.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index a0771912fe24acb404fe0df5790763be0d0b4a6c..b47565d62adffc85549a4eb2fc60ef97afb28b00 100644 (file)
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -1,16 +1,37 @@
+/*
+ *  Command line utility for making sense of C declarations.
+ *  Copyright © 2011 Nick Bowler
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <getopt.h>
 #include "readline.h"
 #include "cdecl.h"
 
 static const char *progname = "cdecl99";
-static const char sopts[] = "VH";
+static const char sopts[] = "qbiVH";
 static const struct option lopts[] = {
-       { "version", 0, NULL, 'V' },
-       { "help",    0, NULL, 'H' },
+       { "quiet",       0, NULL, 'q' },
+       { "batch",       0, NULL, 'b' },
+       { "interactive", 0, NULL, 'i' },
+       { "version",     0, NULL, 'V' },
+       { "help",        0, NULL, 'H' },
        { 0 }
 };
 
@@ -38,6 +59,7 @@ static int cmd_explain(char *cmd, char *arg)
 {
        static size_t bufsz;
        static char *buf;
+       int ret = -1;
 
        struct cdecl *decl;
        size_t rc;
@@ -46,26 +68,30 @@ static int cmd_explain(char *cmd, char *arg)
        if (!decl)
                goto out;
 
+       for (struct cdecl *i = decl; i; i = i->next) {
 retry:
-       rc = cdecl_explain(buf, bufsz, decl);
-       if (rc >= bufsz) {
-               char *tmp;
-
-               tmp = realloc(buf, rc + 1);
-               if (!tmp) {
-                       fprintf(stderr, "failed to allocate memory\n");
-                       return 1;
+               rc = cdecl_explain(buf, bufsz, i);
+               if (rc >= bufsz) {
+                       char *tmp;
+
+                       tmp = realloc(buf, rc + 1);
+                       if (!tmp) {
+                               fprintf(stderr, "failed to allocate memory\n");
+                               goto out;
+                       }
+
+                       buf = tmp;
+                       bufsz = rc + 1;
+                       goto retry;
                }
 
-               buf = tmp;
-               bufsz = rc + 1;
-               goto retry;
+               printf("%s\n", buf);
        }
 
-       printf("%s\n", buf);
+       ret = 1;
 out:
        cdecl_free(decl);
-       return 1;
+       return ret;
 }
 
 static int cmd_quit(char *cmd, char *arg)
@@ -99,14 +125,13 @@ static int cmd_help(char *cmd, char *arg)
        return 1;
 }
 
-static int repl(void)
+static int repl(bool interactive)
 {
+       char *prompt = interactive ? "> " : NULL;
+       int rc, ret = 0;
        char *line;
-       int ret;
-
-       print_version();
 
-       for (; (line = readline("> ")); free(line)) {
+       for (; (line = readline(prompt)); free(line)) {
                char *cmd = line + strspn(line, " \t");
                char *arg = cmd  + strcspn(cmd, " \t");
 
@@ -119,18 +144,19 @@ static int repl(void)
                        if (strcmp(cmd, commands[i].name) != 0)
                                continue;
 
-                       ret = commands[i].func(cmd, arg);
-                       if (ret <= 0)
+                       rc = commands[i].func(cmd, arg);
+                       if (!interactive && rc < 0)
+                               ret = -1;
+                       if (rc == 0)
                                goto out;
                        goto next;
                }
 
                fprintf(stderr, "Undefined command: %s\n", cmd);
+               ret = -1;
        next:
                ;
        }
-
-       ret = 0;
 out:
        free(line);
        return ret;
@@ -138,6 +164,7 @@ out:
 
 int main(int argc, char **argv)
 {
+       bool show_intro = true, interactive = true;
        int opt;
 
        if (argc > 0)
@@ -145,6 +172,15 @@ int main(int argc, char **argv)
 
        while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
                switch (opt) {
+               case 'q':
+                       show_intro = false;
+                       break;
+               case 'b':
+                       interactive = false;
+                       break;
+               case 'i':
+                       interactive = true;
+                       break;
                case 'V':
                        print_version();
                        return EXIT_SUCCESS;
@@ -157,7 +193,10 @@ int main(int argc, char **argv)
                }
        }
 
-       if (repl() != 0)
+       if (interactive && show_intro)
+               print_version();
+
+       if (repl(interactive) != 0)
                return EXIT_FAILURE;
 
        return EXIT_SUCCESS;