[src/trunk]: src/usr.bin/make Allow cond_state[] to grow.

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99a02e290626
branches:  trunk
changeset: 782441:99a02e290626
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sat Nov 03 02:25:13 2012 +0000

description:
Allow cond_state[] to grow.
The need is rare, but real.

Reviewed by: christos

diffstat:

 usr.bin/make/cond.c |  35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diffs (104 lines):

diff -r 9f903247226e -r 99a02e290626 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sat Nov 03 00:52:41 2012 +0000
+++ b/usr.bin/make/cond.c       Sat Nov 03 02:25:13 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $  */
+/*     $NetBSD: cond.c,v 1.65 2012/11/03 02:25:13 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.65 2012/11/03 02:25:13 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c     8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.65 2012/11/03 02:25:13 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1228,6 +1228,7 @@
 Cond_Eval(char *line)
 {
     #define        MAXIF      128      /* maximum depth of .if'ing */
+    #define        MAXIF_BUMP  32      /* how much to grow by */
     enum if_states {
        IF_ACTIVE,              /* .if or .elif part active */
        ELSE_ACTIVE,            /* .else part active */
@@ -1235,7 +1236,8 @@
        SKIP_TO_ELSE,           /* has been true, but not seen '.else' */
        SKIP_TO_ENDIF           /* nothing else to execute */
     };
-    static enum if_states cond_state[MAXIF + 1] = { IF_ACTIVE };
+    static enum if_states *cond_state = NULL;
+    static int max_if_depth = MAXIF;
 
     const struct If *ifp;
     Boolean        isElif;
@@ -1244,7 +1246,10 @@
     enum if_states  state;
 
     level = PARSE_FATAL;
-
+    if (!cond_state) {
+       cond_state = bmake_malloc(max_if_depth * sizeof(*cond_state));
+       cond_state[0] = IF_ACTIVE;
+    }
     /* skip leading character (the '.') and any whitespace */
     for (line++; *line == ' ' || *line == '\t'; line++)
        continue;
@@ -1261,8 +1266,6 @@
            }
            /* Return state for previous conditional */
            cond_depth--;
-           if (cond_depth > MAXIF)
-               return COND_SKIP;
            return cond_state[cond_depth] <= ELSE_ACTIVE ? COND_PARSE : COND_SKIP;
        }
 
@@ -1275,8 +1278,6 @@
                return COND_PARSE;
            }
 
-           if (cond_depth > MAXIF)
-               return COND_SKIP;
            state = cond_state[cond_depth];
            switch (state) {
            case SEARCH_FOR_ELIF:
@@ -1325,9 +1326,6 @@
            Parse_Error(level, "if-less elif");
            return COND_PARSE;
        }
-       if (cond_depth > MAXIF)
-           /* Error reported when we saw the .if ... */
-           return COND_SKIP;
        state = cond_state[cond_depth];
        if (state == SKIP_TO_ENDIF || state == ELSE_ACTIVE) {
            Parse_Error(PARSE_WARNING, "extra elif");
@@ -1341,10 +1339,15 @@
        }
     } else {
        /* Normal .if */
-       if (cond_depth >= MAXIF) {
-           cond_depth++;
-           Parse_Error(PARSE_FATAL, "Too many nested if's. %d max.", MAXIF);
-           return COND_SKIP;
+       if (cond_depth >= max_if_depth) {
+           /*
+            * This is rare, but not impossible.
+            * In meta mode, dirdeps.mk (only runs at level 0)
+            * can need more than the default.
+            */
+           max_if_depth += MAXIF_BUMP;
+           cond_state = bmake_realloc(cond_state,
+                               max_if_depth * sizeof(*cond_state));
        }
        state = cond_state[cond_depth];
        cond_depth++;