| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $ */ | | 1 | /* $NetBSD: var.c,v 1.255 2020/07/04 17:41:04 rillig Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright (c) 1988, 1989, 1990, 1993 | | 4 | * Copyright (c) 1988, 1989, 1990, 1993 |
5 | * The Regents of the University of California. All rights reserved. | | 5 | * The Regents of the University of California. All rights reserved. |
6 | * | | 6 | * |
7 | * This code is derived from software contributed to Berkeley by | | 7 | * This code is derived from software contributed to Berkeley by |
8 | * Adam de Boor. | | 8 | * Adam de Boor. |
9 | * | | 9 | * |
10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
12 | * are met: | | 12 | * are met: |
13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -59,34 +59,34 @@ | | | @@ -59,34 +59,34 @@ |
59 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | | 59 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
60 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | | 60 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
61 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | | 61 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
62 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | | 62 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
63 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | | 63 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
64 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 64 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
65 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | | 65 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
66 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | | 66 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
67 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | | 67 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
68 | * SUCH DAMAGE. | | 68 | * SUCH DAMAGE. |
69 | */ | | 69 | */ |
70 | | | 70 | |
71 | #ifndef MAKE_NATIVE | | 71 | #ifndef MAKE_NATIVE |
72 | static char rcsid[] = "$NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $"; | | 72 | static char rcsid[] = "$NetBSD: var.c,v 1.255 2020/07/04 17:41:04 rillig Exp $"; |
73 | #else | | 73 | #else |
74 | #include <sys/cdefs.h> | | 74 | #include <sys/cdefs.h> |
75 | #ifndef lint | | 75 | #ifndef lint |
76 | #if 0 | | 76 | #if 0 |
77 | static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; | | 77 | static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; |
78 | #else | | 78 | #else |
79 | __RCSID("$NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $"); | | 79 | __RCSID("$NetBSD: var.c,v 1.255 2020/07/04 17:41:04 rillig Exp $"); |
80 | #endif | | 80 | #endif |
81 | #endif /* not lint */ | | 81 | #endif /* not lint */ |
82 | #endif | | 82 | #endif |
83 | | | 83 | |
84 | /*- | | 84 | /*- |
85 | * var.c -- | | 85 | * var.c -- |
86 | * Variable-handling functions | | 86 | * Variable-handling functions |
87 | * | | 87 | * |
88 | * Interface: | | 88 | * Interface: |
89 | * Var_Set Set the value of a variable in the given | | 89 | * Var_Set Set the value of a variable in the given |
90 | * context. The variable is created if it doesn't | | 90 | * context. The variable is created if it doesn't |
91 | * yet exist. The value and variable name need not | | 91 | * yet exist. The value and variable name need not |
92 | * be preserved. | | 92 | * be preserved. |
| @@ -1727,26 +1727,31 @@ VarModify(GNode *ctx, Var_Parse_State *v | | | @@ -1727,26 +1727,31 @@ VarModify(GNode *ctx, Var_Parse_State *v |
1727 | addSpace = FALSE; | | 1727 | addSpace = FALSE; |
1728 | | | 1728 | |
1729 | if (vpstate->oneBigWord) { | | 1729 | if (vpstate->oneBigWord) { |
1730 | /* fake what brk_string() would do if there were only one word */ | | 1730 | /* fake what brk_string() would do if there were only one word */ |
1731 | ac = 1; | | 1731 | ac = 1; |
1732 | av = bmake_malloc((ac + 1) * sizeof(char *)); | | 1732 | av = bmake_malloc((ac + 1) * sizeof(char *)); |
1733 | as = bmake_strdup(str); | | 1733 | as = bmake_strdup(str); |
1734 | av[0] = as; | | 1734 | av[0] = as; |
1735 | av[1] = NULL; | | 1735 | av[1] = NULL; |
1736 | } else { | | 1736 | } else { |
1737 | av = brk_string(str, &ac, FALSE, &as); | | 1737 | av = brk_string(str, &ac, FALSE, &as); |
1738 | } | | 1738 | } |
1739 | | | 1739 | |
| | | 1740 | if (DEBUG(VAR)) { |
| | | 1741 | fprintf(debug_file, "VarModify: split \"%s\" into %d words\n", |
| | | 1742 | str, ac); |
| | | 1743 | } |
| | | 1744 | |
1740 | for (i = 0; i < ac; i++) | | 1745 | for (i = 0; i < ac; i++) |
1741 | addSpace = modProc(ctx, vpstate, av[i], addSpace, &buf, datum); | | 1746 | addSpace = modProc(ctx, vpstate, av[i], addSpace, &buf, datum); |
1742 | | | 1747 | |
1743 | free(as); | | 1748 | free(as); |
1744 | free(av); | | 1749 | free(av); |
1745 | | | 1750 | |
1746 | return Buf_Destroy(&buf, FALSE); | | 1751 | return Buf_Destroy(&buf, FALSE); |
1747 | } | | 1752 | } |
1748 | | | 1753 | |
1749 | | | 1754 | |
1750 | static int | | 1755 | static int |
1751 | VarWordCompare(const void *a, const void *b) | | 1756 | VarWordCompare(const void *a, const void *b) |
1752 | { | | 1757 | { |