| @@ -1,1142 +1,1142 @@ | | | @@ -1,1142 +1,1142 @@ |
1 | /* $NetBSD: var.c,v 1.860 2021/03/14 15:15:28 rillig Exp $ */ | | 1 | /* $NetBSD: var.c,v 1.861 2021/03/14 15:19:15 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. |
15 | * 2. Redistributions in binary form must reproduce the above copyright | | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
16 | * notice, this list of conditions and the following disclaimer in the | | 16 | * notice, this list of conditions and the following disclaimer in the |
17 | * documentation and/or other materials provided with the distribution. | | 17 | * documentation and/or other materials provided with the distribution. |
18 | * 3. Neither the name of the University nor the names of its contributors | | 18 | * 3. Neither the name of the University nor the names of its contributors |
19 | * may be used to endorse or promote products derived from this software | | 19 | * may be used to endorse or promote products derived from this software |
20 | * without specific prior written permission. | | 20 | * without specific prior written permission. |
21 | * | | 21 | * |
22 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | | 22 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
23 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | | 23 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
24 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | | 24 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
25 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | | 25 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | | 26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
27 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | | 27 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
28 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 28 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
29 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | | 29 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
30 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | | 30 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | | 31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
32 | * SUCH DAMAGE. | | 32 | * SUCH DAMAGE. |
33 | */ | | 33 | */ |
34 | | | 34 | |
35 | /* | | 35 | /* |
36 | * Copyright (c) 1989 by Berkeley Softworks | | 36 | * Copyright (c) 1989 by Berkeley Softworks |
37 | * All rights reserved. | | 37 | * All rights reserved. |
38 | * | | 38 | * |
39 | * This code is derived from software contributed to Berkeley by | | 39 | * This code is derived from software contributed to Berkeley by |
40 | * Adam de Boor. | | 40 | * Adam de Boor. |
41 | * | | 41 | * |
42 | * Redistribution and use in source and binary forms, with or without | | 42 | * Redistribution and use in source and binary forms, with or without |
43 | * modification, are permitted provided that the following conditions | | 43 | * modification, are permitted provided that the following conditions |
44 | * are met: | | 44 | * are met: |
45 | * 1. Redistributions of source code must retain the above copyright | | 45 | * 1. Redistributions of source code must retain the above copyright |
46 | * notice, this list of conditions and the following disclaimer. | | 46 | * notice, this list of conditions and the following disclaimer. |
47 | * 2. Redistributions in binary form must reproduce the above copyright | | 47 | * 2. Redistributions in binary form must reproduce the above copyright |
48 | * notice, this list of conditions and the following disclaimer in the | | 48 | * notice, this list of conditions and the following disclaimer in the |
49 | * documentation and/or other materials provided with the distribution. | | 49 | * documentation and/or other materials provided with the distribution. |
50 | * 3. All advertising materials mentioning features or use of this software | | 50 | * 3. All advertising materials mentioning features or use of this software |
51 | * must display the following acknowledgement: | | 51 | * must display the following acknowledgement: |
52 | * This product includes software developed by the University of | | 52 | * This product includes software developed by the University of |
53 | * California, Berkeley and its contributors. | | 53 | * California, Berkeley and its contributors. |
54 | * 4. Neither the name of the University nor the names of its contributors | | 54 | * 4. Neither the name of the University nor the names of its contributors |
55 | * may be used to endorse or promote products derived from this software | | 55 | * may be used to endorse or promote products derived from this software |
56 | * without specific prior written permission. | | 56 | * without specific prior written permission. |
57 | * | | 57 | * |
58 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | | 58 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
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 | /* | | 71 | /* |
72 | * Handling of variables and the expressions formed from them. | | 72 | * Handling of variables and the expressions formed from them. |
73 | * | | 73 | * |
74 | * Variables are set using lines of the form VAR=value. Both the variable | | 74 | * Variables are set using lines of the form VAR=value. Both the variable |
75 | * name and the value can contain references to other variables, by using | | 75 | * name and the value can contain references to other variables, by using |
76 | * expressions like ${VAR}, ${VAR:Modifiers}, ${${VARNAME}} or ${VAR:${MODS}}. | | 76 | * expressions like ${VAR}, ${VAR:Modifiers}, ${${VARNAME}} or ${VAR:${MODS}}. |
77 | * | | 77 | * |
78 | * Interface: | | 78 | * Interface: |
79 | * Var_Init Initialize this module. | | 79 | * Var_Init Initialize this module. |
80 | * | | 80 | * |
81 | * Var_End Clean up the module. | | 81 | * Var_End Clean up the module. |
82 | * | | 82 | * |
83 | * Var_Set | | 83 | * Var_Set |
84 | * Var_SetExpand | | 84 | * Var_SetExpand |
85 | * Set the value of the variable, creating it if | | 85 | * Set the value of the variable, creating it if |
86 | * necessary. | | 86 | * necessary. |
87 | * | | 87 | * |
88 | * Var_Append | | 88 | * Var_Append |
89 | * Var_AppendExpand | | 89 | * Var_AppendExpand |
90 | * Append more characters to the variable, creating it if | | 90 | * Append more characters to the variable, creating it if |
91 | * necessary. A space is placed between the old value and | | 91 | * necessary. A space is placed between the old value and |
92 | * the new one. | | 92 | * the new one. |
93 | * | | 93 | * |
94 | * Var_Exists | | 94 | * Var_Exists |
95 | * Var_ExistsExpand | | 95 | * Var_ExistsExpand |
96 | * See if a variable exists. | | 96 | * See if a variable exists. |
97 | * | | 97 | * |
98 | * Var_Value Return the unexpanded value of a variable, or NULL if | | 98 | * Var_Value Return the unexpanded value of a variable, or NULL if |
99 | * the variable is undefined. | | 99 | * the variable is undefined. |
100 | * | | 100 | * |
101 | * Var_Subst Substitute all variable expressions in a string. | | 101 | * Var_Subst Substitute all variable expressions in a string. |
102 | * | | 102 | * |
103 | * Var_Parse Parse a variable expression such as ${VAR:Mpattern}. | | 103 | * Var_Parse Parse a variable expression such as ${VAR:Mpattern}. |
104 | * | | 104 | * |
105 | * Var_Delete | | 105 | * Var_Delete |
106 | * Var_DeleteExpand | | 106 | * Var_DeleteExpand |
107 | * Delete a variable. | | 107 | * Delete a variable. |
108 | * | | 108 | * |
109 | * Var_ReexportVars | | 109 | * Var_ReexportVars |
110 | * Export some or even all variables to the environment | | 110 | * Export some or even all variables to the environment |
111 | * of this process and its child processes. | | 111 | * of this process and its child processes. |
112 | * | | 112 | * |
113 | * Var_Export Export the variable to the environment of this process | | 113 | * Var_Export Export the variable to the environment of this process |
114 | * and its child processes. | | 114 | * and its child processes. |
115 | * | | 115 | * |
116 | * Var_UnExport Don't export the variable anymore. | | 116 | * Var_UnExport Don't export the variable anymore. |
117 | * | | 117 | * |
118 | * Debugging: | | 118 | * Debugging: |
119 | * Var_Stats Print out hashing statistics if in -dh mode. | | 119 | * Var_Stats Print out hashing statistics if in -dh mode. |
120 | * | | 120 | * |
121 | * Var_Dump Print out all variables defined in the given scope. | | 121 | * Var_Dump Print out all variables defined in the given scope. |
122 | * | | 122 | * |
123 | * XXX: There's a lot of almost duplicate code in these functions that only | | 123 | * XXX: There's a lot of almost duplicate code in these functions that only |
124 | * differs in subtle details that are not mentioned in the manual page. | | 124 | * differs in subtle details that are not mentioned in the manual page. |
125 | */ | | 125 | */ |
126 | | | 126 | |
127 | #include <sys/stat.h> | | 127 | #include <sys/stat.h> |
128 | #ifndef NO_REGEX | | 128 | #ifndef NO_REGEX |
129 | #include <sys/types.h> | | 129 | #include <sys/types.h> |
130 | #include <regex.h> | | 130 | #include <regex.h> |
131 | #endif | | 131 | #endif |
132 | #include <errno.h> | | 132 | #include <errno.h> |
133 | #include <inttypes.h> | | 133 | #include <inttypes.h> |
134 | #include <limits.h> | | 134 | #include <limits.h> |
135 | #include <time.h> | | 135 | #include <time.h> |
136 | | | 136 | |
137 | #include "make.h" | | 137 | #include "make.h" |
138 | #include "dir.h" | | 138 | #include "dir.h" |
139 | #include "job.h" | | 139 | #include "job.h" |
140 | #include "metachar.h" | | 140 | #include "metachar.h" |
141 | | | 141 | |
142 | /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ | | 142 | /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ |
143 | MAKE_RCSID("$NetBSD: var.c,v 1.860 2021/03/14 15:15:28 rillig Exp $"); | | 143 | MAKE_RCSID("$NetBSD: var.c,v 1.861 2021/03/14 15:19:15 rillig Exp $"); |
144 | | | 144 | |
145 | typedef enum VarFlags { | | 145 | typedef enum VarFlags { |
146 | VFL_NONE = 0, | | 146 | VFL_NONE = 0, |
147 | | | 147 | |
148 | /* | | 148 | /* |
149 | * The variable's value is currently being used by Var_Parse or | | 149 | * The variable's value is currently being used by Var_Parse or |
150 | * Var_Subst. This marker is used to avoid endless recursion. | | 150 | * Var_Subst. This marker is used to avoid endless recursion. |
151 | */ | | 151 | */ |
152 | VFL_IN_USE = 1 << 0, | | 152 | VFL_IN_USE = 1 << 0, |
153 | | | 153 | |
154 | /* | | 154 | /* |
155 | * The variable comes from the environment. | | 155 | * The variable comes from the environment. |
156 | * These variables are not registered in any GNode, therefore they | | 156 | * These variables are not registered in any GNode, therefore they |
157 | * must be freed as soon as they are not used anymore. | | 157 | * must be freed as soon as they are not used anymore. |
158 | */ | | 158 | */ |
159 | VFL_FROM_ENV = 1 << 1, | | 159 | VFL_FROM_ENV = 1 << 1, |
160 | | | 160 | |
161 | /* | | 161 | /* |
162 | * The variable is exported to the environment, to be used by child | | 162 | * The variable is exported to the environment, to be used by child |
163 | * processes. | | 163 | * processes. |
164 | */ | | 164 | */ |
165 | VFL_EXPORTED = 1 << 2, | | 165 | VFL_EXPORTED = 1 << 2, |
166 | | | 166 | |
167 | /* | | 167 | /* |
168 | * At the point where this variable was exported, it contained an | | 168 | * At the point where this variable was exported, it contained an |
169 | * unresolved reference to another variable. Before any child | | 169 | * unresolved reference to another variable. Before any child |
170 | * process is started, it needs to be exported again, in the hope | | 170 | * process is started, it needs to be exported again, in the hope |
171 | * that the referenced variable can then be resolved. | | 171 | * that the referenced variable can then be resolved. |
172 | */ | | 172 | */ |
173 | VFL_REEXPORT = 1 << 3, | | 173 | VFL_REEXPORT = 1 << 3, |
174 | | | 174 | |
175 | /* The variable came from the command line. */ | | 175 | /* The variable came from the command line. */ |
176 | VFL_FROM_CMD = 1 << 4, | | 176 | VFL_FROM_CMD = 1 << 4, |
177 | | | 177 | |
178 | /* | | 178 | /* |
179 | * The variable value cannot be changed anymore, and the variable | | 179 | * The variable value cannot be changed anymore, and the variable |
180 | * cannot be deleted. Any attempts to do so are silently ignored, | | 180 | * cannot be deleted. Any attempts to do so are silently ignored, |
181 | * they are logged with -dv though. | | 181 | * they are logged with -dv though. |
182 | * | | 182 | * |
183 | * See VAR_SET_READONLY. | | 183 | * See VAR_SET_READONLY. |
184 | */ | | 184 | */ |
185 | VFL_READONLY = 1 << 5 | | 185 | VFL_READONLY = 1 << 5 |
186 | } VarFlags; | | 186 | } VarFlags; |
187 | | | 187 | |
188 | /* | | 188 | /* |
189 | * Variables are defined using one of the VAR=value assignments. Their | | 189 | * Variables are defined using one of the VAR=value assignments. Their |
190 | * value can be queried by expressions such as $V, ${VAR}, or with modifiers | | 190 | * value can be queried by expressions such as $V, ${VAR}, or with modifiers |
191 | * such as ${VAR:S,from,to,g:Q}. | | 191 | * such as ${VAR:S,from,to,g:Q}. |
192 | * | | 192 | * |
193 | * There are 3 kinds of variables: scope variables, environment variables, | | 193 | * There are 3 kinds of variables: scope variables, environment variables, |
194 | * undefined variables. | | 194 | * undefined variables. |
195 | * | | 195 | * |
196 | * Scope variables are stored in a GNode.scope. The only way to undefine | | 196 | * Scope variables are stored in a GNode.scope. The only way to undefine |
197 | * a scope variable is using the .undef directive. In particular, it must | | 197 | * a scope variable is using the .undef directive. In particular, it must |
198 | * not be possible to undefine a variable during the evaluation of an | | 198 | * not be possible to undefine a variable during the evaluation of an |
199 | * expression, or Var.name might point nowhere. | | 199 | * expression, or Var.name might point nowhere. |
200 | * | | 200 | * |
201 | * Environment variables are temporary. They are returned by VarFind, and | | 201 | * Environment variables are temporary. They are returned by VarFind, and |
202 | * after using them, they must be freed using VarFreeEnv. | | 202 | * after using them, they must be freed using VarFreeEnv. |
203 | * | | 203 | * |
204 | * Undefined variables occur during evaluation of variable expressions such | | 204 | * Undefined variables occur during evaluation of variable expressions such |
205 | * as ${UNDEF:Ufallback} in Var_Parse and ApplyModifiers. | | 205 | * as ${UNDEF:Ufallback} in Var_Parse and ApplyModifiers. |
206 | */ | | 206 | */ |
207 | typedef struct Var { | | 207 | typedef struct Var { |
208 | /* | | 208 | /* |
209 | * The name of the variable, once set, doesn't change anymore. | | 209 | * The name of the variable, once set, doesn't change anymore. |
210 | * For scope variables, it aliases the corresponding HashEntry name. | | 210 | * For scope variables, it aliases the corresponding HashEntry name. |
211 | * For environment and undefined variables, it is allocated. | | 211 | * For environment and undefined variables, it is allocated. |
212 | */ | | 212 | */ |
213 | FStr name; | | 213 | FStr name; |
214 | | | 214 | |
215 | /* The unexpanded value of the variable. */ | | 215 | /* The unexpanded value of the variable. */ |
216 | Buffer val; | | 216 | Buffer val; |
217 | /* Miscellaneous status flags. */ | | 217 | /* Miscellaneous status flags. */ |
218 | VarFlags flags; | | 218 | VarFlags flags; |
219 | } Var; | | 219 | } Var; |
220 | | | 220 | |
221 | /* | | 221 | /* |
222 | * Exporting variables is expensive and may leak memory, so skip it if we | | 222 | * Exporting variables is expensive and may leak memory, so skip it if we |
223 | * can. | | 223 | * can. |
224 | * | | 224 | * |
225 | * To avoid this, it might be worth encapsulating the environment variables | | 225 | * To avoid this, it might be worth encapsulating the environment variables |
226 | * in a separate data structure called EnvVars. | | 226 | * in a separate data structure called EnvVars. |
227 | */ | | 227 | */ |
228 | typedef enum VarExportedMode { | | 228 | typedef enum VarExportedMode { |
229 | VAR_EXPORTED_NONE, | | 229 | VAR_EXPORTED_NONE, |
230 | VAR_EXPORTED_SOME, | | 230 | VAR_EXPORTED_SOME, |
231 | VAR_EXPORTED_ALL | | 231 | VAR_EXPORTED_ALL |
232 | } VarExportedMode; | | 232 | } VarExportedMode; |
233 | | | 233 | |
234 | typedef enum UnexportWhat { | | 234 | typedef enum UnexportWhat { |
235 | /* Unexport the variables given by name. */ | | 235 | /* Unexport the variables given by name. */ |
236 | UNEXPORT_NAMED, | | 236 | UNEXPORT_NAMED, |
237 | /* | | 237 | /* |
238 | * Unexport all globals previously exported, but keep the environment | | 238 | * Unexport all globals previously exported, but keep the environment |
239 | * inherited from the parent. | | 239 | * inherited from the parent. |
240 | */ | | 240 | */ |
241 | UNEXPORT_ALL, | | 241 | UNEXPORT_ALL, |
242 | /* | | 242 | /* |
243 | * Unexport all globals previously exported and clear the environment | | 243 | * Unexport all globals previously exported and clear the environment |
244 | * inherited from the parent. | | 244 | * inherited from the parent. |
245 | */ | | 245 | */ |
246 | UNEXPORT_ENV | | 246 | UNEXPORT_ENV |
247 | } UnexportWhat; | | 247 | } UnexportWhat; |
248 | | | 248 | |
249 | /* Flags for pattern matching in the :S and :C modifiers */ | | 249 | /* Flags for pattern matching in the :S and :C modifiers */ |
250 | typedef struct VarPatternFlags { | | 250 | typedef struct VarPatternFlags { |
251 | | | 251 | |
252 | /* Replace as often as possible ('g') */ | | 252 | /* Replace as often as possible ('g') */ |
253 | Boolean subGlobal: 1; | | 253 | Boolean subGlobal: 1; |
254 | /* Replace only once ('1') */ | | 254 | /* Replace only once ('1') */ |
255 | Boolean subOnce: 1; | | 255 | Boolean subOnce: 1; |
256 | /* Match at start of word ('^') */ | | 256 | /* Match at start of word ('^') */ |
257 | Boolean anchorStart: 1; | | 257 | Boolean anchorStart: 1; |
258 | /* Match at end of word ('$') */ | | 258 | /* Match at end of word ('$') */ |
259 | Boolean anchorEnd: 1; | | 259 | Boolean anchorEnd: 1; |
260 | } VarPatternFlags; | | 260 | } VarPatternFlags; |
261 | | | 261 | |
262 | /* SepBuf builds a string from words interleaved with separators. */ | | 262 | /* SepBuf builds a string from words interleaved with separators. */ |
263 | typedef struct SepBuf { | | 263 | typedef struct SepBuf { |
264 | Buffer buf; | | 264 | Buffer buf; |
265 | Boolean needSep; | | 265 | Boolean needSep; |
266 | /* Usually ' ', but see the ':ts' modifier. */ | | 266 | /* Usually ' ', but see the ':ts' modifier. */ |
267 | char sep; | | 267 | char sep; |
268 | } SepBuf; | | 268 | } SepBuf; |
269 | | | 269 | |
270 | | | 270 | |
271 | ENUM_FLAGS_RTTI_4(VarEvalFlags, | | 271 | ENUM_FLAGS_RTTI_4(VarEvalFlags, |
272 | VARE_UNDEFERR, VARE_WANTRES, VARE_KEEP_DOLLAR, | | 272 | VARE_UNDEFERR, VARE_WANTRES, VARE_KEEP_DOLLAR, |
273 | VARE_KEEP_UNDEF); | | 273 | VARE_KEEP_UNDEF); |
274 | | | 274 | |
275 | /* | | 275 | /* |
276 | * This lets us tell if we have replaced the original environ | | 276 | * This lets us tell if we have replaced the original environ |
277 | * (which we cannot free). | | 277 | * (which we cannot free). |
278 | */ | | 278 | */ |
279 | char **savedEnv = NULL; | | 279 | char **savedEnv = NULL; |
280 | | | 280 | |
281 | /* | | 281 | /* |
282 | * Special return value for Var_Parse, indicating a parse error. It may be | | 282 | * Special return value for Var_Parse, indicating a parse error. It may be |
283 | * caused by an undefined variable, a syntax error in a modifier or | | 283 | * caused by an undefined variable, a syntax error in a modifier or |
284 | * something entirely different. | | 284 | * something entirely different. |
285 | */ | | 285 | */ |
286 | char var_Error[] = ""; | | 286 | char var_Error[] = ""; |
287 | | | 287 | |
288 | /* | | 288 | /* |
289 | * Special return value for Var_Parse, indicating an undefined variable in | | 289 | * Special return value for Var_Parse, indicating an undefined variable in |
290 | * a case where VARE_UNDEFERR is not set. This undefined variable is | | 290 | * a case where VARE_UNDEFERR is not set. This undefined variable is |
291 | * typically a dynamic variable such as ${.TARGET}, whose expansion needs to | | 291 | * typically a dynamic variable such as ${.TARGET}, whose expansion needs to |
292 | * be deferred until it is defined in an actual target. | | 292 | * be deferred until it is defined in an actual target. |
293 | * | | 293 | * |
294 | * See VARE_KEEP_UNDEF. | | 294 | * See VARE_KEEP_UNDEF. |
295 | */ | | 295 | */ |
296 | static char varUndefined[] = ""; | | 296 | static char varUndefined[] = ""; |
297 | | | 297 | |
298 | /* | | 298 | /* |
299 | * Traditionally this make consumed $$ during := like any other expansion. | | 299 | * Traditionally this make consumed $$ during := like any other expansion. |
300 | * Other make's do not, and this make follows straight since 2016-01-09. | | 300 | * Other make's do not, and this make follows straight since 2016-01-09. |
301 | * | | 301 | * |
302 | * This knob allows controlling the behavior. | | 302 | * This knob allows controlling the behavior. |
303 | * FALSE to consume $$ during := assignment. | | 303 | * FALSE to consume $$ during := assignment. |
304 | * TRUE to preserve $$ during := assignment. | | 304 | * TRUE to preserve $$ during := assignment. |
305 | */ | | 305 | */ |
306 | #define MAKE_SAVE_DOLLARS ".MAKE.SAVE_DOLLARS" | | 306 | #define MAKE_SAVE_DOLLARS ".MAKE.SAVE_DOLLARS" |
307 | static Boolean save_dollars = TRUE; | | 307 | static Boolean save_dollars = TRUE; |
308 | | | 308 | |
309 | /* | | 309 | /* |
310 | * A scope collects variable names and their values. | | 310 | * A scope collects variable names and their values. |
311 | * | | 311 | * |
312 | * The main scope is SCOPE_GLOBAL, which contains the variables that are set | | 312 | * The main scope is SCOPE_GLOBAL, which contains the variables that are set |
313 | * in the makefiles. SCOPE_INTERNAL acts as a fallback for SCOPE_GLOBAL and | | 313 | * in the makefiles. SCOPE_INTERNAL acts as a fallback for SCOPE_GLOBAL and |
314 | * contains some internal make variables. These internal variables can thus | | 314 | * contains some internal make variables. These internal variables can thus |
315 | * be overridden, they can also be restored by undefining the overriding | | 315 | * be overridden, they can also be restored by undefining the overriding |
316 | * variable. | | 316 | * variable. |
317 | * | | 317 | * |
318 | * SCOPE_CMDLINE contains variables from the command line arguments. These | | 318 | * SCOPE_CMDLINE contains variables from the command line arguments. These |
319 | * override variables from SCOPE_GLOBAL. | | 319 | * override variables from SCOPE_GLOBAL. |
320 | * | | 320 | * |
321 | * There is no scope for environment variables, these are generated on-the-fly | | 321 | * There is no scope for environment variables, these are generated on-the-fly |
322 | * whenever they are referenced. If there were such a scope, each change to | | 322 | * whenever they are referenced. If there were such a scope, each change to |
323 | * environment variables would have to be reflected in that scope, which may | | 323 | * environment variables would have to be reflected in that scope, which may |
324 | * be simpler or more complex than the current implementation. | | 324 | * be simpler or more complex than the current implementation. |
325 | * | | 325 | * |
326 | * Each target has its own scope, containing the 7 target-local variables | | 326 | * Each target has its own scope, containing the 7 target-local variables |
327 | * .TARGET, .ALLSRC, etc. No other variables are in these scopes. | | 327 | * .TARGET, .ALLSRC, etc. No other variables are in these scopes. |
328 | */ | | 328 | */ |
329 | | | 329 | |
330 | GNode *SCOPE_CMDLINE; | | 330 | GNode *SCOPE_CMDLINE; |
331 | GNode *SCOPE_GLOBAL; | | 331 | GNode *SCOPE_GLOBAL; |
332 | GNode *SCOPE_INTERNAL; | | 332 | GNode *SCOPE_INTERNAL; |
333 | | | 333 | |
334 | ENUM_FLAGS_RTTI_6(VarFlags, | | 334 | ENUM_FLAGS_RTTI_6(VarFlags, |
335 | VFL_IN_USE, VFL_FROM_ENV, | | 335 | VFL_IN_USE, VFL_FROM_ENV, |
336 | VFL_EXPORTED, VFL_REEXPORT, VFL_FROM_CMD, VFL_READONLY); | | 336 | VFL_EXPORTED, VFL_REEXPORT, VFL_FROM_CMD, VFL_READONLY); |
337 | | | 337 | |
338 | static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE; | | 338 | static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE; |
339 | | | 339 | |
340 | | | 340 | |
341 | static Var * | | 341 | static Var * |
342 | VarNew(FStr name, const char *value, VarFlags flags) | | 342 | VarNew(FStr name, const char *value, VarFlags flags) |
343 | { | | 343 | { |
344 | size_t value_len = strlen(value); | | 344 | size_t value_len = strlen(value); |
345 | Var *var = bmake_malloc(sizeof *var); | | 345 | Var *var = bmake_malloc(sizeof *var); |
346 | var->name = name; | | 346 | var->name = name; |
347 | Buf_InitSize(&var->val, value_len + 1); | | 347 | Buf_InitSize(&var->val, value_len + 1); |
348 | Buf_AddBytes(&var->val, value, value_len); | | 348 | Buf_AddBytes(&var->val, value, value_len); |
349 | var->flags = flags; | | 349 | var->flags = flags; |
350 | return var; | | 350 | return var; |
351 | } | | 351 | } |
352 | | | 352 | |
353 | static const char * | | 353 | static const char * |
354 | CanonicalVarname(const char *name) | | 354 | CanonicalVarname(const char *name) |
355 | { | | 355 | { |
356 | if (*name == '.' && ch_isupper(name[1])) { | | 356 | if (*name == '.' && ch_isupper(name[1])) { |
357 | switch (name[1]) { | | 357 | switch (name[1]) { |
358 | case 'A': | | 358 | case 'A': |
359 | if (strcmp(name, ".ALLSRC") == 0) | | 359 | if (strcmp(name, ".ALLSRC") == 0) |
360 | name = ALLSRC; | | 360 | name = ALLSRC; |
361 | if (strcmp(name, ".ARCHIVE") == 0) | | 361 | if (strcmp(name, ".ARCHIVE") == 0) |
362 | name = ARCHIVE; | | 362 | name = ARCHIVE; |
363 | break; | | 363 | break; |
364 | case 'I': | | 364 | case 'I': |
365 | if (strcmp(name, ".IMPSRC") == 0) | | 365 | if (strcmp(name, ".IMPSRC") == 0) |
366 | name = IMPSRC; | | 366 | name = IMPSRC; |
367 | break; | | 367 | break; |
368 | case 'M': | | 368 | case 'M': |
369 | if (strcmp(name, ".MEMBER") == 0) | | 369 | if (strcmp(name, ".MEMBER") == 0) |
370 | name = MEMBER; | | 370 | name = MEMBER; |
371 | break; | | 371 | break; |
372 | case 'O': | | 372 | case 'O': |
373 | if (strcmp(name, ".OODATE") == 0) | | 373 | if (strcmp(name, ".OODATE") == 0) |
374 | name = OODATE; | | 374 | name = OODATE; |
375 | break; | | 375 | break; |
376 | case 'P': | | 376 | case 'P': |
377 | if (strcmp(name, ".PREFIX") == 0) | | 377 | if (strcmp(name, ".PREFIX") == 0) |
378 | name = PREFIX; | | 378 | name = PREFIX; |
379 | break; | | 379 | break; |
380 | case 'S': | | 380 | case 'S': |
381 | if (strcmp(name, ".SHELL") == 0) { | | 381 | if (strcmp(name, ".SHELL") == 0) { |
382 | if (shellPath == NULL) | | 382 | if (shellPath == NULL) |
383 | Shell_Init(); | | 383 | Shell_Init(); |
384 | } | | 384 | } |
385 | break; | | 385 | break; |
386 | case 'T': | | 386 | case 'T': |
387 | if (strcmp(name, ".TARGET") == 0) | | 387 | if (strcmp(name, ".TARGET") == 0) |
388 | name = TARGET; | | 388 | name = TARGET; |
389 | break; | | 389 | break; |
390 | } | | 390 | } |
391 | } | | 391 | } |
392 | | | 392 | |
393 | /* GNU make has an additional alias $^ == ${.ALLSRC}. */ | | 393 | /* GNU make has an additional alias $^ == ${.ALLSRC}. */ |
394 | | | 394 | |
395 | return name; | | 395 | return name; |
396 | } | | 396 | } |
397 | | | 397 | |
398 | static Var * | | 398 | static Var * |
399 | GNode_FindVar(GNode *scope, const char *varname, unsigned int hash) | | 399 | GNode_FindVar(GNode *scope, const char *varname, unsigned int hash) |
400 | { | | 400 | { |
401 | return HashTable_FindValueHash(&scope->vars, varname, hash); | | 401 | return HashTable_FindValueHash(&scope->vars, varname, hash); |
402 | } | | 402 | } |
403 | | | 403 | |
404 | /* | | 404 | /* |
405 | * Find the variable in the scope, and maybe in other scopes as well. | | 405 | * Find the variable in the scope, and maybe in other scopes as well. |
406 | * | | 406 | * |
407 | * Input: | | 407 | * Input: |
408 | * name name to find, is not expanded any further | | 408 | * name name to find, is not expanded any further |
409 | * scope scope in which to look first | | 409 | * scope scope in which to look first |
410 | * elsewhere TRUE to look in other scopes as well | | 410 | * elsewhere TRUE to look in other scopes as well |
411 | * | | 411 | * |
412 | * Results: | | 412 | * Results: |
413 | * The found variable, or NULL if the variable does not exist. | | 413 | * The found variable, or NULL if the variable does not exist. |
414 | * If the variable is an environment variable, it must be freed using | | 414 | * If the variable is an environment variable, it must be freed using |
415 | * VarFreeEnv after use. | | 415 | * VarFreeEnv after use. |
416 | */ | | 416 | */ |
417 | static Var * | | 417 | static Var * |
418 | VarFind(const char *name, GNode *scope, Boolean elsewhere) | | 418 | VarFind(const char *name, GNode *scope, Boolean elsewhere) |
419 | { | | 419 | { |
420 | Var *var; | | 420 | Var *var; |
421 | unsigned int nameHash; | | 421 | unsigned int nameHash; |
422 | | | 422 | |
423 | /* Replace '.TARGET' with '@', likewise for other local variables. */ | | 423 | /* Replace '.TARGET' with '@', likewise for other local variables. */ |
424 | name = CanonicalVarname(name); | | 424 | name = CanonicalVarname(name); |
425 | nameHash = Hash_Hash(name); | | 425 | nameHash = Hash_Hash(name); |
426 | | | 426 | |
427 | var = GNode_FindVar(scope, name, nameHash); | | 427 | var = GNode_FindVar(scope, name, nameHash); |
428 | if (!elsewhere) | | 428 | if (!elsewhere) |
429 | return var; | | 429 | return var; |
430 | | | 430 | |
431 | if (var == NULL && scope != SCOPE_CMDLINE) | | 431 | if (var == NULL && scope != SCOPE_CMDLINE) |
432 | var = GNode_FindVar(SCOPE_CMDLINE, name, nameHash); | | 432 | var = GNode_FindVar(SCOPE_CMDLINE, name, nameHash); |
433 | | | 433 | |
434 | if (!opts.checkEnvFirst && var == NULL && scope != SCOPE_GLOBAL) { | | 434 | if (!opts.checkEnvFirst && var == NULL && scope != SCOPE_GLOBAL) { |
435 | var = GNode_FindVar(SCOPE_GLOBAL, name, nameHash); | | 435 | var = GNode_FindVar(SCOPE_GLOBAL, name, nameHash); |
436 | if (var == NULL && scope != SCOPE_INTERNAL) { | | 436 | if (var == NULL && scope != SCOPE_INTERNAL) { |
437 | /* SCOPE_INTERNAL is subordinate to SCOPE_GLOBAL */ | | 437 | /* SCOPE_INTERNAL is subordinate to SCOPE_GLOBAL */ |
438 | var = GNode_FindVar(SCOPE_INTERNAL, name, nameHash); | | 438 | var = GNode_FindVar(SCOPE_INTERNAL, name, nameHash); |
439 | } | | 439 | } |
440 | } | | 440 | } |
441 | | | 441 | |
442 | if (var == NULL) { | | 442 | if (var == NULL) { |
443 | char *env; | | 443 | char *env; |
444 | | | 444 | |
445 | if ((env = getenv(name)) != NULL) { | | 445 | if ((env = getenv(name)) != NULL) { |
446 | char *varname = bmake_strdup(name); | | 446 | char *varname = bmake_strdup(name); |
447 | return VarNew(FStr_InitOwn(varname), env, VFL_FROM_ENV); | | 447 | return VarNew(FStr_InitOwn(varname), env, VFL_FROM_ENV); |
448 | } | | 448 | } |
449 | | | 449 | |
450 | if (opts.checkEnvFirst && scope != SCOPE_GLOBAL) { | | 450 | if (opts.checkEnvFirst && scope != SCOPE_GLOBAL) { |
451 | var = GNode_FindVar(SCOPE_GLOBAL, name, nameHash); | | 451 | var = GNode_FindVar(SCOPE_GLOBAL, name, nameHash); |
452 | if (var == NULL && scope != SCOPE_INTERNAL) | | 452 | if (var == NULL && scope != SCOPE_INTERNAL) |
453 | var = GNode_FindVar(SCOPE_INTERNAL, name, | | 453 | var = GNode_FindVar(SCOPE_INTERNAL, name, |
454 | nameHash); | | 454 | nameHash); |
455 | return var; | | 455 | return var; |
456 | } | | 456 | } |
457 | | | 457 | |
458 | return NULL; | | 458 | return NULL; |
459 | } | | 459 | } |
460 | | | 460 | |
461 | return var; | | 461 | return var; |
462 | } | | 462 | } |
463 | | | 463 | |
464 | /* | | 464 | /* |
465 | * If the variable is an environment variable, free it, including its value. | | 465 | * If the variable is an environment variable, free it, including its value. |
466 | * | | 466 | * |
467 | * Results: | | 467 | * Results: |
468 | * TRUE if it was an environment variable, | | 468 | * TRUE if it was an environment variable, |
469 | * FALSE if it is still a regular variable. | | 469 | * FALSE if it is still a regular variable. |
470 | */ | | 470 | */ |
471 | static void | | 471 | static void |
472 | VarFreeEnv(Var *v) | | 472 | VarFreeEnv(Var *v) |
473 | { | | 473 | { |
474 | if (!(v->flags & VFL_FROM_ENV)) | | 474 | if (!(v->flags & VFL_FROM_ENV)) |
475 | return; | | 475 | return; |
476 | | | 476 | |
477 | FStr_Done(&v->name); | | 477 | FStr_Done(&v->name); |
478 | Buf_Done(&v->val); | | 478 | Buf_Done(&v->val); |
479 | free(v); | | 479 | free(v); |
480 | } | | 480 | } |
481 | | | 481 | |
482 | /* Add a new variable of the given name and value to the given scope. */ | | 482 | /* Add a new variable of the given name and value to the given scope. */ |
483 | static Var * | | 483 | static Var * |
484 | VarAdd(const char *name, const char *value, GNode *scope, VarSetFlags flags) | | 484 | VarAdd(const char *name, const char *value, GNode *scope, VarSetFlags flags) |
485 | { | | 485 | { |
486 | HashEntry *he = HashTable_CreateEntry(&scope->vars, name, NULL); | | 486 | HashEntry *he = HashTable_CreateEntry(&scope->vars, name, NULL); |
487 | Var *v = VarNew(FStr_InitRefer(/* aliased to */ he->key), value, | | 487 | Var *v = VarNew(FStr_InitRefer(/* aliased to */ he->key), value, |
488 | flags & VAR_SET_READONLY ? VFL_READONLY : VFL_NONE); | | 488 | flags & VAR_SET_READONLY ? VFL_READONLY : VFL_NONE); |
489 | HashEntry_Set(he, v); | | 489 | HashEntry_Set(he, v); |
490 | DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, value); | | 490 | DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, value); |
491 | return v; | | 491 | return v; |
492 | } | | 492 | } |
493 | | | 493 | |
494 | /* | | 494 | /* |
495 | * Remove a variable from a scope, freeing all related memory as well. | | 495 | * Remove a variable from a scope, freeing all related memory as well. |
496 | * The variable name is kept as-is, it is not expanded. | | 496 | * The variable name is kept as-is, it is not expanded. |
497 | */ | | 497 | */ |
498 | void | | 498 | void |
499 | Var_Delete(GNode *scope, const char *varname) | | 499 | Var_Delete(GNode *scope, const char *varname) |
500 | { | | 500 | { |
501 | HashEntry *he = HashTable_FindEntry(&scope->vars, varname); | | 501 | HashEntry *he = HashTable_FindEntry(&scope->vars, varname); |
502 | Var *v; | | 502 | Var *v; |
503 | | | 503 | |
504 | if (he == NULL) { | | 504 | if (he == NULL) { |
505 | DEBUG2(VAR, "%s:delete %s (not found)\n", scope->name, varname); | | 505 | DEBUG2(VAR, "%s:delete %s (not found)\n", scope->name, varname); |
506 | return; | | 506 | return; |
507 | } | | 507 | } |
508 | | | 508 | |
509 | DEBUG2(VAR, "%s:delete %s\n", scope->name, varname); | | 509 | DEBUG2(VAR, "%s:delete %s\n", scope->name, varname); |
510 | v = he->value; | | 510 | v = he->value; |
511 | if (v->flags & VFL_EXPORTED) | | 511 | if (v->flags & VFL_EXPORTED) |
512 | unsetenv(v->name.str); | | 512 | unsetenv(v->name.str); |
513 | if (strcmp(v->name.str, MAKE_EXPORTED) == 0) | | 513 | if (strcmp(v->name.str, MAKE_EXPORTED) == 0) |
514 | var_exportedVars = VAR_EXPORTED_NONE; | | 514 | var_exportedVars = VAR_EXPORTED_NONE; |
515 | assert(v->name.freeIt == NULL); | | 515 | assert(v->name.freeIt == NULL); |
516 | HashTable_DeleteEntry(&scope->vars, he); | | 516 | HashTable_DeleteEntry(&scope->vars, he); |
517 | Buf_Done(&v->val); | | 517 | Buf_Done(&v->val); |
518 | free(v); | | 518 | free(v); |
519 | } | | 519 | } |
520 | | | 520 | |
521 | /* | | 521 | /* |
522 | * Remove a variable from a scope, freeing all related memory as well. | | 522 | * Remove a variable from a scope, freeing all related memory as well. |
523 | * The variable name is expanded once. | | 523 | * The variable name is expanded once. |
524 | */ | | 524 | */ |
525 | void | | 525 | void |
526 | Var_DeleteExpand(GNode *scope, const char *name) | | 526 | Var_DeleteExpand(GNode *scope, const char *name) |
527 | { | | 527 | { |
528 | FStr varname = FStr_InitRefer(name); | | 528 | FStr varname = FStr_InitRefer(name); |
529 | | | 529 | |
530 | if (strchr(varname.str, '$') != NULL) { | | 530 | if (strchr(varname.str, '$') != NULL) { |
531 | char *expanded; | | 531 | char *expanded; |
532 | (void)Var_Subst(varname.str, SCOPE_GLOBAL, VARE_WANTRES, | | 532 | (void)Var_Subst(varname.str, SCOPE_GLOBAL, VARE_WANTRES, |
533 | &expanded); | | 533 | &expanded); |
534 | /* TODO: handle errors */ | | 534 | /* TODO: handle errors */ |
535 | varname = FStr_InitOwn(expanded); | | 535 | varname = FStr_InitOwn(expanded); |
536 | } | | 536 | } |
537 | | | 537 | |
538 | Var_Delete(scope, varname.str); | | 538 | Var_Delete(scope, varname.str); |
539 | FStr_Done(&varname); | | 539 | FStr_Done(&varname); |
540 | } | | 540 | } |
541 | | | 541 | |
542 | /* | | 542 | /* |
543 | * Undefine one or more variables from the global scope. | | 543 | * Undefine one or more variables from the global scope. |
544 | * The argument is expanded exactly once and then split into words. | | 544 | * The argument is expanded exactly once and then split into words. |
545 | */ | | 545 | */ |
546 | void | | 546 | void |
547 | Var_Undef(const char *arg) | | 547 | Var_Undef(const char *arg) |
548 | { | | 548 | { |
549 | VarParseResult vpr; | | 549 | VarParseResult vpr; |
550 | char *expanded; | | 550 | char *expanded; |
551 | Words varnames; | | 551 | Words varnames; |
552 | size_t i; | | 552 | size_t i; |
553 | | | 553 | |
554 | if (arg[0] == '\0') { | | 554 | if (arg[0] == '\0') { |
555 | Parse_Error(PARSE_FATAL, | | 555 | Parse_Error(PARSE_FATAL, |
556 | "The .undef directive requires an argument"); | | 556 | "The .undef directive requires an argument"); |
557 | return; | | 557 | return; |
558 | } | | 558 | } |
559 | | | 559 | |
560 | vpr = Var_Subst(arg, SCOPE_GLOBAL, VARE_WANTRES, &expanded); | | 560 | vpr = Var_Subst(arg, SCOPE_GLOBAL, VARE_WANTRES, &expanded); |
561 | if (vpr != VPR_OK) { | | 561 | if (vpr != VPR_OK) { |
562 | Parse_Error(PARSE_FATAL, | | 562 | Parse_Error(PARSE_FATAL, |
563 | "Error in variable names to be undefined"); | | 563 | "Error in variable names to be undefined"); |
564 | return; | | 564 | return; |
565 | } | | 565 | } |
566 | | | 566 | |
567 | varnames = Str_Words(expanded, FALSE); | | 567 | varnames = Str_Words(expanded, FALSE); |
568 | if (varnames.len == 1 && varnames.words[0][0] == '\0') | | 568 | if (varnames.len == 1 && varnames.words[0][0] == '\0') |
569 | varnames.len = 0; | | 569 | varnames.len = 0; |
570 | | | 570 | |
571 | for (i = 0; i < varnames.len; i++) { | | 571 | for (i = 0; i < varnames.len; i++) { |
572 | const char *varname = varnames.words[i]; | | 572 | const char *varname = varnames.words[i]; |
573 | Global_Delete(varname); | | 573 | Global_Delete(varname); |
574 | } | | 574 | } |
575 | | | 575 | |
576 | Words_Free(varnames); | | 576 | Words_Free(varnames); |
577 | free(expanded); | | 577 | free(expanded); |
578 | } | | 578 | } |
579 | | | 579 | |
580 | static Boolean | | 580 | static Boolean |
581 | MayExport(const char *name) | | 581 | MayExport(const char *name) |
582 | { | | 582 | { |
583 | if (name[0] == '.') | | 583 | if (name[0] == '.') |
584 | return FALSE; /* skip internals */ | | 584 | return FALSE; /* skip internals */ |
585 | if (name[0] == '-') | | 585 | if (name[0] == '-') |
586 | return FALSE; /* skip misnamed variables */ | | 586 | return FALSE; /* skip misnamed variables */ |
587 | if (name[1] == '\0') { | | 587 | if (name[1] == '\0') { |
588 | /* | | 588 | /* |
589 | * A single char. | | 589 | * A single char. |
590 | * If it is one of the variables that should only appear in | | 590 | * If it is one of the variables that should only appear in |
591 | * local scope, skip it, else we can get Var_Subst | | 591 | * local scope, skip it, else we can get Var_Subst |
592 | * into a loop. | | 592 | * into a loop. |
593 | */ | | 593 | */ |
594 | switch (name[0]) { | | 594 | switch (name[0]) { |
595 | case '@': | | 595 | case '@': |
596 | case '%': | | 596 | case '%': |
597 | case '*': | | 597 | case '*': |
598 | case '!': | | 598 | case '!': |
599 | return FALSE; | | 599 | return FALSE; |
600 | } | | 600 | } |
601 | } | | 601 | } |
602 | return TRUE; | | 602 | return TRUE; |
603 | } | | 603 | } |
604 | | | 604 | |
605 | static Boolean | | 605 | static Boolean |
606 | ExportVarEnv(Var *v) | | 606 | ExportVarEnv(Var *v) |
607 | { | | 607 | { |
608 | const char *name = v->name.str; | | 608 | const char *name = v->name.str; |
609 | char *val = v->val.data; | | 609 | char *val = v->val.data; |
610 | char *expr; | | 610 | char *expr; |
611 | | | 611 | |
612 | if ((v->flags & VFL_EXPORTED) && !(v->flags & VFL_REEXPORT)) | | 612 | if ((v->flags & VFL_EXPORTED) && !(v->flags & VFL_REEXPORT)) |
613 | return FALSE; /* nothing to do */ | | 613 | return FALSE; /* nothing to do */ |
614 | | | 614 | |
615 | if (strchr(val, '$') == NULL) { | | 615 | if (strchr(val, '$') == NULL) { |
616 | if (!(v->flags & VFL_EXPORTED)) | | 616 | if (!(v->flags & VFL_EXPORTED)) |
617 | setenv(name, val, 1); | | 617 | setenv(name, val, 1); |
618 | return TRUE; | | 618 | return TRUE; |
619 | } | | 619 | } |
620 | | | 620 | |
621 | if (v->flags & VFL_IN_USE) { | | 621 | if (v->flags & VFL_IN_USE) { |
622 | /* | | 622 | /* |
623 | * We recursed while exporting in a child. | | 623 | * We recursed while exporting in a child. |
624 | * This isn't going to end well, just skip it. | | 624 | * This isn't going to end well, just skip it. |
625 | */ | | 625 | */ |
626 | return FALSE; | | 626 | return FALSE; |
627 | } | | 627 | } |
628 | | | 628 | |
629 | /* XXX: name is injected without escaping it */ | | 629 | /* XXX: name is injected without escaping it */ |
630 | expr = str_concat3("${", name, "}"); | | 630 | expr = str_concat3("${", name, "}"); |
631 | (void)Var_Subst(expr, SCOPE_GLOBAL, VARE_WANTRES, &val); | | 631 | (void)Var_Subst(expr, SCOPE_GLOBAL, VARE_WANTRES, &val); |
632 | /* TODO: handle errors */ | | 632 | /* TODO: handle errors */ |
633 | setenv(name, val, 1); | | 633 | setenv(name, val, 1); |
634 | free(val); | | 634 | free(val); |
635 | free(expr); | | 635 | free(expr); |
636 | return TRUE; | | 636 | return TRUE; |
637 | } | | 637 | } |
638 | | | 638 | |
639 | static Boolean | | 639 | static Boolean |
640 | ExportVarPlain(Var *v) | | 640 | ExportVarPlain(Var *v) |
641 | { | | 641 | { |
642 | if (strchr(v->val.data, '$') == NULL) { | | 642 | if (strchr(v->val.data, '$') == NULL) { |
643 | setenv(v->name.str, v->val.data, 1); | | 643 | setenv(v->name.str, v->val.data, 1); |
644 | v->flags |= VFL_EXPORTED; | | 644 | v->flags |= VFL_EXPORTED; |
645 | v->flags &= ~(unsigned)VFL_REEXPORT; | | 645 | v->flags &= ~(unsigned)VFL_REEXPORT; |
646 | return TRUE; | | 646 | return TRUE; |
647 | } | | 647 | } |
648 | | | 648 | |
649 | /* | | 649 | /* |
650 | * Flag the variable as something we need to re-export. | | 650 | * Flag the variable as something we need to re-export. |
651 | * No point actually exporting it now though, | | 651 | * No point actually exporting it now though, |
652 | * the child process can do it at the last minute. | | 652 | * the child process can do it at the last minute. |
653 | * Avoid calling setenv more often than necessary since it can leak. | | 653 | * Avoid calling setenv more often than necessary since it can leak. |
654 | */ | | 654 | */ |
655 | v->flags |= VFL_EXPORTED | VFL_REEXPORT; | | 655 | v->flags |= VFL_EXPORTED | VFL_REEXPORT; |
656 | return TRUE; | | 656 | return TRUE; |
657 | } | | 657 | } |
658 | | | 658 | |
659 | static Boolean | | 659 | static Boolean |
660 | ExportVarLiteral(Var *v) | | 660 | ExportVarLiteral(Var *v) |
661 | { | | 661 | { |
662 | if ((v->flags & VFL_EXPORTED) && !(v->flags & VFL_REEXPORT)) | | 662 | if ((v->flags & VFL_EXPORTED) && !(v->flags & VFL_REEXPORT)) |
663 | return FALSE; | | 663 | return FALSE; |
664 | | | 664 | |
665 | if (!(v->flags & VFL_EXPORTED)) | | 665 | if (!(v->flags & VFL_EXPORTED)) |
666 | setenv(v->name.str, v->val.data, 1); | | 666 | setenv(v->name.str, v->val.data, 1); |
667 | | | 667 | |
668 | return TRUE; | | 668 | return TRUE; |
669 | } | | 669 | } |
670 | | | 670 | |
671 | /* | | 671 | /* |
672 | * Mark a single variable to be exported later for subprocesses. | | 672 | * Mark a single variable to be exported later for subprocesses. |
673 | * | | 673 | * |
674 | * Internal variables (those starting with '.') are not exported. | | 674 | * Internal variables (those starting with '.') are not exported. |
675 | */ | | 675 | */ |
676 | static Boolean | | 676 | static Boolean |
677 | ExportVar(const char *name, VarExportMode mode) | | 677 | ExportVar(const char *name, VarExportMode mode) |
678 | { | | 678 | { |
679 | Var *v; | | 679 | Var *v; |
680 | | | 680 | |
681 | if (!MayExport(name)) | | 681 | if (!MayExport(name)) |
682 | return FALSE; | | 682 | return FALSE; |
683 | | | 683 | |
684 | v = VarFind(name, SCOPE_GLOBAL, FALSE); | | 684 | v = VarFind(name, SCOPE_GLOBAL, FALSE); |
685 | if (v == NULL) | | 685 | if (v == NULL) |
686 | return FALSE; | | 686 | return FALSE; |
687 | | | 687 | |
688 | if (mode == VEM_ENV) | | 688 | if (mode == VEM_ENV) |
689 | return ExportVarEnv(v); | | 689 | return ExportVarEnv(v); |
690 | else if (mode == VEM_PLAIN) | | 690 | else if (mode == VEM_PLAIN) |
691 | return ExportVarPlain(v); | | 691 | return ExportVarPlain(v); |
692 | else | | 692 | else |
693 | return ExportVarLiteral(v); | | 693 | return ExportVarLiteral(v); |
694 | } | | 694 | } |
695 | | | 695 | |
696 | /* | | 696 | /* |
697 | * Actually export the variables that have been marked as needing to be | | 697 | * Actually export the variables that have been marked as needing to be |
698 | * re-exported. | | 698 | * re-exported. |
699 | */ | | 699 | */ |
700 | void | | 700 | void |
701 | Var_ReexportVars(void) | | 701 | Var_ReexportVars(void) |
702 | { | | 702 | { |
703 | char *xvarnames; | | 703 | char *xvarnames; |
704 | | | 704 | |
705 | /* | | 705 | /* |
706 | * Several make implementations support this sort of mechanism for | | 706 | * Several make implementations support this sort of mechanism for |
707 | * tracking recursion - but each uses a different name. | | 707 | * tracking recursion - but each uses a different name. |
708 | * We allow the makefiles to update MAKELEVEL and ensure | | 708 | * We allow the makefiles to update MAKELEVEL and ensure |
709 | * children see a correctly incremented value. | | 709 | * children see a correctly incremented value. |
710 | */ | | 710 | */ |
711 | char tmp[21]; | | 711 | char tmp[21]; |
712 | snprintf(tmp, sizeof tmp, "%d", makelevel + 1); | | 712 | snprintf(tmp, sizeof tmp, "%d", makelevel + 1); |
713 | setenv(MAKE_LEVEL_ENV, tmp, 1); | | 713 | setenv(MAKE_LEVEL_ENV, tmp, 1); |
714 | | | 714 | |
715 | if (var_exportedVars == VAR_EXPORTED_NONE) | | 715 | if (var_exportedVars == VAR_EXPORTED_NONE) |
716 | return; | | 716 | return; |
717 | | | 717 | |
718 | if (var_exportedVars == VAR_EXPORTED_ALL) { | | 718 | if (var_exportedVars == VAR_EXPORTED_ALL) { |
719 | HashIter hi; | | 719 | HashIter hi; |
720 | | | 720 | |
721 | /* Ouch! Exporting all variables at once is crazy. */ | | 721 | /* Ouch! Exporting all variables at once is crazy. */ |
722 | HashIter_Init(&hi, &SCOPE_GLOBAL->vars); | | 722 | HashIter_Init(&hi, &SCOPE_GLOBAL->vars); |
723 | while (HashIter_Next(&hi) != NULL) { | | 723 | while (HashIter_Next(&hi) != NULL) { |
724 | Var *var = hi.entry->value; | | 724 | Var *var = hi.entry->value; |
725 | ExportVar(var->name.str, VEM_ENV); | | 725 | ExportVar(var->name.str, VEM_ENV); |
726 | } | | 726 | } |
727 | return; | | 727 | return; |
728 | } | | 728 | } |
729 | | | 729 | |
730 | (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", SCOPE_GLOBAL, VARE_WANTRES, | | 730 | (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", SCOPE_GLOBAL, VARE_WANTRES, |
731 | &xvarnames); | | 731 | &xvarnames); |
732 | /* TODO: handle errors */ | | 732 | /* TODO: handle errors */ |
733 | if (xvarnames[0] != '\0') { | | 733 | if (xvarnames[0] != '\0') { |
734 | Words varnames = Str_Words(xvarnames, FALSE); | | 734 | Words varnames = Str_Words(xvarnames, FALSE); |
735 | size_t i; | | 735 | size_t i; |
736 | | | 736 | |
737 | for (i = 0; i < varnames.len; i++) | | 737 | for (i = 0; i < varnames.len; i++) |
738 | ExportVar(varnames.words[i], VEM_ENV); | | 738 | ExportVar(varnames.words[i], VEM_ENV); |
739 | Words_Free(varnames); | | 739 | Words_Free(varnames); |
740 | } | | 740 | } |
741 | free(xvarnames); | | 741 | free(xvarnames); |
742 | } | | 742 | } |
743 | | | 743 | |
744 | static void | | 744 | static void |
745 | ExportVars(const char *varnames, Boolean isExport, VarExportMode mode) | | 745 | ExportVars(const char *varnames, Boolean isExport, VarExportMode mode) |
746 | /* TODO: try to combine the parameters 'isExport' and 'mode'. */ | | 746 | /* TODO: try to combine the parameters 'isExport' and 'mode'. */ |
747 | { | | 747 | { |
748 | Words words = Str_Words(varnames, FALSE); | | 748 | Words words = Str_Words(varnames, FALSE); |
749 | size_t i; | | 749 | size_t i; |
750 | | | 750 | |
751 | if (words.len == 1 && words.words[0][0] == '\0') | | 751 | if (words.len == 1 && words.words[0][0] == '\0') |
752 | words.len = 0; | | 752 | words.len = 0; |
753 | | | 753 | |
754 | for (i = 0; i < words.len; i++) { | | 754 | for (i = 0; i < words.len; i++) { |
755 | const char *varname = words.words[i]; | | 755 | const char *varname = words.words[i]; |
756 | if (!ExportVar(varname, mode)) | | 756 | if (!ExportVar(varname, mode)) |
757 | continue; | | 757 | continue; |
758 | | | 758 | |
759 | if (var_exportedVars == VAR_EXPORTED_NONE) | | 759 | if (var_exportedVars == VAR_EXPORTED_NONE) |
760 | var_exportedVars = VAR_EXPORTED_SOME; | | 760 | var_exportedVars = VAR_EXPORTED_SOME; |
761 | | | 761 | |
762 | if (isExport && mode == VEM_PLAIN) | | 762 | if (isExport && mode == VEM_PLAIN) |
763 | Global_Append(MAKE_EXPORTED, varname); | | 763 | Global_Append(MAKE_EXPORTED, varname); |
764 | } | | 764 | } |
765 | Words_Free(words); | | 765 | Words_Free(words); |
766 | } | | 766 | } |
767 | | | 767 | |
768 | static void | | 768 | static void |
769 | ExportVarsExpand(const char *uvarnames, Boolean isExport, VarExportMode mode) | | 769 | ExportVarsExpand(const char *uvarnames, Boolean isExport, VarExportMode mode) |
770 | { | | 770 | { |
771 | char *xvarnames; | | 771 | char *xvarnames; |
772 | | | 772 | |
773 | (void)Var_Subst(uvarnames, SCOPE_GLOBAL, VARE_WANTRES, &xvarnames); | | 773 | (void)Var_Subst(uvarnames, SCOPE_GLOBAL, VARE_WANTRES, &xvarnames); |
774 | /* TODO: handle errors */ | | 774 | /* TODO: handle errors */ |
775 | ExportVars(xvarnames, isExport, mode); | | 775 | ExportVars(xvarnames, isExport, mode); |
776 | free(xvarnames); | | 776 | free(xvarnames); |
777 | } | | 777 | } |
778 | | | 778 | |
779 | /* Export the named variables, or all variables. */ | | 779 | /* Export the named variables, or all variables. */ |
780 | void | | 780 | void |
781 | Var_Export(VarExportMode mode, const char *varnames) | | 781 | Var_Export(VarExportMode mode, const char *varnames) |
782 | { | | 782 | { |
783 | if (mode == VEM_PLAIN && varnames[0] == '\0') { | | 783 | if (mode == VEM_PLAIN && varnames[0] == '\0') { |
784 | var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */ | | 784 | var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */ |
785 | return; | | 785 | return; |
786 | } | | 786 | } |
787 | | | 787 | |
788 | ExportVarsExpand(varnames, TRUE, mode); | | 788 | ExportVarsExpand(varnames, TRUE, mode); |
789 | } | | 789 | } |
790 | | | 790 | |
791 | void | | 791 | void |
792 | Var_ExportVars(const char *varnames) | | 792 | Var_ExportVars(const char *varnames) |
793 | { | | 793 | { |
794 | ExportVarsExpand(varnames, FALSE, VEM_PLAIN); | | 794 | ExportVarsExpand(varnames, FALSE, VEM_PLAIN); |
795 | } | | 795 | } |
796 | | | 796 | |
797 | | | 797 | |
798 | extern char **environ; | | 798 | extern char **environ; |
799 | | | 799 | |
800 | static void | | 800 | static void |
801 | ClearEnv(void) | | 801 | ClearEnv(void) |
802 | { | | 802 | { |
803 | const char *cp; | | 803 | const char *cp; |
804 | char **newenv; | | 804 | char **newenv; |
805 | | | 805 | |
806 | cp = getenv(MAKE_LEVEL_ENV); /* we should preserve this */ | | 806 | cp = getenv(MAKE_LEVEL_ENV); /* we should preserve this */ |
807 | if (environ == savedEnv) { | | 807 | if (environ == savedEnv) { |
808 | /* we have been here before! */ | | 808 | /* we have been here before! */ |
809 | newenv = bmake_realloc(environ, 2 * sizeof(char *)); | | 809 | newenv = bmake_realloc(environ, 2 * sizeof(char *)); |
810 | } else { | | 810 | } else { |
811 | if (savedEnv != NULL) { | | 811 | if (savedEnv != NULL) { |
812 | free(savedEnv); | | 812 | free(savedEnv); |
813 | savedEnv = NULL; | | 813 | savedEnv = NULL; |
814 | } | | 814 | } |
815 | newenv = bmake_malloc(2 * sizeof(char *)); | | 815 | newenv = bmake_malloc(2 * sizeof(char *)); |
816 | } | | 816 | } |
817 | | | 817 | |
818 | /* Note: we cannot safely free() the original environ. */ | | 818 | /* Note: we cannot safely free() the original environ. */ |
819 | environ = savedEnv = newenv; | | 819 | environ = savedEnv = newenv; |
820 | newenv[0] = NULL; | | 820 | newenv[0] = NULL; |
821 | newenv[1] = NULL; | | 821 | newenv[1] = NULL; |
822 | if (cp != NULL && *cp != '\0') | | 822 | if (cp != NULL && *cp != '\0') |
823 | setenv(MAKE_LEVEL_ENV, cp, 1); | | 823 | setenv(MAKE_LEVEL_ENV, cp, 1); |
824 | } | | 824 | } |
825 | | | 825 | |
826 | static void | | 826 | static void |
827 | GetVarnamesToUnexport(Boolean isEnv, const char *arg, | | 827 | GetVarnamesToUnexport(Boolean isEnv, const char *arg, |
828 | FStr *out_varnames, UnexportWhat *out_what) | | 828 | FStr *out_varnames, UnexportWhat *out_what) |
829 | { | | 829 | { |
830 | UnexportWhat what; | | 830 | UnexportWhat what; |
831 | FStr varnames = FStr_InitRefer(""); | | 831 | FStr varnames = FStr_InitRefer(""); |
832 | | | 832 | |
833 | if (isEnv) { | | 833 | if (isEnv) { |
834 | if (arg[0] != '\0') { | | 834 | if (arg[0] != '\0') { |
835 | Parse_Error(PARSE_FATAL, | | 835 | Parse_Error(PARSE_FATAL, |
836 | "The directive .unexport-env does not take " | | 836 | "The directive .unexport-env does not take " |
837 | "arguments"); | | 837 | "arguments"); |
838 | /* continue anyway */ | | 838 | /* continue anyway */ |
839 | } | | 839 | } |
840 | what = UNEXPORT_ENV; | | 840 | what = UNEXPORT_ENV; |
841 | | | 841 | |
842 | } else { | | 842 | } else { |
843 | what = arg[0] != '\0' ? UNEXPORT_NAMED : UNEXPORT_ALL; | | 843 | what = arg[0] != '\0' ? UNEXPORT_NAMED : UNEXPORT_ALL; |
844 | if (what == UNEXPORT_NAMED) | | 844 | if (what == UNEXPORT_NAMED) |
845 | varnames = FStr_InitRefer(arg); | | 845 | varnames = FStr_InitRefer(arg); |
846 | } | | 846 | } |
847 | | | 847 | |
848 | if (what != UNEXPORT_NAMED) { | | 848 | if (what != UNEXPORT_NAMED) { |
849 | char *expanded; | | 849 | char *expanded; |
850 | /* Using .MAKE.EXPORTED */ | | 850 | /* Using .MAKE.EXPORTED */ |
851 | (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", SCOPE_GLOBAL, | | 851 | (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", SCOPE_GLOBAL, |
852 | VARE_WANTRES, &expanded); | | 852 | VARE_WANTRES, &expanded); |
853 | /* TODO: handle errors */ | | 853 | /* TODO: handle errors */ |
854 | varnames = FStr_InitOwn(expanded); | | 854 | varnames = FStr_InitOwn(expanded); |
855 | } | | 855 | } |
856 | | | 856 | |
857 | *out_varnames = varnames; | | 857 | *out_varnames = varnames; |
858 | *out_what = what; | | 858 | *out_what = what; |
859 | } | | 859 | } |
860 | | | 860 | |
861 | static void | | 861 | static void |
862 | UnexportVar(const char *varname, UnexportWhat what) | | 862 | UnexportVar(const char *varname, UnexportWhat what) |
863 | { | | 863 | { |
864 | Var *v = VarFind(varname, SCOPE_GLOBAL, FALSE); | | 864 | Var *v = VarFind(varname, SCOPE_GLOBAL, FALSE); |
865 | if (v == NULL) { | | 865 | if (v == NULL) { |
866 | DEBUG1(VAR, "Not unexporting \"%s\" (not found)\n", varname); | | 866 | DEBUG1(VAR, "Not unexporting \"%s\" (not found)\n", varname); |
867 | return; | | 867 | return; |
868 | } | | 868 | } |
869 | | | 869 | |
870 | DEBUG1(VAR, "Unexporting \"%s\"\n", varname); | | 870 | DEBUG1(VAR, "Unexporting \"%s\"\n", varname); |
871 | if (what != UNEXPORT_ENV && | | 871 | if (what != UNEXPORT_ENV && |
872 | (v->flags & VFL_EXPORTED) && !(v->flags & VFL_REEXPORT)) | | 872 | (v->flags & VFL_EXPORTED) && !(v->flags & VFL_REEXPORT)) |
873 | unsetenv(v->name.str); | | 873 | unsetenv(v->name.str); |
874 | v->flags &= ~(unsigned)(VFL_EXPORTED | VFL_REEXPORT); | | 874 | v->flags &= ~(unsigned)(VFL_EXPORTED | VFL_REEXPORT); |
875 | | | 875 | |
876 | if (what == UNEXPORT_NAMED) { | | 876 | if (what == UNEXPORT_NAMED) { |
877 | /* Remove the variable names from .MAKE.EXPORTED. */ | | 877 | /* Remove the variable names from .MAKE.EXPORTED. */ |
878 | /* XXX: v->name is injected without escaping it */ | | 878 | /* XXX: v->name is injected without escaping it */ |
879 | char *expr = str_concat3("${" MAKE_EXPORTED ":N", | | 879 | char *expr = str_concat3("${" MAKE_EXPORTED ":N", |
880 | v->name.str, "}"); | | 880 | v->name.str, "}"); |
881 | char *cp; | | 881 | char *cp; |
882 | (void)Var_Subst(expr, SCOPE_GLOBAL, VARE_WANTRES, &cp); | | 882 | (void)Var_Subst(expr, SCOPE_GLOBAL, VARE_WANTRES, &cp); |
883 | /* TODO: handle errors */ | | 883 | /* TODO: handle errors */ |
884 | Global_Set(MAKE_EXPORTED, cp); | | 884 | Global_Set(MAKE_EXPORTED, cp); |
885 | free(cp); | | 885 | free(cp); |
886 | free(expr); | | 886 | free(expr); |
887 | } | | 887 | } |
888 | } | | 888 | } |
889 | | | 889 | |
890 | static void | | 890 | static void |
891 | UnexportVars(FStr *varnames, UnexportWhat what) | | 891 | UnexportVars(FStr *varnames, UnexportWhat what) |
892 | { | | 892 | { |
893 | size_t i; | | 893 | size_t i; |
894 | Words words; | | 894 | Words words; |
895 | | | 895 | |
896 | if (what == UNEXPORT_ENV) | | 896 | if (what == UNEXPORT_ENV) |
897 | ClearEnv(); | | 897 | ClearEnv(); |
898 | | | 898 | |
899 | words = Str_Words(varnames->str, FALSE); | | 899 | words = Str_Words(varnames->str, FALSE); |
900 | for (i = 0; i < words.len; i++) { | | 900 | for (i = 0; i < words.len; i++) { |
901 | const char *varname = words.words[i]; | | 901 | const char *varname = words.words[i]; |
902 | UnexportVar(varname, what); | | 902 | UnexportVar(varname, what); |
903 | } | | 903 | } |
904 | Words_Free(words); | | 904 | Words_Free(words); |
905 | | | 905 | |
906 | if (what != UNEXPORT_NAMED) | | 906 | if (what != UNEXPORT_NAMED) |
907 | Global_Delete(MAKE_EXPORTED); | | 907 | Global_Delete(MAKE_EXPORTED); |
908 | } | | 908 | } |
909 | | | 909 | |
910 | /* | | 910 | /* |
911 | * This is called when .unexport[-env] is seen. | | 911 | * This is called when .unexport[-env] is seen. |
912 | * | | 912 | * |
913 | * str must have the form "unexport[-env] varname...". | | 913 | * str must have the form "unexport[-env] varname...". |
914 | */ | | 914 | */ |
915 | void | | 915 | void |
916 | Var_UnExport(Boolean isEnv, const char *arg) | | 916 | Var_UnExport(Boolean isEnv, const char *arg) |
917 | { | | 917 | { |
918 | UnexportWhat what; | | 918 | UnexportWhat what; |
919 | FStr varnames; | | 919 | FStr varnames; |
920 | | | 920 | |
921 | GetVarnamesToUnexport(isEnv, arg, &varnames, &what); | | 921 | GetVarnamesToUnexport(isEnv, arg, &varnames, &what); |
922 | UnexportVars(&varnames, what); | | 922 | UnexportVars(&varnames, what); |
923 | FStr_Done(&varnames); | | 923 | FStr_Done(&varnames); |
924 | } | | 924 | } |
925 | | | 925 | |
926 | /* | | 926 | /* |
927 | * When there is a variable of the same name in the command line scope, the | | 927 | * When there is a variable of the same name in the command line scope, the |
928 | * global variable would not be visible anywhere. Therefore there is no | | 928 | * global variable would not be visible anywhere. Therefore there is no |
929 | * point in setting it at all. | | 929 | * point in setting it at all. |
930 | * | | 930 | * |
931 | * See 'scope == SCOPE_CMDLINE' in Var_SetWithFlags. | | 931 | * See 'scope == SCOPE_CMDLINE' in Var_SetWithFlags. |
932 | */ | | 932 | */ |
933 | static Boolean | | 933 | static Boolean |
934 | ExistsInCmdline(const char *name, const char *val) | | 934 | ExistsInCmdline(const char *name, const char *val) |
935 | { | | 935 | { |
936 | Var *v; | | 936 | Var *v; |
937 | | | 937 | |
938 | v = VarFind(name, SCOPE_CMDLINE, FALSE); | | 938 | v = VarFind(name, SCOPE_CMDLINE, FALSE); |
939 | if (v == NULL) | | 939 | if (v == NULL) |
940 | return FALSE; | | 940 | return FALSE; |
941 | | | 941 | |
942 | if (v->flags & VFL_FROM_CMD) { | | 942 | if (v->flags & VFL_FROM_CMD) { |
943 | DEBUG3(VAR, "%s:%s = %s ignored!\n", | | 943 | DEBUG3(VAR, "%s:%s = %s ignored!\n", |
944 | SCOPE_GLOBAL->name, name, val); | | 944 | SCOPE_GLOBAL->name, name, val); |
945 | return TRUE; | | 945 | return TRUE; |
946 | } | | 946 | } |
947 | | | 947 | |
948 | VarFreeEnv(v); | | 948 | VarFreeEnv(v); |
949 | return FALSE; | | 949 | return FALSE; |
950 | } | | 950 | } |
951 | | | 951 | |
952 | /* Set the variable to the value; the name is not expanded. */ | | 952 | /* Set the variable to the value; the name is not expanded. */ |
953 | void | | 953 | void |
954 | Var_SetWithFlags(GNode *scope, const char *name, const char *val, | | 954 | Var_SetWithFlags(GNode *scope, const char *name, const char *val, |
955 | VarSetFlags flags) | | 955 | VarSetFlags flags) |
956 | { | | 956 | { |
957 | Var *v; | | 957 | Var *v; |
958 | | | 958 | |
959 | assert(val != NULL); | | 959 | assert(val != NULL); |
960 | if (name[0] == '\0') { | | 960 | if (name[0] == '\0') { |
961 | DEBUG0(VAR, "SetVar: variable name is empty - ignored\n"); | | 961 | DEBUG0(VAR, "SetVar: variable name is empty - ignored\n"); |
962 | return; | | 962 | return; |
963 | } | | 963 | } |
964 | | | 964 | |
965 | if (scope == SCOPE_GLOBAL && ExistsInCmdline(name, val)) | | 965 | if (scope == SCOPE_GLOBAL && ExistsInCmdline(name, val)) |
966 | return; | | 966 | return; |
967 | | | 967 | |
968 | /* | | 968 | /* |
969 | * Only look for a variable in the given scope since anything set | | 969 | * Only look for a variable in the given scope since anything set |
970 | * here will override anything in a lower scope, so there's not much | | 970 | * here will override anything in a lower scope, so there's not much |
971 | * point in searching them all. | | 971 | * point in searching them all. |
972 | */ | | 972 | */ |
973 | v = VarFind(name, scope, FALSE); | | 973 | v = VarFind(name, scope, FALSE); |
974 | if (v == NULL) { | | 974 | if (v == NULL) { |
975 | if (scope == SCOPE_CMDLINE && !(flags & VAR_SET_NO_EXPORT)) { | | 975 | if (scope == SCOPE_CMDLINE && !(flags & VAR_SET_NO_EXPORT)) { |
976 | /* | | 976 | /* |
977 | * This var would normally prevent the same name being | | 977 | * This var would normally prevent the same name being |
978 | * added to SCOPE_GLOBAL, so delete it from there if | | 978 | * added to SCOPE_GLOBAL, so delete it from there if |
979 | * needed. Otherwise -V name may show the wrong value. | | 979 | * needed. Otherwise -V name may show the wrong value. |
980 | * | | 980 | * |
981 | * See ExistsInCmdline. | | 981 | * See ExistsInCmdline. |
982 | */ | | 982 | */ |
983 | Var_Delete(SCOPE_GLOBAL, name); | | 983 | Var_Delete(SCOPE_GLOBAL, name); |
984 | } | | 984 | } |
985 | v = VarAdd(name, val, scope, flags); | | 985 | v = VarAdd(name, val, scope, flags); |
986 | } else { | | 986 | } else { |
987 | if ((v->flags & VFL_READONLY) && !(flags & VAR_SET_READONLY)) { | | 987 | if ((v->flags & VFL_READONLY) && !(flags & VAR_SET_READONLY)) { |
988 | DEBUG3(VAR, "%s:%s = %s ignored (read-only)\n", | | 988 | DEBUG3(VAR, "%s:%s = %s ignored (read-only)\n", |
989 | scope->name, name, val); | | 989 | scope->name, name, val); |
990 | return; | | 990 | return; |
991 | } | | 991 | } |
992 | Buf_Empty(&v->val); | | 992 | Buf_Empty(&v->val); |
993 | Buf_AddStr(&v->val, val); | | 993 | Buf_AddStr(&v->val, val); |
994 | | | 994 | |
995 | DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, val); | | 995 | DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, val); |
996 | if (v->flags & VFL_EXPORTED) | | 996 | if (v->flags & VFL_EXPORTED) |
997 | ExportVar(name, VEM_PLAIN); | | 997 | ExportVar(name, VEM_PLAIN); |
998 | } | | 998 | } |
999 | | | 999 | |
1000 | /* | | 1000 | /* |
1001 | * Any variables given on the command line are automatically exported | | 1001 | * Any variables given on the command line are automatically exported |
1002 | * to the environment (as per POSIX standard), except for internals. | | 1002 | * to the environment (as per POSIX standard), except for internals. |
1003 | */ | | 1003 | */ |
1004 | if (scope == SCOPE_CMDLINE && !(flags & VAR_SET_NO_EXPORT) && | | 1004 | if (scope == SCOPE_CMDLINE && !(flags & VAR_SET_NO_EXPORT) && |
1005 | name[0] != '.') { | | 1005 | name[0] != '.') { |
1006 | v->flags |= VFL_FROM_CMD; | | 1006 | v->flags |= VFL_FROM_CMD; |
1007 | | | 1007 | |
1008 | /* | | 1008 | /* |
1009 | * If requested, don't export these in the environment | | 1009 | * If requested, don't export these in the environment |
1010 | * individually. We still put them in MAKEOVERRIDES so | | 1010 | * individually. We still put them in MAKEOVERRIDES so |
1011 | * that the command-line settings continue to override | | 1011 | * that the command-line settings continue to override |
1012 | * Makefile settings. | | 1012 | * Makefile settings. |
1013 | */ | | 1013 | */ |
1014 | if (!opts.varNoExportEnv) | | 1014 | if (!opts.varNoExportEnv) |
1015 | setenv(name, val, 1); | | 1015 | setenv(name, val, 1); |
1016 | /* XXX: What about .MAKE.EXPORTED? */ | | 1016 | /* XXX: What about .MAKE.EXPORTED? */ |
1017 | /* XXX: Why not just mark the variable for needing export, | | 1017 | /* XXX: Why not just mark the variable for needing export, |
1018 | * as in ExportVarPlain? */ | | 1018 | * as in ExportVarPlain? */ |
1019 | | | 1019 | |
1020 | Global_Append(MAKEOVERRIDES, name); | | 1020 | Global_Append(MAKEOVERRIDES, name); |
1021 | } | | 1021 | } |
1022 | | | 1022 | |
1023 | if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0) | | 1023 | if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0) |
1024 | save_dollars = ParseBoolean(val, save_dollars); | | 1024 | save_dollars = ParseBoolean(val, save_dollars); |
1025 | | | 1025 | |
1026 | if (v != NULL) | | 1026 | if (v != NULL) |
1027 | VarFreeEnv(v); | | 1027 | VarFreeEnv(v); |
1028 | } | | 1028 | } |
1029 | | | 1029 | |
1030 | /* See Var_Set for documentation. */ | | 1030 | /* See Var_Set for documentation. */ |
1031 | void | | 1031 | void |
1032 | Var_SetExpandWithFlags(GNode *scope, const char *name, const char *val, | | 1032 | Var_SetExpandWithFlags(GNode *scope, const char *name, const char *val, |
1033 | VarSetFlags flags) | | 1033 | VarSetFlags flags) |
1034 | { | | 1034 | { |
1035 | const char *unexpanded_name = name; | | 1035 | const char *unexpanded_name = name; |
1036 | FStr varname = FStr_InitRefer(name); | | 1036 | FStr varname = FStr_InitRefer(name); |
1037 | | | 1037 | |
1038 | assert(val != NULL); | | 1038 | assert(val != NULL); |
1039 | | | 1039 | |
1040 | if (strchr(varname.str, '$') != NULL) { | | 1040 | if (strchr(varname.str, '$') != NULL) { |
1041 | char *expanded; | | 1041 | char *expanded; |
1042 | (void)Var_Subst(varname.str, scope, VARE_WANTRES, &expanded); | | 1042 | (void)Var_Subst(varname.str, scope, VARE_WANTRES, &expanded); |
1043 | /* TODO: handle errors */ | | 1043 | /* TODO: handle errors */ |
1044 | varname = FStr_InitOwn(expanded); | | 1044 | varname = FStr_InitOwn(expanded); |
1045 | } | | 1045 | } |
1046 | | | 1046 | |
1047 | if (varname.str[0] == '\0') { | | 1047 | if (varname.str[0] == '\0') { |
1048 | DEBUG2(VAR, "Var_Set(\"%s\", \"%s\", ...) " | | 1048 | DEBUG2(VAR, "Var_Set(\"%s\", \"%s\", ...) " |
1049 | "name expands to empty string - ignored\n", | | 1049 | "name expands to empty string - ignored\n", |
1050 | unexpanded_name, val); | | 1050 | unexpanded_name, val); |
1051 | } else | | 1051 | } else |
1052 | Var_SetWithFlags(scope, varname.str, val, flags); | | 1052 | Var_SetWithFlags(scope, varname.str, val, flags); |
1053 | | | 1053 | |
1054 | FStr_Done(&varname); | | 1054 | FStr_Done(&varname); |
1055 | } | | 1055 | } |
1056 | | | 1056 | |
1057 | void | | 1057 | void |
1058 | Var_Set(GNode *scope, const char *name, const char *val) | | 1058 | Var_Set(GNode *scope, const char *name, const char *val) |
1059 | { | | 1059 | { |
1060 | Var_SetWithFlags(scope, name, val, VAR_SET_NONE); | | 1060 | Var_SetWithFlags(scope, name, val, VAR_SET_NONE); |
1061 | } | | 1061 | } |
1062 | | | 1062 | |
1063 | /* | | 1063 | /* |
1064 | * Set the variable name to the value val in the given scope. | | 1064 | * Set the variable name to the value val in the given scope. |
1065 | * | | 1065 | * |
1066 | * If the variable doesn't yet exist, it is created. | | 1066 | * If the variable doesn't yet exist, it is created. |
1067 | * Otherwise the new value overwrites and replaces the old value. | | 1067 | * Otherwise the new value overwrites and replaces the old value. |
1068 | * | | 1068 | * |
1069 | * Input: | | 1069 | * Input: |
1070 | * name name of the variable to set, is expanded once | | 1070 | * name name of the variable to set, is expanded once |
1071 | * val value to give to the variable | | 1071 | * val value to give to the variable |
1072 | * scope scope in which to set it | | 1072 | * scope scope in which to set it |
1073 | */ | | 1073 | */ |
1074 | void | | 1074 | void |
1075 | Var_SetExpand(GNode *scope, const char *name, const char *val) | | 1075 | Var_SetExpand(GNode *scope, const char *name, const char *val) |
1076 | { | | 1076 | { |
1077 | Var_SetExpandWithFlags(scope, name, val, VAR_SET_NONE); | | 1077 | Var_SetExpandWithFlags(scope, name, val, VAR_SET_NONE); |
1078 | } | | 1078 | } |
1079 | | | 1079 | |
1080 | void | | 1080 | void |
1081 | Global_Set(const char *name, const char *value) | | 1081 | Global_Set(const char *name, const char *value) |
1082 | { | | 1082 | { |
1083 | Var_Set(SCOPE_GLOBAL, name, value); | | 1083 | Var_Set(SCOPE_GLOBAL, name, value); |
1084 | } | | 1084 | } |
1085 | | | 1085 | |
1086 | void | | 1086 | void |
1087 | Global_SetExpand(const char *name, const char *value) | | 1087 | Global_SetExpand(const char *name, const char *value) |
1088 | { | | 1088 | { |
1089 | Var_SetExpand(SCOPE_GLOBAL, name, value); | | 1089 | Var_SetExpand(SCOPE_GLOBAL, name, value); |
1090 | } | | 1090 | } |
1091 | | | 1091 | |
1092 | void | | 1092 | void |
1093 | Global_Delete(const char *name) | | 1093 | Global_Delete(const char *name) |
1094 | { | | 1094 | { |
1095 | Var_Delete(SCOPE_GLOBAL, name); | | 1095 | Var_Delete(SCOPE_GLOBAL, name); |
1096 | } | | 1096 | } |
1097 | | | 1097 | |
1098 | /* | | 1098 | /* |
1099 | * Append the value to the named variable. | | 1099 | * Append the value to the named variable. |
1100 | * | | 1100 | * |
1101 | * If the variable doesn't exist, it is created. Otherwise a single space | | 1101 | * If the variable doesn't exist, it is created. Otherwise a single space |
1102 | * and the given value are appended. | | 1102 | * and the given value are appended. |
1103 | */ | | 1103 | */ |
1104 | void | | 1104 | void |
1105 | Var_Append(GNode *scope, const char *name, const char *val) | | 1105 | Var_Append(GNode *scope, const char *name, const char *val) |
1106 | { | | 1106 | { |
1107 | Var *v; | | 1107 | Var *v; |
1108 | | | 1108 | |
1109 | v = VarFind(name, scope, scope == SCOPE_GLOBAL); | | 1109 | v = VarFind(name, scope, scope == SCOPE_GLOBAL); |
1110 | | | 1110 | |
1111 | if (v == NULL) { | | 1111 | if (v == NULL) { |
1112 | Var_SetWithFlags(scope, name, val, VAR_SET_NONE); | | 1112 | Var_SetWithFlags(scope, name, val, VAR_SET_NONE); |
1113 | } else if (v->flags & VFL_READONLY) { | | 1113 | } else if (v->flags & VFL_READONLY) { |
1114 | DEBUG1(VAR, "Ignoring append to %s since it is read-only\n", | | 1114 | DEBUG1(VAR, "Ignoring append to %s since it is read-only\n", |
1115 | name); | | 1115 | name); |
1116 | } else if (scope == SCOPE_CMDLINE || !(v->flags & VFL_FROM_CMD)) { | | 1116 | } else if (scope == SCOPE_CMDLINE || !(v->flags & VFL_FROM_CMD)) { |
1117 | Buf_AddByte(&v->val, ' '); | | 1117 | Buf_AddByte(&v->val, ' '); |
1118 | Buf_AddStr(&v->val, val); | | 1118 | Buf_AddStr(&v->val, val); |
1119 | | | 1119 | |
1120 | DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, v->val.data); | | 1120 | DEBUG3(VAR, "%s:%s = %s\n", scope->name, name, v->val.data); |
1121 | | | 1121 | |
1122 | if (v->flags & VFL_FROM_ENV) { | | 1122 | if (v->flags & VFL_FROM_ENV) { |
1123 | /* | | 1123 | /* |
1124 | * If the original variable came from the environment, | | 1124 | * If the original variable came from the environment, |
1125 | * we have to install it in the global scope (we | | 1125 | * we have to install it in the global scope (we |
1126 | * could place it in the environment, but then we | | 1126 | * could place it in the environment, but then we |
1127 | * should provide a way to export other variables...) | | 1127 | * should provide a way to export other variables...) |
1128 | */ | | 1128 | */ |
1129 | v->flags &= ~(unsigned)VFL_FROM_ENV; | | 1129 | v->flags &= ~(unsigned)VFL_FROM_ENV; |
1130 | /* | | 1130 | /* |
1131 | * This is the only place where a variable is | | 1131 | * This is the only place where a variable is |
1132 | * created whose v->name is not the same as | | 1132 | * created whose v->name is not the same as |
1133 | * scope->vars->key. | | 1133 | * scope->vars->key. |
1134 | */ | | 1134 | */ |
1135 | HashTable_Set(&scope->vars, name, v); | | 1135 | HashTable_Set(&scope->vars, name, v); |
1136 | } | | 1136 | } |
1137 | } | | 1137 | } |
1138 | } | | 1138 | } |
1139 | | | 1139 | |
1140 | /* | | 1140 | /* |
1141 | * The variable of the given name has the given value appended to it in the | | 1141 | * The variable of the given name has the given value appended to it in the |
1142 | * given scope. | | 1142 | * given scope. |
| @@ -1928,2005 +1928,2006 @@ VarHash(const char *str) | | | @@ -1928,2005 +1928,2006 @@ VarHash(const char *str) |
1928 | h = h * 5 + 0x52dce729U; | | 1928 | h = h * 5 + 0x52dce729U; |
1929 | h ^= k; | | 1929 | h ^= k; |
1930 | } | | 1930 | } |
1931 | h ^= (uint32_t)len2; | | 1931 | h ^= (uint32_t)len2; |
1932 | h *= 0x85ebca6b; | | 1932 | h *= 0x85ebca6b; |
1933 | h ^= h >> 13; | | 1933 | h ^= h >> 13; |
1934 | h *= 0xc2b2ae35; | | 1934 | h *= 0xc2b2ae35; |
1935 | h ^= h >> 16; | | 1935 | h ^= h >> 16; |
1936 | | | 1936 | |
1937 | buf = bmake_malloc(9); | | 1937 | buf = bmake_malloc(9); |
1938 | for (i = 0; i < 8; i++) { | | 1938 | for (i = 0; i < 8; i++) { |
1939 | buf[i] = hexdigits[h & 0x0f]; | | 1939 | buf[i] = hexdigits[h & 0x0f]; |
1940 | h >>= 4; | | 1940 | h >>= 4; |
1941 | } | | 1941 | } |
1942 | buf[8] = '\0'; | | 1942 | buf[8] = '\0'; |
1943 | return buf; | | 1943 | return buf; |
1944 | } | | 1944 | } |
1945 | | | 1945 | |
1946 | static char * | | 1946 | static char * |
1947 | VarStrftime(const char *fmt, Boolean zulu, time_t tim) | | 1947 | VarStrftime(const char *fmt, Boolean zulu, time_t tim) |
1948 | { | | 1948 | { |
1949 | char buf[BUFSIZ]; | | 1949 | char buf[BUFSIZ]; |
1950 | | | 1950 | |
1951 | if (tim == 0) | | 1951 | if (tim == 0) |
1952 | time(&tim); | | 1952 | time(&tim); |
1953 | if (*fmt == '\0') | | 1953 | if (*fmt == '\0') |
1954 | fmt = "%c"; | | 1954 | fmt = "%c"; |
1955 | strftime(buf, sizeof buf, fmt, zulu ? gmtime(&tim) : localtime(&tim)); | | 1955 | strftime(buf, sizeof buf, fmt, zulu ? gmtime(&tim) : localtime(&tim)); |
1956 | | | 1956 | |
1957 | buf[sizeof buf - 1] = '\0'; | | 1957 | buf[sizeof buf - 1] = '\0'; |
1958 | return bmake_strdup(buf); | | 1958 | return bmake_strdup(buf); |
1959 | } | | 1959 | } |
1960 | | | 1960 | |
1961 | /* | | 1961 | /* |
1962 | * The ApplyModifier functions take an expression that is being evaluated. | | 1962 | * The ApplyModifier functions take an expression that is being evaluated. |
1963 | * Their task is to apply a single modifier to the expression. This involves | | 1963 | * Their task is to apply a single modifier to the expression. This involves |
1964 | * parsing the modifier, evaluating it and finally updating the value of the | | 1964 | * parsing the modifier, evaluating it and finally updating the value of the |
1965 | * expression. | | 1965 | * expression. |
1966 | * | | 1966 | * |
1967 | * Parsing the modifier | | 1967 | * Parsing the modifier |
1968 | * | | 1968 | * |
1969 | * If parsing succeeds, the parsing position *pp is updated to point to the | | 1969 | * If parsing succeeds, the parsing position *pp is updated to point to the |
1970 | * first character following the modifier, which typically is either ':' or | | 1970 | * first character following the modifier, which typically is either ':' or |
1971 | * st->endc. The modifier doesn't have to check for this delimiter character, | | 1971 | * st->endc. The modifier doesn't have to check for this delimiter character, |
1972 | * this is done by ApplyModifiers. | | 1972 | * this is done by ApplyModifiers. |
1973 | * | | 1973 | * |
1974 | * XXX: As of 2020-11-15, some modifiers such as :S, :C, :P, :L do not | | 1974 | * XXX: As of 2020-11-15, some modifiers such as :S, :C, :P, :L do not |
1975 | * need to be followed by a ':' or endc; this was an unintended mistake. | | 1975 | * need to be followed by a ':' or endc; this was an unintended mistake. |
1976 | * | | 1976 | * |
1977 | * If parsing fails because of a missing delimiter (as in the :S, :C or :@ | | 1977 | * If parsing fails because of a missing delimiter (as in the :S, :C or :@ |
1978 | * modifiers), return AMR_CLEANUP. | | 1978 | * modifiers), return AMR_CLEANUP. |
1979 | * | | 1979 | * |
1980 | * If parsing fails because the modifier is unknown, return AMR_UNKNOWN to | | 1980 | * If parsing fails because the modifier is unknown, return AMR_UNKNOWN to |
1981 | * try the SysV modifier ${VAR:from=to} as fallback. This should only be | | 1981 | * try the SysV modifier ${VAR:from=to} as fallback. This should only be |
1982 | * done as long as there have been no side effects from evaluating nested | | 1982 | * done as long as there have been no side effects from evaluating nested |
1983 | * variables, to avoid evaluating them more than once. In this case, the | | 1983 | * variables, to avoid evaluating them more than once. In this case, the |
1984 | * parsing position may or may not be updated. (XXX: Why not? The original | | 1984 | * parsing position may or may not be updated. (XXX: Why not? The original |
1985 | * parsing position is well-known in ApplyModifiers.) | | 1985 | * parsing position is well-known in ApplyModifiers.) |
1986 | * | | 1986 | * |
1987 | * If parsing fails and the SysV modifier ${VAR:from=to} should not be used | | 1987 | * If parsing fails and the SysV modifier ${VAR:from=to} should not be used |
1988 | * as a fallback, either issue an error message using Error or Parse_Error | | 1988 | * as a fallback, either issue an error message using Error or Parse_Error |
1989 | * and then return AMR_CLEANUP, or return AMR_BAD for the default error | | 1989 | * and then return AMR_CLEANUP, or return AMR_BAD for the default error |
1990 | * message. Both of these return values will stop processing the variable | | 1990 | * message. Both of these return values will stop processing the variable |
1991 | * expression. (XXX: As of 2020-08-23, evaluation of the whole string | | 1991 | * expression. (XXX: As of 2020-08-23, evaluation of the whole string |
1992 | * continues nevertheless after skipping a few bytes, which essentially is | | 1992 | * continues nevertheless after skipping a few bytes, which essentially is |
1993 | * undefined behavior. Not in the sense of C, but still the resulting string | | 1993 | * undefined behavior. Not in the sense of C, but still the resulting string |
1994 | * is garbage.) | | 1994 | * is garbage.) |
1995 | * | | 1995 | * |
1996 | * Evaluating the modifier | | 1996 | * Evaluating the modifier |
1997 | * | | 1997 | * |
1998 | * After parsing, the modifier is evaluated. The side effects from evaluating | | 1998 | * After parsing, the modifier is evaluated. The side effects from evaluating |
1999 | * nested variable expressions in the modifier text often already happen | | 1999 | * nested variable expressions in the modifier text often already happen |
2000 | * during parsing though. For most modifiers this doesn't matter since their | | 2000 | * during parsing though. For most modifiers this doesn't matter since their |
2001 | * only noticeable effect is that the update the value of the expression. | | 2001 | * only noticeable effect is that the update the value of the expression. |
2002 | * Some modifiers such as ':sh' or '::=' have noticeable side effects though. | | 2002 | * Some modifiers such as ':sh' or '::=' have noticeable side effects though. |
2003 | * | | 2003 | * |
2004 | * Evaluating the modifier usually takes the current value of the variable | | 2004 | * Evaluating the modifier usually takes the current value of the variable |
2005 | * expression from st->expr->value, or the variable name from st->var->name | | 2005 | * expression from st->expr->value, or the variable name from st->var->name |
2006 | * and stores the result back in expr->value via Expr_SetValueOwn or | | 2006 | * and stores the result back in expr->value via Expr_SetValueOwn or |
2007 | * Expr_SetValueRefer. | | 2007 | * Expr_SetValueRefer. |
2008 | * | | 2008 | * |
2009 | * If evaluating fails (as of 2020-08-23), an error message is printed using | | 2009 | * If evaluating fails (as of 2020-08-23), an error message is printed using |
2010 | * Error. This function has no side-effects, it really just prints the error | | 2010 | * Error. This function has no side-effects, it really just prints the error |
2011 | * message. Processing the expression continues as if everything were ok. | | 2011 | * message. Processing the expression continues as if everything were ok. |
2012 | * XXX: This should be fixed by adding proper error handling to Var_Subst, | | 2012 | * XXX: This should be fixed by adding proper error handling to Var_Subst, |
2013 | * Var_Parse, ApplyModifiers and ModifyWords. | | 2013 | * Var_Parse, ApplyModifiers and ModifyWords. |
2014 | * | | 2014 | * |
2015 | * Housekeeping | | 2015 | * Housekeeping |
2016 | * | | 2016 | * |
2017 | * Some modifiers such as :D and :U turn undefined expressions into defined | | 2017 | * Some modifiers such as :D and :U turn undefined expressions into defined |
2018 | * expressions (see Expr_Define). | | 2018 | * expressions (see Expr_Define). |
2019 | * | | 2019 | * |
2020 | * Some modifiers need to free some memory. | | 2020 | * Some modifiers need to free some memory. |
2021 | */ | | 2021 | */ |
2022 | | | 2022 | |
2023 | typedef enum ExprDefined { | | 2023 | typedef enum ExprDefined { |
2024 | /* The variable expression is based on a regular, defined variable. */ | | 2024 | /* The variable expression is based on a regular, defined variable. */ |
2025 | DEF_REGULAR, | | 2025 | DEF_REGULAR, |
2026 | /* The variable expression is based on an undefined variable. */ | | 2026 | /* The variable expression is based on an undefined variable. */ |
2027 | DEF_UNDEF, | | 2027 | DEF_UNDEF, |
2028 | /* | | 2028 | /* |
2029 | * The variable expression started as an undefined expression, but one | | 2029 | * The variable expression started as an undefined expression, but one |
2030 | * of the modifiers (such as ':D' or ':U') has turned the expression | | 2030 | * of the modifiers (such as ':D' or ':U') has turned the expression |
2031 | * from undefined to defined. | | 2031 | * from undefined to defined. |
2032 | */ | | 2032 | */ |
2033 | DEF_DEFINED | | 2033 | DEF_DEFINED |
2034 | } ExprDefined; | | 2034 | } ExprDefined; |
2035 | | | 2035 | |
2036 | static const char *const ExprDefined_Name[] = { | | 2036 | static const char *const ExprDefined_Name[] = { |
2037 | "regular", | | 2037 | "regular", |
2038 | "undefined", | | 2038 | "undefined", |
2039 | "defined" | | 2039 | "defined" |
2040 | }; | | 2040 | }; |
2041 | | | 2041 | |
2042 | /* A variable expression such as $@ or ${VAR:Mpattern:Q}. */ | | 2042 | /* A variable expression such as $@ or ${VAR:Mpattern:Q}. */ |
2043 | typedef struct Expr { | | 2043 | typedef struct Expr { |
2044 | Var *var; | | 2044 | Var *var; |
2045 | FStr value; | | 2045 | FStr value; |
2046 | VarEvalFlags const eflags; | | 2046 | VarEvalFlags const eflags; |
2047 | GNode *const scope; | | 2047 | GNode *const scope; |
2048 | ExprDefined defined; | | 2048 | ExprDefined defined; |
2049 | } Expr; | | 2049 | } Expr; |
2050 | | | 2050 | |
2051 | /* | | 2051 | /* |
2052 | * Data that is used when applying a chain of modifiers to an expression. | | 2052 | * Data that is used when applying a chain of modifiers to an expression. |
2053 | * For indirect modifiers, the effects of this data stops after the indirect | | 2053 | * For indirect modifiers, the effects of this data stops after the indirect |
2054 | * modifiers have been applies. | | 2054 | * modifiers have been applies. |
2055 | * | | 2055 | * |
2056 | * It may or may not be intended that 'status' has scope Expr while 'sep' and | | 2056 | * It may or may not be intended that 'status' has scope Expr while 'sep' and |
2057 | * 'oneBigWord' have smaller scope, terminating at the end of a chain of | | 2057 | * 'oneBigWord' have smaller scope, terminating at the end of a chain of |
2058 | * indirect modifiers. | | 2058 | * indirect modifiers. |
2059 | * | | 2059 | * |
2060 | * See varmod-indirect.mk. | | 2060 | * See varmod-indirect.mk. |
2061 | */ | | 2061 | */ |
2062 | typedef struct ApplyModifiersState { | | 2062 | typedef struct ApplyModifiersState { |
2063 | Expr *expr; | | 2063 | Expr *expr; |
2064 | /* '\0' or '{' or '(' */ | | 2064 | /* '\0' or '{' or '(' */ |
2065 | const char startc; | | 2065 | const char startc; |
2066 | /* '\0' or '}' or ')' */ | | 2066 | /* '\0' or '}' or ')' */ |
2067 | const char endc; | | 2067 | const char endc; |
2068 | /* Word separator in expansions (see the :ts modifier). */ | | 2068 | /* Word separator in expansions (see the :ts modifier). */ |
2069 | char sep; | | 2069 | char sep; |
2070 | /* | | 2070 | /* |
2071 | * TRUE if some modifiers that otherwise split the variable value | | 2071 | * TRUE if some modifiers that otherwise split the variable value |
2072 | * into words, like :S and :C, treat the variable value as a single | | 2072 | * into words, like :S and :C, treat the variable value as a single |
2073 | * big word, possibly containing spaces. | | 2073 | * big word, possibly containing spaces. |
2074 | */ | | 2074 | */ |
2075 | Boolean oneBigWord; | | 2075 | Boolean oneBigWord; |
2076 | } ApplyModifiersState; | | 2076 | } ApplyModifiersState; |
2077 | | | 2077 | |
2078 | static void | | 2078 | static void |
2079 | Expr_Define(Expr *expr) | | 2079 | Expr_Define(Expr *expr) |
2080 | { | | 2080 | { |
2081 | if (expr->defined == DEF_UNDEF) | | 2081 | if (expr->defined == DEF_UNDEF) |
2082 | expr->defined = DEF_DEFINED; | | 2082 | expr->defined = DEF_DEFINED; |
2083 | } | | 2083 | } |
2084 | | | 2084 | |
2085 | static void | | 2085 | static void |
2086 | Expr_SetValueOwn(Expr *expr, char *value) | | 2086 | Expr_SetValueOwn(Expr *expr, char *value) |
2087 | { | | 2087 | { |
2088 | FStr_Done(&expr->value); | | 2088 | FStr_Done(&expr->value); |
2089 | expr->value = FStr_InitOwn(value); | | 2089 | expr->value = FStr_InitOwn(value); |
2090 | } | | 2090 | } |
2091 | | | 2091 | |
2092 | static void | | 2092 | static void |
2093 | Expr_SetValueRefer(Expr *expr, const char *value) | | 2093 | Expr_SetValueRefer(Expr *expr, const char *value) |
2094 | { | | 2094 | { |
2095 | FStr_Done(&expr->value); | | 2095 | FStr_Done(&expr->value); |
2096 | expr->value = FStr_InitRefer(value); | | 2096 | expr->value = FStr_InitRefer(value); |
2097 | } | | 2097 | } |
2098 | | | 2098 | |
2099 | typedef enum ApplyModifierResult { | | 2099 | typedef enum ApplyModifierResult { |
2100 | /* Continue parsing */ | | 2100 | /* Continue parsing */ |
2101 | AMR_OK, | | 2101 | AMR_OK, |
2102 | /* Not a match, try other modifiers as well. */ | | 2102 | /* Not a match, try other modifiers as well. */ |
2103 | AMR_UNKNOWN, | | 2103 | AMR_UNKNOWN, |
2104 | /* Error out with "Bad modifier" message. */ | | 2104 | /* Error out with "Bad modifier" message. */ |
2105 | AMR_BAD, | | 2105 | AMR_BAD, |
2106 | /* Error out without the standard error message. */ | | 2106 | /* Error out without the standard error message. */ |
2107 | AMR_CLEANUP | | 2107 | AMR_CLEANUP |
2108 | } ApplyModifierResult; | | 2108 | } ApplyModifierResult; |
2109 | | | 2109 | |
2110 | /* | | 2110 | /* |
2111 | * Allow backslashes to escape the delimiter, $, and \, but don't touch other | | 2111 | * Allow backslashes to escape the delimiter, $, and \, but don't touch other |
2112 | * backslashes. | | 2112 | * backslashes. |
2113 | */ | | 2113 | */ |
2114 | static Boolean | | 2114 | static Boolean |
2115 | IsEscapedModifierPart(const char *p, char delim, | | 2115 | IsEscapedModifierPart(const char *p, char delim, |
2116 | struct ModifyWord_SubstArgs *subst) | | 2116 | struct ModifyWord_SubstArgs *subst) |
2117 | { | | 2117 | { |
2118 | if (p[0] != '\\') | | 2118 | if (p[0] != '\\') |
2119 | return FALSE; | | 2119 | return FALSE; |
2120 | if (p[1] == delim || p[1] == '\\' || p[1] == '$') | | 2120 | if (p[1] == delim || p[1] == '\\' || p[1] == '$') |
2121 | return TRUE; | | 2121 | return TRUE; |
2122 | return p[1] == '&' && subst != NULL; | | 2122 | return p[1] == '&' && subst != NULL; |
2123 | } | | 2123 | } |
2124 | | | 2124 | |
2125 | /* See ParseModifierPart */ | | 2125 | /* See ParseModifierPart */ |
2126 | static VarParseResult | | 2126 | static VarParseResult |
2127 | ParseModifierPartSubst( | | 2127 | ParseModifierPartSubst( |
2128 | const char **pp, | | 2128 | const char **pp, |
2129 | char delim, | | 2129 | char delim, |
2130 | VarEvalFlags eflags, | | 2130 | VarEvalFlags eflags, |
2131 | ApplyModifiersState *st, | | 2131 | ApplyModifiersState *st, |
2132 | char **out_part, | | 2132 | char **out_part, |
2133 | /* Optionally stores the length of the returned string, just to save | | 2133 | /* Optionally stores the length of the returned string, just to save |
2134 | * another strlen call. */ | | 2134 | * another strlen call. */ |
2135 | size_t *out_length, | | 2135 | size_t *out_length, |
2136 | /* For the first part of the :S modifier, sets the VARP_ANCHOR_END flag | | 2136 | /* For the first part of the :S modifier, sets the VARP_ANCHOR_END flag |
2137 | * if the last character of the pattern is a $. */ | | 2137 | * if the last character of the pattern is a $. */ |
2138 | VarPatternFlags *out_pflags, | | 2138 | VarPatternFlags *out_pflags, |
2139 | /* For the second part of the :S modifier, allow ampersands to be | | 2139 | /* For the second part of the :S modifier, allow ampersands to be |
2140 | * escaped and replace unescaped ampersands with subst->lhs. */ | | 2140 | * escaped and replace unescaped ampersands with subst->lhs. */ |
2141 | struct ModifyWord_SubstArgs *subst | | 2141 | struct ModifyWord_SubstArgs *subst |
2142 | ) | | 2142 | ) |
2143 | { | | 2143 | { |
2144 | Buffer buf; | | 2144 | Buffer buf; |
2145 | const char *p; | | 2145 | const char *p; |
2146 | | | 2146 | |
2147 | Buf_Init(&buf); | | 2147 | Buf_Init(&buf); |
2148 | | | 2148 | |
2149 | /* | | 2149 | /* |
2150 | * Skim through until the matching delimiter is found; pick up | | 2150 | * Skim through until the matching delimiter is found; pick up |
2151 | * variable expressions on the way. | | 2151 | * variable expressions on the way. |
2152 | */ | | 2152 | */ |
2153 | p = *pp; | | 2153 | p = *pp; |
2154 | while (*p != '\0' && *p != delim) { | | 2154 | while (*p != '\0' && *p != delim) { |
2155 | const char *varstart; | | 2155 | const char *varstart; |
2156 | | | 2156 | |
2157 | if (IsEscapedModifierPart(p, delim, subst)) { | | 2157 | if (IsEscapedModifierPart(p, delim, subst)) { |
2158 | Buf_AddByte(&buf, p[1]); | | 2158 | Buf_AddByte(&buf, p[1]); |
2159 | p += 2; | | 2159 | p += 2; |
2160 | continue; | | 2160 | continue; |
2161 | } | | 2161 | } |
2162 | | | 2162 | |
2163 | if (*p != '$') { /* Unescaped, simple text */ | | 2163 | if (*p != '$') { /* Unescaped, simple text */ |
2164 | if (subst != NULL && *p == '&') | | 2164 | if (subst != NULL && *p == '&') |
2165 | Buf_AddBytes(&buf, subst->lhs, subst->lhsLen); | | 2165 | Buf_AddBytes(&buf, subst->lhs, subst->lhsLen); |
2166 | else | | 2166 | else |
2167 | Buf_AddByte(&buf, *p); | | 2167 | Buf_AddByte(&buf, *p); |
2168 | p++; | | 2168 | p++; |
2169 | continue; | | 2169 | continue; |
2170 | } | | 2170 | } |
2171 | | | 2171 | |
2172 | if (p[1] == delim) { /* Unescaped $ at end of pattern */ | | 2172 | if (p[1] == delim) { /* Unescaped $ at end of pattern */ |
2173 | if (out_pflags != NULL) | | 2173 | if (out_pflags != NULL) |
2174 | out_pflags->anchorEnd = TRUE; | | 2174 | out_pflags->anchorEnd = TRUE; |
2175 | else | | 2175 | else |
2176 | Buf_AddByte(&buf, *p); | | 2176 | Buf_AddByte(&buf, *p); |
2177 | p++; | | 2177 | p++; |
2178 | continue; | | 2178 | continue; |
2179 | } | | 2179 | } |
2180 | | | 2180 | |
2181 | if (eflags & VARE_WANTRES) { /* Nested variable, evaluated */ | | 2181 | if (eflags & VARE_WANTRES) { /* Nested variable, evaluated */ |
2182 | const char *nested_p = p; | | 2182 | const char *nested_p = p; |
2183 | FStr nested_val; | | 2183 | FStr nested_val; |
2184 | VarEvalFlags nested_eflags = | | 2184 | VarEvalFlags nested_eflags = |
2185 | eflags & ~(unsigned)VARE_KEEP_DOLLAR; | | 2185 | eflags & ~(unsigned)VARE_KEEP_DOLLAR; |
2186 | | | 2186 | |
2187 | (void)Var_Parse(&nested_p, st->expr->scope, | | 2187 | (void)Var_Parse(&nested_p, st->expr->scope, |
2188 | nested_eflags, &nested_val); | | 2188 | nested_eflags, &nested_val); |
2189 | /* TODO: handle errors */ | | 2189 | /* TODO: handle errors */ |
2190 | Buf_AddStr(&buf, nested_val.str); | | 2190 | Buf_AddStr(&buf, nested_val.str); |
2191 | FStr_Done(&nested_val); | | 2191 | FStr_Done(&nested_val); |
2192 | p += nested_p - p; | | 2192 | p += nested_p - p; |
2193 | continue; | | 2193 | continue; |
2194 | } | | 2194 | } |
2195 | | | 2195 | |
2196 | /* | | 2196 | /* |
2197 | * XXX: This whole block is very similar to Var_Parse without | | 2197 | * XXX: This whole block is very similar to Var_Parse without |
2198 | * VARE_WANTRES. There may be subtle edge cases though that | | 2198 | * VARE_WANTRES. There may be subtle edge cases though that |
2199 | * are not yet covered in the unit tests and that are parsed | | 2199 | * are not yet covered in the unit tests and that are parsed |
2200 | * differently, depending on whether they are evaluated or | | 2200 | * differently, depending on whether they are evaluated or |
2201 | * not. | | 2201 | * not. |
2202 | * | | 2202 | * |
2203 | * This subtle difference is not documented in the manual | | 2203 | * This subtle difference is not documented in the manual |
2204 | * page, neither is the difference between parsing :D and | | 2204 | * page, neither is the difference between parsing :D and |
2205 | * :M documented. No code should ever depend on these | | 2205 | * :M documented. No code should ever depend on these |
2206 | * details, but who knows. | | 2206 | * details, but who knows. |
2207 | */ | | 2207 | */ |
2208 | | | 2208 | |
2209 | varstart = p; /* Nested variable, only parsed */ | | 2209 | varstart = p; /* Nested variable, only parsed */ |
2210 | if (p[1] == '(' || p[1] == '{') { | | 2210 | if (p[1] == '(' || p[1] == '{') { |
2211 | /* | | 2211 | /* |
2212 | * Find the end of this variable reference | | 2212 | * Find the end of this variable reference |
2213 | * and suck it in without further ado. | | 2213 | * and suck it in without further ado. |
2214 | * It will be interpreted later. | | 2214 | * It will be interpreted later. |
2215 | */ | | 2215 | */ |
2216 | char startc = p[1]; | | 2216 | char startc = p[1]; |
2217 | int endc = startc == '(' ? ')' : '}'; | | 2217 | int endc = startc == '(' ? ')' : '}'; |
2218 | int depth = 1; | | 2218 | int depth = 1; |
2219 | | | 2219 | |
2220 | for (p += 2; *p != '\0' && depth > 0; p++) { | | 2220 | for (p += 2; *p != '\0' && depth > 0; p++) { |
2221 | if (p[-1] != '\\') { | | 2221 | if (p[-1] != '\\') { |
2222 | if (*p == startc) | | 2222 | if (*p == startc) |
2223 | depth++; | | 2223 | depth++; |
2224 | if (*p == endc) | | 2224 | if (*p == endc) |
2225 | depth--; | | 2225 | depth--; |
2226 | } | | 2226 | } |
2227 | } | | 2227 | } |
2228 | Buf_AddBytesBetween(&buf, varstart, p); | | 2228 | Buf_AddBytesBetween(&buf, varstart, p); |
2229 | } else { | | 2229 | } else { |
2230 | Buf_AddByte(&buf, *varstart); | | 2230 | Buf_AddByte(&buf, *varstart); |
2231 | p++; | | 2231 | p++; |
2232 | } | | 2232 | } |
2233 | } | | 2233 | } |
2234 | | | 2234 | |
2235 | if (*p != delim) { | | 2235 | if (*p != delim) { |
2236 | *pp = p; | | 2236 | *pp = p; |
2237 | Error("Unfinished modifier for \"%s\" ('%c' missing)", | | 2237 | Error("Unfinished modifier for \"%s\" ('%c' missing)", |
2238 | st->expr->var->name.str, delim); | | 2238 | st->expr->var->name.str, delim); |
2239 | *out_part = NULL; | | 2239 | *out_part = NULL; |
2240 | return VPR_ERR; | | 2240 | return VPR_ERR; |
2241 | } | | 2241 | } |
2242 | | | 2242 | |
2243 | *pp = p + 1; | | 2243 | *pp = p + 1; |
2244 | if (out_length != NULL) | | 2244 | if (out_length != NULL) |
2245 | *out_length = buf.len; | | 2245 | *out_length = buf.len; |
2246 | | | 2246 | |
2247 | *out_part = Buf_DoneData(&buf); | | 2247 | *out_part = Buf_DoneData(&buf); |
2248 | DEBUG1(VAR, "Modifier part: \"%s\"\n", *out_part); | | 2248 | DEBUG1(VAR, "Modifier part: \"%s\"\n", *out_part); |
2249 | return VPR_OK; | | 2249 | return VPR_OK; |
2250 | } | | 2250 | } |
2251 | | | 2251 | |
2252 | /* | | 2252 | /* |
2253 | * Parse a part of a modifier such as the "from" and "to" in :S/from/to/ or | | 2253 | * Parse a part of a modifier such as the "from" and "to" in :S/from/to/ or |
2254 | * the "var" or "replacement ${var}" in :@var@replacement ${var}@, up to and | | 2254 | * the "var" or "replacement ${var}" in :@var@replacement ${var}@, up to and |
2255 | * including the next unescaped delimiter. The delimiter, as well as the | | 2255 | * including the next unescaped delimiter. The delimiter, as well as the |
2256 | * backslash or the dollar, can be escaped with a backslash. | | 2256 | * backslash or the dollar, can be escaped with a backslash. |
2257 | * | | 2257 | * |
2258 | * Return the parsed (and possibly expanded) string, or NULL if no delimiter | | 2258 | * Return the parsed (and possibly expanded) string, or NULL if no delimiter |
2259 | * was found. On successful return, the parsing position pp points right | | 2259 | * was found. On successful return, the parsing position pp points right |
2260 | * after the delimiter. The delimiter is not included in the returned | | 2260 | * after the delimiter. The delimiter is not included in the returned |
2261 | * value though. | | 2261 | * value though. |
2262 | */ | | 2262 | */ |
2263 | static VarParseResult | | 2263 | static VarParseResult |
2264 | ParseModifierPart( | | 2264 | ParseModifierPart( |
2265 | /* The parsing position, updated upon return */ | | 2265 | /* The parsing position, updated upon return */ |
2266 | const char **pp, | | 2266 | const char **pp, |
2267 | /* Parsing stops at this delimiter */ | | 2267 | /* Parsing stops at this delimiter */ |
2268 | char delim, | | 2268 | char delim, |
2269 | /* Flags for evaluating nested variables; if VARE_WANTRES is not set, | | 2269 | /* Flags for evaluating nested variables; if VARE_WANTRES is not set, |
2270 | * the text is only parsed. */ | | 2270 | * the text is only parsed. */ |
2271 | VarEvalFlags eflags, | | 2271 | VarEvalFlags eflags, |
2272 | ApplyModifiersState *st, | | 2272 | ApplyModifiersState *st, |
2273 | char **out_part | | 2273 | char **out_part |
2274 | ) | | 2274 | ) |
2275 | { | | 2275 | { |
2276 | return ParseModifierPartSubst(pp, delim, eflags, st, out_part, | | 2276 | return ParseModifierPartSubst(pp, delim, eflags, st, out_part, |
2277 | NULL, NULL, NULL); | | 2277 | NULL, NULL, NULL); |
2278 | } | | 2278 | } |
2279 | | | 2279 | |
2280 | MAKE_INLINE Boolean | | 2280 | MAKE_INLINE Boolean |
2281 | IsDelimiter(char ch, const ApplyModifiersState *st) | | 2281 | IsDelimiter(char ch, const ApplyModifiersState *st) |
2282 | { | | 2282 | { |
2283 | return ch == ':' || ch == st->endc; | | 2283 | return ch == ':' || ch == st->endc; |
2284 | } | | 2284 | } |
2285 | | | 2285 | |
2286 | /* Test whether mod starts with modname, followed by a delimiter. */ | | 2286 | /* Test whether mod starts with modname, followed by a delimiter. */ |
2287 | MAKE_INLINE Boolean | | 2287 | MAKE_INLINE Boolean |
2288 | ModMatch(const char *mod, const char *modname, const ApplyModifiersState *st) | | 2288 | ModMatch(const char *mod, const char *modname, const ApplyModifiersState *st) |
2289 | { | | 2289 | { |
2290 | size_t n = strlen(modname); | | 2290 | size_t n = strlen(modname); |
2291 | return strncmp(mod, modname, n) == 0 && IsDelimiter(mod[n], st); | | 2291 | return strncmp(mod, modname, n) == 0 && IsDelimiter(mod[n], st); |
2292 | } | | 2292 | } |
2293 | | | 2293 | |
2294 | /* Test whether mod starts with modname, followed by a delimiter or '='. */ | | 2294 | /* Test whether mod starts with modname, followed by a delimiter or '='. */ |
2295 | MAKE_INLINE Boolean | | 2295 | MAKE_INLINE Boolean |
2296 | ModMatchEq(const char *mod, const char *modname, const ApplyModifiersState *st) | | 2296 | ModMatchEq(const char *mod, const char *modname, const ApplyModifiersState *st) |
2297 | { | | 2297 | { |
2298 | size_t n = strlen(modname); | | 2298 | size_t n = strlen(modname); |
2299 | return strncmp(mod, modname, n) == 0 && | | 2299 | return strncmp(mod, modname, n) == 0 && |
2300 | (IsDelimiter(mod[n], st) || mod[n] == '='); | | 2300 | (IsDelimiter(mod[n], st) || mod[n] == '='); |
2301 | } | | 2301 | } |
2302 | | | 2302 | |
2303 | static Boolean | | 2303 | static Boolean |
2304 | TryParseIntBase0(const char **pp, int *out_num) | | 2304 | TryParseIntBase0(const char **pp, int *out_num) |
2305 | { | | 2305 | { |
2306 | char *end; | | 2306 | char *end; |
2307 | long n; | | 2307 | long n; |
2308 | | | 2308 | |
2309 | errno = 0; | | 2309 | errno = 0; |
2310 | n = strtol(*pp, &end, 0); | | 2310 | n = strtol(*pp, &end, 0); |
2311 | if ((n == LONG_MIN || n == LONG_MAX) && errno == ERANGE) | | 2311 | if ((n == LONG_MIN || n == LONG_MAX) && errno == ERANGE) |
2312 | return FALSE; | | 2312 | return FALSE; |
2313 | if (n < INT_MIN || n > INT_MAX) | | 2313 | if (n < INT_MIN || n > INT_MAX) |
2314 | return FALSE; | | 2314 | return FALSE; |
2315 | | | 2315 | |
2316 | *pp = end; | | 2316 | *pp = end; |
2317 | *out_num = (int)n; | | 2317 | *out_num = (int)n; |
2318 | return TRUE; | | 2318 | return TRUE; |
2319 | } | | 2319 | } |
2320 | | | 2320 | |
2321 | static Boolean | | 2321 | static Boolean |
2322 | TryParseSize(const char **pp, size_t *out_num) | | 2322 | TryParseSize(const char **pp, size_t *out_num) |
2323 | { | | 2323 | { |
2324 | char *end; | | 2324 | char *end; |
2325 | unsigned long n; | | 2325 | unsigned long n; |
2326 | | | 2326 | |
2327 | if (!ch_isdigit(**pp)) | | 2327 | if (!ch_isdigit(**pp)) |
2328 | return FALSE; | | 2328 | return FALSE; |
2329 | | | 2329 | |
2330 | errno = 0; | | 2330 | errno = 0; |
2331 | n = strtoul(*pp, &end, 10); | | 2331 | n = strtoul(*pp, &end, 10); |
2332 | if (n == ULONG_MAX && errno == ERANGE) | | 2332 | if (n == ULONG_MAX && errno == ERANGE) |
2333 | return FALSE; | | 2333 | return FALSE; |
2334 | if (n > SIZE_MAX) | | 2334 | if (n > SIZE_MAX) |
2335 | return FALSE; | | 2335 | return FALSE; |
2336 | | | 2336 | |
2337 | *pp = end; | | 2337 | *pp = end; |
2338 | *out_num = (size_t)n; | | 2338 | *out_num = (size_t)n; |
2339 | return TRUE; | | 2339 | return TRUE; |
2340 | } | | 2340 | } |
2341 | | | 2341 | |
2342 | static Boolean | | 2342 | static Boolean |
2343 | TryParseChar(const char **pp, int base, char *out_ch) | | 2343 | TryParseChar(const char **pp, int base, char *out_ch) |
2344 | { | | 2344 | { |
2345 | char *end; | | 2345 | char *end; |
2346 | unsigned long n; | | 2346 | unsigned long n; |
2347 | | | 2347 | |
2348 | if (!ch_isalnum(**pp)) | | 2348 | if (!ch_isalnum(**pp)) |
2349 | return FALSE; | | 2349 | return FALSE; |
2350 | | | 2350 | |
2351 | errno = 0; | | 2351 | errno = 0; |
2352 | n = strtoul(*pp, &end, base); | | 2352 | n = strtoul(*pp, &end, base); |
2353 | if (n == ULONG_MAX && errno == ERANGE) | | 2353 | if (n == ULONG_MAX && errno == ERANGE) |
2354 | return FALSE; | | 2354 | return FALSE; |
2355 | if (n > UCHAR_MAX) | | 2355 | if (n > UCHAR_MAX) |
2356 | return FALSE; | | 2356 | return FALSE; |
2357 | | | 2357 | |
2358 | *pp = end; | | 2358 | *pp = end; |
2359 | *out_ch = (char)n; | | 2359 | *out_ch = (char)n; |
2360 | return TRUE; | | 2360 | return TRUE; |
2361 | } | | 2361 | } |
2362 | | | 2362 | |
2363 | /* | | 2363 | /* |
2364 | * Modify each word of the expression using the given function and place the | | 2364 | * Modify each word of the expression using the given function and place the |
2365 | * result back in the expression. | | 2365 | * result back in the expression. |
2366 | */ | | 2366 | */ |
2367 | static void | | 2367 | static void |
2368 | ModifyWords(ApplyModifiersState *st, | | 2368 | ModifyWords(ApplyModifiersState *st, |
2369 | ModifyWordProc modifyWord, void *modifyWord_args, | | 2369 | ModifyWordProc modifyWord, void *modifyWord_args, |
2370 | Boolean oneBigWord) | | 2370 | Boolean oneBigWord) |
2371 | { | | 2371 | { |
2372 | Expr *expr = st->expr; | | 2372 | Expr *expr = st->expr; |
2373 | const char *val = expr->value.str; | | 2373 | const char *val = expr->value.str; |
2374 | SepBuf result; | | 2374 | SepBuf result; |
2375 | Words words; | | 2375 | Words words; |
2376 | size_t i; | | 2376 | size_t i; |
2377 | | | 2377 | |
2378 | if (oneBigWord) { | | 2378 | if (oneBigWord) { |
2379 | SepBuf_Init(&result, st->sep); | | 2379 | SepBuf_Init(&result, st->sep); |
2380 | modifyWord(val, &result, modifyWord_args); | | 2380 | modifyWord(val, &result, modifyWord_args); |
2381 | goto done; | | 2381 | goto done; |
2382 | } | | 2382 | } |
2383 | | | 2383 | |
2384 | words = Str_Words(val, FALSE); | | 2384 | words = Str_Words(val, FALSE); |
2385 | | | 2385 | |
2386 | DEBUG2(VAR, "ModifyWords: split \"%s\" into %u words\n", | | 2386 | DEBUG2(VAR, "ModifyWords: split \"%s\" into %u words\n", |
2387 | val, (unsigned)words.len); | | 2387 | val, (unsigned)words.len); |
2388 | | | 2388 | |
2389 | SepBuf_Init(&result, st->sep); | | 2389 | SepBuf_Init(&result, st->sep); |
2390 | for (i = 0; i < words.len; i++) { | | 2390 | for (i = 0; i < words.len; i++) { |
2391 | modifyWord(words.words[i], &result, modifyWord_args); | | 2391 | modifyWord(words.words[i], &result, modifyWord_args); |
2392 | if (result.buf.len > 0) | | 2392 | if (result.buf.len > 0) |
2393 | SepBuf_Sep(&result); | | 2393 | SepBuf_Sep(&result); |
2394 | } | | 2394 | } |
2395 | | | 2395 | |
2396 | Words_Free(words); | | 2396 | Words_Free(words); |
2397 | | | 2397 | |
2398 | done: | | 2398 | done: |
2399 | Expr_SetValueOwn(expr, SepBuf_DoneData(&result)); | | 2399 | Expr_SetValueOwn(expr, SepBuf_DoneData(&result)); |
2400 | } | | 2400 | } |
2401 | | | 2401 | |
2402 | /* :@var@...${var}...@ */ | | 2402 | /* :@var@...${var}...@ */ |
2403 | static ApplyModifierResult | | 2403 | static ApplyModifierResult |
2404 | ApplyModifier_Loop(const char **pp, ApplyModifiersState *st) | | 2404 | ApplyModifier_Loop(const char **pp, ApplyModifiersState *st) |
2405 | { | | 2405 | { |
2406 | Expr *expr = st->expr; | | 2406 | Expr *expr = st->expr; |
2407 | struct ModifyWord_LoopArgs args; | | 2407 | struct ModifyWord_LoopArgs args; |
2408 | char prev_sep; | | 2408 | char prev_sep; |
2409 | VarParseResult res; | | 2409 | VarParseResult res; |
2410 | | | 2410 | |
2411 | args.scope = expr->scope; | | 2411 | args.scope = expr->scope; |
2412 | | | 2412 | |
2413 | (*pp)++; /* Skip the first '@' */ | | 2413 | (*pp)++; /* Skip the first '@' */ |
2414 | res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.tvar); | | 2414 | res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.tvar); |
2415 | if (res != VPR_OK) | | 2415 | if (res != VPR_OK) |
2416 | return AMR_CLEANUP; | | 2416 | return AMR_CLEANUP; |
2417 | if (opts.strict && strchr(args.tvar, '$') != NULL) { | | 2417 | if (opts.strict && strchr(args.tvar, '$') != NULL) { |
2418 | Parse_Error(PARSE_FATAL, | | 2418 | Parse_Error(PARSE_FATAL, |
2419 | "In the :@ modifier of \"%s\", the variable name \"%s\" " | | 2419 | "In the :@ modifier of \"%s\", the variable name \"%s\" " |
2420 | "must not contain a dollar.", | | 2420 | "must not contain a dollar.", |
2421 | expr->var->name.str, args.tvar); | | 2421 | expr->var->name.str, args.tvar); |
2422 | return AMR_CLEANUP; | | 2422 | return AMR_CLEANUP; |
2423 | } | | 2423 | } |
2424 | | | 2424 | |
2425 | res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.str); | | 2425 | res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.str); |
2426 | if (res != VPR_OK) | | 2426 | if (res != VPR_OK) |
2427 | return AMR_CLEANUP; | | 2427 | return AMR_CLEANUP; |
2428 | | | 2428 | |
2429 | args.eflags = expr->eflags & ~(unsigned)VARE_KEEP_DOLLAR; | | 2429 | args.eflags = expr->eflags & ~(unsigned)VARE_KEEP_DOLLAR; |
2430 | prev_sep = st->sep; | | 2430 | prev_sep = st->sep; |
2431 | st->sep = ' '; /* XXX: should be st->sep for consistency */ | | 2431 | st->sep = ' '; /* XXX: should be st->sep for consistency */ |
2432 | ModifyWords(st, ModifyWord_Loop, &args, st->oneBigWord); | | 2432 | ModifyWords(st, ModifyWord_Loop, &args, st->oneBigWord); |
2433 | st->sep = prev_sep; | | 2433 | st->sep = prev_sep; |
2434 | /* XXX: Consider restoring the previous variable instead of deleting. */ | | 2434 | /* XXX: Consider restoring the previous variable instead of deleting. */ |
2435 | /* | | 2435 | /* |
2436 | * XXX: The variable name should not be expanded here, see | | 2436 | * XXX: The variable name should not be expanded here, see |
2437 | * ModifyWord_Loop. | | 2437 | * ModifyWord_Loop. |
2438 | */ | | 2438 | */ |
2439 | Var_DeleteExpand(expr->scope, args.tvar); | | 2439 | Var_DeleteExpand(expr->scope, args.tvar); |
2440 | free(args.tvar); | | 2440 | free(args.tvar); |
2441 | free(args.str); | | 2441 | free(args.str); |
2442 | return AMR_OK; | | 2442 | return AMR_OK; |
2443 | } | | 2443 | } |
2444 | | | 2444 | |
2445 | /* :Ddefined or :Uundefined */ | | 2445 | /* :Ddefined or :Uundefined */ |
2446 | static ApplyModifierResult | | 2446 | static ApplyModifierResult |
2447 | ApplyModifier_Defined(const char **pp, ApplyModifiersState *st) | | 2447 | ApplyModifier_Defined(const char **pp, ApplyModifiersState *st) |
2448 | { | | 2448 | { |
2449 | Expr *expr = st->expr; | | 2449 | Expr *expr = st->expr; |
2450 | Buffer buf; | | 2450 | Buffer buf; |
2451 | const char *p; | | 2451 | const char *p; |
2452 | | | 2452 | |
2453 | VarEvalFlags eflags = VARE_NONE; | | 2453 | VarEvalFlags eflags = VARE_NONE; |
2454 | if (expr->eflags & VARE_WANTRES) | | 2454 | if (expr->eflags & VARE_WANTRES) |
2455 | if ((**pp == 'D') == (expr->defined == DEF_REGULAR)) | | 2455 | if ((**pp == 'D') == (expr->defined == DEF_REGULAR)) |
2456 | eflags = expr->eflags; | | 2456 | eflags = expr->eflags; |
2457 | | | 2457 | |
2458 | Buf_Init(&buf); | | 2458 | Buf_Init(&buf); |
2459 | p = *pp + 1; | | 2459 | p = *pp + 1; |
2460 | while (!IsDelimiter(*p, st) && *p != '\0') { | | 2460 | while (!IsDelimiter(*p, st) && *p != '\0') { |
2461 | | | 2461 | |
2462 | /* XXX: This code is similar to the one in Var_Parse. | | 2462 | /* XXX: This code is similar to the one in Var_Parse. |
2463 | * See if the code can be merged. | | 2463 | * See if the code can be merged. |
2464 | * See also ApplyModifier_Match and ParseModifierPart. */ | | 2464 | * See also ApplyModifier_Match and ParseModifierPart. */ |
2465 | | | 2465 | |
2466 | /* Escaped delimiter or other special character */ | | 2466 | /* Escaped delimiter or other special character */ |
2467 | /* See Buf_AddEscaped in for.c. */ | | 2467 | /* See Buf_AddEscaped in for.c. */ |
2468 | if (*p == '\\') { | | 2468 | if (*p == '\\') { |
2469 | char c = p[1]; | | 2469 | char c = p[1]; |
2470 | if (IsDelimiter(c, st) || c == '$' || c == '\\') { | | 2470 | if (IsDelimiter(c, st) || c == '$' || c == '\\') { |
2471 | Buf_AddByte(&buf, c); | | 2471 | Buf_AddByte(&buf, c); |
2472 | p += 2; | | 2472 | p += 2; |
2473 | continue; | | 2473 | continue; |
2474 | } | | 2474 | } |
2475 | } | | 2475 | } |
2476 | | | 2476 | |
2477 | /* Nested variable expression */ | | 2477 | /* Nested variable expression */ |
2478 | if (*p == '$') { | | 2478 | if (*p == '$') { |
2479 | FStr nested_val; | | 2479 | FStr nested_val; |
2480 | | | 2480 | |
2481 | (void)Var_Parse(&p, expr->scope, eflags, &nested_val); | | 2481 | (void)Var_Parse(&p, expr->scope, eflags, &nested_val); |
2482 | /* TODO: handle errors */ | | 2482 | /* TODO: handle errors */ |
2483 | Buf_AddStr(&buf, nested_val.str); | | 2483 | Buf_AddStr(&buf, nested_val.str); |
2484 | FStr_Done(&nested_val); | | 2484 | FStr_Done(&nested_val); |
2485 | continue; | | 2485 | continue; |
2486 | } | | 2486 | } |
2487 | | | 2487 | |
2488 | /* Ordinary text */ | | 2488 | /* Ordinary text */ |
2489 | Buf_AddByte(&buf, *p); | | 2489 | Buf_AddByte(&buf, *p); |
2490 | p++; | | 2490 | p++; |
2491 | } | | 2491 | } |
2492 | *pp = p; | | 2492 | *pp = p; |
2493 | | | 2493 | |
2494 | Expr_Define(expr); | | 2494 | Expr_Define(expr); |
2495 | | | 2495 | |
2496 | if (eflags & VARE_WANTRES) | | 2496 | if (eflags & VARE_WANTRES) |
2497 | Expr_SetValueOwn(expr, Buf_DoneData(&buf)); | | 2497 | Expr_SetValueOwn(expr, Buf_DoneData(&buf)); |
2498 | else | | 2498 | else |
2499 | Buf_Done(&buf); | | 2499 | Buf_Done(&buf); |
2500 | | | 2500 | |
2501 | return AMR_OK; | | 2501 | return AMR_OK; |
2502 | } | | 2502 | } |
2503 | | | 2503 | |
2504 | /* :L */ | | 2504 | /* :L */ |
2505 | static ApplyModifierResult | | 2505 | static ApplyModifierResult |
2506 | ApplyModifier_Literal(const char **pp, ApplyModifiersState *st) | | 2506 | ApplyModifier_Literal(const char **pp, ApplyModifiersState *st) |
2507 | { | | 2507 | { |
2508 | Expr *expr = st->expr; | | 2508 | Expr *expr = st->expr; |
2509 | Expr_Define(expr); | | 2509 | Expr_Define(expr); |
2510 | Expr_SetValueOwn(expr, bmake_strdup(expr->var->name.str)); | | 2510 | Expr_SetValueOwn(expr, bmake_strdup(expr->var->name.str)); |
2511 | (*pp)++; | | 2511 | (*pp)++; |
2512 | return AMR_OK; | | 2512 | return AMR_OK; |
2513 | } | | 2513 | } |
2514 | | | 2514 | |
2515 | static Boolean | | 2515 | static Boolean |
2516 | TryParseTime(const char **pp, time_t *out_time) | | 2516 | TryParseTime(const char **pp, time_t *out_time) |
2517 | { | | 2517 | { |
2518 | char *end; | | 2518 | char *end; |
2519 | unsigned long n; | | 2519 | unsigned long n; |
2520 | | | 2520 | |
2521 | if (!ch_isdigit(**pp)) | | 2521 | if (!ch_isdigit(**pp)) |
2522 | return FALSE; | | 2522 | return FALSE; |
2523 | | | 2523 | |
2524 | errno = 0; | | 2524 | errno = 0; |
2525 | n = strtoul(*pp, &end, 10); | | 2525 | n = strtoul(*pp, &end, 10); |
2526 | if (n == ULONG_MAX && errno == ERANGE) | | 2526 | if (n == ULONG_MAX && errno == ERANGE) |
2527 | return FALSE; | | 2527 | return FALSE; |
2528 | | | 2528 | |
2529 | *pp = end; | | 2529 | *pp = end; |
2530 | *out_time = (time_t)n; /* ignore possible truncation for now */ | | 2530 | *out_time = (time_t)n; /* ignore possible truncation for now */ |
2531 | return TRUE; | | 2531 | return TRUE; |
2532 | } | | 2532 | } |
2533 | | | 2533 | |
2534 | /* :gmtime */ | | 2534 | /* :gmtime */ |
2535 | static ApplyModifierResult | | 2535 | static ApplyModifierResult |
2536 | ApplyModifier_Gmtime(const char **pp, ApplyModifiersState *st) | | 2536 | ApplyModifier_Gmtime(const char **pp, ApplyModifiersState *st) |
2537 | { | | 2537 | { |
2538 | time_t utc; | | 2538 | time_t utc; |
2539 | | | 2539 | |
2540 | const char *mod = *pp; | | 2540 | const char *mod = *pp; |
2541 | if (!ModMatchEq(mod, "gmtime", st)) | | 2541 | if (!ModMatchEq(mod, "gmtime", st)) |
2542 | return AMR_UNKNOWN; | | 2542 | return AMR_UNKNOWN; |
2543 | | | 2543 | |
2544 | if (mod[6] == '=') { | | 2544 | if (mod[6] == '=') { |
2545 | const char *p = mod + 7; | | 2545 | const char *p = mod + 7; |
2546 | if (!TryParseTime(&p, &utc)) { | | 2546 | if (!TryParseTime(&p, &utc)) { |
2547 | Parse_Error(PARSE_FATAL, | | 2547 | Parse_Error(PARSE_FATAL, |
2548 | "Invalid time value: %s", mod + 7); | | 2548 | "Invalid time value: %s", mod + 7); |
2549 | return AMR_CLEANUP; | | 2549 | return AMR_CLEANUP; |
2550 | } | | 2550 | } |
2551 | *pp = p; | | 2551 | *pp = p; |
2552 | } else { | | 2552 | } else { |
2553 | utc = 0; | | 2553 | utc = 0; |
2554 | *pp = mod + 6; | | 2554 | *pp = mod + 6; |
2555 | } | | 2555 | } |
2556 | Expr_SetValueOwn(st->expr, | | 2556 | Expr_SetValueOwn(st->expr, |
2557 | VarStrftime(st->expr->value.str, TRUE, utc)); | | 2557 | VarStrftime(st->expr->value.str, TRUE, utc)); |
2558 | return AMR_OK; | | 2558 | return AMR_OK; |
2559 | } | | 2559 | } |
2560 | | | 2560 | |
2561 | /* :localtime */ | | 2561 | /* :localtime */ |
2562 | static ApplyModifierResult | | 2562 | static ApplyModifierResult |
2563 | ApplyModifier_Localtime(const char **pp, ApplyModifiersState *st) | | 2563 | ApplyModifier_Localtime(const char **pp, ApplyModifiersState *st) |
2564 | { | | 2564 | { |
2565 | time_t utc; | | 2565 | time_t utc; |
2566 | | | 2566 | |
2567 | const char *mod = *pp; | | 2567 | const char *mod = *pp; |
2568 | if (!ModMatchEq(mod, "localtime", st)) | | 2568 | if (!ModMatchEq(mod, "localtime", st)) |
2569 | return AMR_UNKNOWN; | | 2569 | return AMR_UNKNOWN; |
2570 | | | 2570 | |
2571 | if (mod[9] == '=') { | | 2571 | if (mod[9] == '=') { |
2572 | const char *p = mod + 10; | | 2572 | const char *p = mod + 10; |
2573 | if (!TryParseTime(&p, &utc)) { | | 2573 | if (!TryParseTime(&p, &utc)) { |
2574 | Parse_Error(PARSE_FATAL, | | 2574 | Parse_Error(PARSE_FATAL, |
2575 | "Invalid time value: %s", mod + 10); | | 2575 | "Invalid time value: %s", mod + 10); |
2576 | return AMR_CLEANUP; | | 2576 | return AMR_CLEANUP; |
2577 | } | | 2577 | } |
2578 | *pp = p; | | 2578 | *pp = p; |
2579 | } else { | | 2579 | } else { |
2580 | utc = 0; | | 2580 | utc = 0; |
2581 | *pp = mod + 9; | | 2581 | *pp = mod + 9; |
2582 | } | | 2582 | } |
2583 | Expr_SetValueOwn(st->expr, | | 2583 | Expr_SetValueOwn(st->expr, |
2584 | VarStrftime(st->expr->value.str, FALSE, utc)); | | 2584 | VarStrftime(st->expr->value.str, FALSE, utc)); |
2585 | return AMR_OK; | | 2585 | return AMR_OK; |
2586 | } | | 2586 | } |
2587 | | | 2587 | |
2588 | /* :hash */ | | 2588 | /* :hash */ |
2589 | static ApplyModifierResult | | 2589 | static ApplyModifierResult |
2590 | ApplyModifier_Hash(const char **pp, ApplyModifiersState *st) | | 2590 | ApplyModifier_Hash(const char **pp, ApplyModifiersState *st) |
2591 | { | | 2591 | { |
2592 | if (!ModMatch(*pp, "hash", st)) | | 2592 | if (!ModMatch(*pp, "hash", st)) |
2593 | return AMR_UNKNOWN; | | 2593 | return AMR_UNKNOWN; |
2594 | | | 2594 | |
2595 | Expr_SetValueOwn(st->expr, VarHash(st->expr->value.str)); | | 2595 | Expr_SetValueOwn(st->expr, VarHash(st->expr->value.str)); |
2596 | *pp += 4; | | 2596 | *pp += 4; |
2597 | return AMR_OK; | | 2597 | return AMR_OK; |
2598 | } | | 2598 | } |
2599 | | | 2599 | |
2600 | /* :P */ | | 2600 | /* :P */ |
2601 | static ApplyModifierResult | | 2601 | static ApplyModifierResult |
2602 | ApplyModifier_Path(const char **pp, ApplyModifiersState *st) | | 2602 | ApplyModifier_Path(const char **pp, ApplyModifiersState *st) |
2603 | { | | 2603 | { |
2604 | Expr *expr = st->expr; | | 2604 | Expr *expr = st->expr; |
2605 | GNode *gn; | | 2605 | GNode *gn; |
2606 | char *path; | | 2606 | char *path; |
2607 | | | 2607 | |
2608 | Expr_Define(expr); | | 2608 | Expr_Define(expr); |
2609 | | | 2609 | |
2610 | gn = Targ_FindNode(expr->var->name.str); | | 2610 | gn = Targ_FindNode(expr->var->name.str); |
2611 | if (gn == NULL || gn->type & OP_NOPATH) { | | 2611 | if (gn == NULL || gn->type & OP_NOPATH) { |
2612 | path = NULL; | | 2612 | path = NULL; |
2613 | } else if (gn->path != NULL) { | | 2613 | } else if (gn->path != NULL) { |
2614 | path = bmake_strdup(gn->path); | | 2614 | path = bmake_strdup(gn->path); |
2615 | } else { | | 2615 | } else { |
2616 | SearchPath *searchPath = Suff_FindPath(gn); | | 2616 | SearchPath *searchPath = Suff_FindPath(gn); |
2617 | path = Dir_FindFile(expr->var->name.str, searchPath); | | 2617 | path = Dir_FindFile(expr->var->name.str, searchPath); |
2618 | } | | 2618 | } |
2619 | if (path == NULL) | | 2619 | if (path == NULL) |
2620 | path = bmake_strdup(expr->var->name.str); | | 2620 | path = bmake_strdup(expr->var->name.str); |
2621 | Expr_SetValueOwn(expr, path); | | 2621 | Expr_SetValueOwn(expr, path); |
2622 | | | 2622 | |
2623 | (*pp)++; | | 2623 | (*pp)++; |
2624 | return AMR_OK; | | 2624 | return AMR_OK; |
2625 | } | | 2625 | } |
2626 | | | 2626 | |
2627 | /* :!cmd! */ | | 2627 | /* :!cmd! */ |
2628 | static ApplyModifierResult | | 2628 | static ApplyModifierResult |
2629 | ApplyModifier_ShellCommand(const char **pp, ApplyModifiersState *st) | | 2629 | ApplyModifier_ShellCommand(const char **pp, ApplyModifiersState *st) |
2630 | { | | 2630 | { |
2631 | Expr *expr = st->expr; | | 2631 | Expr *expr = st->expr; |
2632 | char *cmd; | | 2632 | char *cmd; |
2633 | const char *errfmt; | | 2633 | const char *errfmt; |
2634 | VarParseResult res; | | 2634 | VarParseResult res; |
2635 | | | 2635 | |
2636 | (*pp)++; | | 2636 | (*pp)++; |
2637 | res = ParseModifierPart(pp, '!', expr->eflags, st, &cmd); | | 2637 | res = ParseModifierPart(pp, '!', expr->eflags, st, &cmd); |
2638 | if (res != VPR_OK) | | 2638 | if (res != VPR_OK) |
2639 | return AMR_CLEANUP; | | 2639 | return AMR_CLEANUP; |
2640 | | | 2640 | |
2641 | errfmt = NULL; | | 2641 | errfmt = NULL; |
2642 | if (expr->eflags & VARE_WANTRES) | | 2642 | if (expr->eflags & VARE_WANTRES) |
2643 | Expr_SetValueOwn(expr, Cmd_Exec(cmd, &errfmt)); | | 2643 | Expr_SetValueOwn(expr, Cmd_Exec(cmd, &errfmt)); |
2644 | else | | 2644 | else |
2645 | Expr_SetValueRefer(expr, ""); | | 2645 | Expr_SetValueRefer(expr, ""); |
2646 | if (errfmt != NULL) | | 2646 | if (errfmt != NULL) |
2647 | Error(errfmt, cmd); /* XXX: why still return AMR_OK? */ | | 2647 | Error(errfmt, cmd); /* XXX: why still return AMR_OK? */ |
2648 | free(cmd); | | 2648 | free(cmd); |
2649 | | | 2649 | |
2650 | Expr_Define(expr); | | 2650 | Expr_Define(expr); |
2651 | return AMR_OK; | | 2651 | return AMR_OK; |
2652 | } | | 2652 | } |
2653 | | | 2653 | |
2654 | /* | | 2654 | /* |
2655 | * The :range modifier generates an integer sequence as long as the words. | | 2655 | * The :range modifier generates an integer sequence as long as the words. |
2656 | * The :range=7 modifier generates an integer sequence from 1 to 7. | | 2656 | * The :range=7 modifier generates an integer sequence from 1 to 7. |
2657 | */ | | 2657 | */ |
2658 | static ApplyModifierResult | | 2658 | static ApplyModifierResult |
2659 | ApplyModifier_Range(const char **pp, ApplyModifiersState *st) | | 2659 | ApplyModifier_Range(const char **pp, ApplyModifiersState *st) |
2660 | { | | 2660 | { |
2661 | size_t n; | | 2661 | size_t n; |
2662 | Buffer buf; | | 2662 | Buffer buf; |
2663 | size_t i; | | 2663 | size_t i; |
2664 | | | 2664 | |
2665 | const char *mod = *pp; | | 2665 | const char *mod = *pp; |
2666 | if (!ModMatchEq(mod, "range", st)) | | 2666 | if (!ModMatchEq(mod, "range", st)) |
2667 | return AMR_UNKNOWN; | | 2667 | return AMR_UNKNOWN; |
2668 | | | 2668 | |
2669 | if (mod[5] == '=') { | | 2669 | if (mod[5] == '=') { |
2670 | const char *p = mod + 6; | | 2670 | const char *p = mod + 6; |
2671 | if (!TryParseSize(&p, &n)) { | | 2671 | if (!TryParseSize(&p, &n)) { |
2672 | Parse_Error(PARSE_FATAL, | | 2672 | Parse_Error(PARSE_FATAL, |
2673 | "Invalid number \"%s\" for ':range' modifier", | | 2673 | "Invalid number \"%s\" for ':range' modifier", |
2674 | mod + 6); | | 2674 | mod + 6); |
2675 | return AMR_CLEANUP; | | 2675 | return AMR_CLEANUP; |
2676 | } | | 2676 | } |
2677 | *pp = p; | | 2677 | *pp = p; |
2678 | } else { | | 2678 | } else { |
2679 | n = 0; | | 2679 | n = 0; |
2680 | *pp = mod + 5; | | 2680 | *pp = mod + 5; |
2681 | } | | 2681 | } |
2682 | | | 2682 | |
2683 | if (n == 0) { | | 2683 | if (n == 0) { |
2684 | Words words = Str_Words(st->expr->value.str, FALSE); | | 2684 | Words words = Str_Words(st->expr->value.str, FALSE); |
2685 | n = words.len; | | 2685 | n = words.len; |
2686 | Words_Free(words); | | 2686 | Words_Free(words); |
2687 | } | | 2687 | } |
2688 | | | 2688 | |
2689 | Buf_Init(&buf); | | 2689 | Buf_Init(&buf); |
2690 | | | 2690 | |
2691 | for (i = 0; i < n; i++) { | | 2691 | for (i = 0; i < n; i++) { |
2692 | if (i != 0) { | | 2692 | if (i != 0) { |
2693 | /* XXX: Use st->sep instead of ' ', for consistency. */ | | 2693 | /* XXX: Use st->sep instead of ' ', for consistency. */ |
2694 | Buf_AddByte(&buf, ' '); | | 2694 | Buf_AddByte(&buf, ' '); |
2695 | } | | 2695 | } |
2696 | Buf_AddInt(&buf, 1 + (int)i); | | 2696 | Buf_AddInt(&buf, 1 + (int)i); |
2697 | } | | 2697 | } |
2698 | | | 2698 | |
2699 | Expr_SetValueOwn(st->expr, Buf_DoneData(&buf)); | | 2699 | Expr_SetValueOwn(st->expr, Buf_DoneData(&buf)); |
2700 | return AMR_OK; | | 2700 | return AMR_OK; |
2701 | } | | 2701 | } |
2702 | | | 2702 | |
2703 | /* Parse a ':M' or ':N' modifier. */ | | 2703 | /* Parse a ':M' or ':N' modifier. */ |
2704 | static void | | 2704 | static void |
2705 | ParseModifier_Match(const char **pp, const ApplyModifiersState *st, | | 2705 | ParseModifier_Match(const char **pp, const ApplyModifiersState *st, |
2706 | char **out_pattern) | | 2706 | char **out_pattern) |
2707 | { | | 2707 | { |
2708 | const char *mod = *pp; | | 2708 | const char *mod = *pp; |
2709 | Expr *expr = st->expr; | | 2709 | Expr *expr = st->expr; |
2710 | Boolean copy = FALSE; /* pattern should be, or has been, copied */ | | 2710 | Boolean copy = FALSE; /* pattern should be, or has been, copied */ |
2711 | Boolean needSubst = FALSE; | | 2711 | Boolean needSubst = FALSE; |
2712 | const char *endpat; | | 2712 | const char *endpat; |
2713 | char *pattern; | | 2713 | char *pattern; |
2714 | | | 2714 | |
2715 | /* | | 2715 | /* |
2716 | * In the loop below, ignore ':' unless we are at (or back to) the | | 2716 | * In the loop below, ignore ':' unless we are at (or back to) the |
2717 | * original brace level. | | 2717 | * original brace level. |
2718 | * XXX: This will likely not work right if $() and ${} are intermixed. | | 2718 | * XXX: This will likely not work right if $() and ${} are intermixed. |
2719 | */ | | 2719 | */ |
2720 | /* | | 2720 | /* |
2721 | * XXX: This code is similar to the one in Var_Parse. | | 2721 | * XXX: This code is similar to the one in Var_Parse. |
2722 | * See if the code can be merged. | | 2722 | * See if the code can be merged. |
2723 | * See also ApplyModifier_Defined. | | 2723 | * See also ApplyModifier_Defined. |
2724 | */ | | 2724 | */ |
2725 | int nest = 0; | | 2725 | int nest = 0; |
2726 | const char *p; | | 2726 | const char *p; |
2727 | for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) { | | 2727 | for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) { |
2728 | if (*p == '\\' && | | 2728 | if (*p == '\\' && |
2729 | (IsDelimiter(p[1], st) || p[1] == st->startc)) { | | 2729 | (IsDelimiter(p[1], st) || p[1] == st->startc)) { |
2730 | if (!needSubst) | | 2730 | if (!needSubst) |
2731 | copy = TRUE; | | 2731 | copy = TRUE; |
2732 | p++; | | 2732 | p++; |
2733 | continue; | | 2733 | continue; |
2734 | } | | 2734 | } |
2735 | if (*p == '$') | | 2735 | if (*p == '$') |
2736 | needSubst = TRUE; | | 2736 | needSubst = TRUE; |
2737 | if (*p == '(' || *p == '{') | | 2737 | if (*p == '(' || *p == '{') |
2738 | nest++; | | 2738 | nest++; |
2739 | if (*p == ')' || *p == '}') { | | 2739 | if (*p == ')' || *p == '}') { |
2740 | nest--; | | 2740 | nest--; |
2741 | if (nest < 0) | | 2741 | if (nest < 0) |
2742 | break; | | 2742 | break; |
2743 | } | | 2743 | } |
2744 | } | | 2744 | } |
2745 | *pp = p; | | 2745 | *pp = p; |
2746 | endpat = p; | | 2746 | endpat = p; |
2747 | | | 2747 | |
2748 | if (copy) { | | 2748 | if (copy) { |
2749 | char *dst; | | 2749 | char *dst; |
2750 | const char *src; | | 2750 | const char *src; |
2751 | | | 2751 | |
2752 | /* Compress the \:'s out of the pattern. */ | | 2752 | /* Compress the \:'s out of the pattern. */ |
2753 | pattern = bmake_malloc((size_t)(endpat - (mod + 1)) + 1); | | 2753 | pattern = bmake_malloc((size_t)(endpat - (mod + 1)) + 1); |
2754 | dst = pattern; | | 2754 | dst = pattern; |
2755 | src = mod + 1; | | 2755 | src = mod + 1; |
2756 | for (; src < endpat; src++, dst++) { | | 2756 | for (; src < endpat; src++, dst++) { |
2757 | if (src[0] == '\\' && src + 1 < endpat && | | 2757 | if (src[0] == '\\' && src + 1 < endpat && |
2758 | /* XXX: st->startc is missing here; see above */ | | 2758 | /* XXX: st->startc is missing here; see above */ |
2759 | IsDelimiter(src[1], st)) | | 2759 | IsDelimiter(src[1], st)) |
2760 | src++; | | 2760 | src++; |
2761 | *dst = *src; | | 2761 | *dst = *src; |
2762 | } | | 2762 | } |
2763 | *dst = '\0'; | | 2763 | *dst = '\0'; |
2764 | } else { | | 2764 | } else { |
2765 | pattern = bmake_strsedup(mod + 1, endpat); | | 2765 | pattern = bmake_strsedup(mod + 1, endpat); |
2766 | } | | 2766 | } |
2767 | | | 2767 | |
2768 | if (needSubst) { | | 2768 | if (needSubst) { |
2769 | char *old_pattern = pattern; | | 2769 | char *old_pattern = pattern; |
2770 | (void)Var_Subst(pattern, expr->scope, expr->eflags, &pattern); | | 2770 | (void)Var_Subst(pattern, expr->scope, expr->eflags, &pattern); |
2771 | /* TODO: handle errors */ | | 2771 | /* TODO: handle errors */ |
2772 | free(old_pattern); | | 2772 | free(old_pattern); |
2773 | } | | 2773 | } |
2774 | | | 2774 | |
2775 | DEBUG3(VAR, "Pattern[%s] for [%s] is [%s]\n", | | 2775 | DEBUG3(VAR, "Pattern[%s] for [%s] is [%s]\n", |
2776 | expr->var->name.str, expr->value.str, pattern); | | 2776 | expr->var->name.str, expr->value.str, pattern); |
2777 | | | 2777 | |
2778 | *out_pattern = pattern; | | 2778 | *out_pattern = pattern; |
2779 | } | | 2779 | } |
2780 | | | 2780 | |
2781 | /* :Mpattern or :Npattern */ | | 2781 | /* :Mpattern or :Npattern */ |
2782 | static ApplyModifierResult | | 2782 | static ApplyModifierResult |
2783 | ApplyModifier_Match(const char **pp, ApplyModifiersState *st) | | 2783 | ApplyModifier_Match(const char **pp, ApplyModifiersState *st) |
2784 | { | | 2784 | { |
2785 | const char *mod = *pp; | | 2785 | const char *mod = *pp; |
2786 | char *pattern; | | 2786 | char *pattern; |
2787 | ModifyWordProc modifyWord; | | 2787 | ModifyWordProc modifyWord; |
2788 | | | 2788 | |
2789 | ParseModifier_Match(pp, st, &pattern); | | 2789 | ParseModifier_Match(pp, st, &pattern); |
2790 | | | 2790 | |
2791 | modifyWord = mod[0] == 'M' ? ModifyWord_Match : ModifyWord_NoMatch; | | 2791 | modifyWord = mod[0] == 'M' ? ModifyWord_Match : ModifyWord_NoMatch; |
2792 | ModifyWords(st, modifyWord, pattern, st->oneBigWord); | | 2792 | ModifyWords(st, modifyWord, pattern, st->oneBigWord); |
2793 | free(pattern); | | 2793 | free(pattern); |
2794 | return AMR_OK; | | 2794 | return AMR_OK; |
2795 | } | | 2795 | } |
2796 | | | 2796 | |
2797 | static void | | 2797 | static void |
2798 | ParsePatternFlags(const char **pp, VarPatternFlags *pflags, Boolean *oneBigWord) | | 2798 | ParsePatternFlags(const char **pp, VarPatternFlags *pflags, Boolean *oneBigWord) |
2799 | { | | 2799 | { |
2800 | for (;; (*pp)++) { | | 2800 | for (;; (*pp)++) { |
2801 | if (**pp == 'g') | | 2801 | if (**pp == 'g') |
2802 | pflags->subGlobal = TRUE; | | 2802 | pflags->subGlobal = TRUE; |
2803 | else if (**pp == '1') | | 2803 | else if (**pp == '1') |
2804 | pflags->subOnce = TRUE; | | 2804 | pflags->subOnce = TRUE; |
2805 | else if (**pp == 'W') | | 2805 | else if (**pp == 'W') |
2806 | *oneBigWord = TRUE; | | 2806 | *oneBigWord = TRUE; |
2807 | else | | 2807 | else |
2808 | break; | | 2808 | break; |
2809 | } | | 2809 | } |
2810 | } | | 2810 | } |
2811 | | | 2811 | |
2812 | /* :S,from,to, */ | | 2812 | /* :S,from,to, */ |
2813 | static ApplyModifierResult | | 2813 | static ApplyModifierResult |
2814 | ApplyModifier_Subst(const char **pp, ApplyModifiersState *st) | | 2814 | ApplyModifier_Subst(const char **pp, ApplyModifiersState *st) |
2815 | { | | 2815 | { |
2816 | struct ModifyWord_SubstArgs args; | | 2816 | struct ModifyWord_SubstArgs args; |
2817 | char *lhs, *rhs; | | 2817 | char *lhs, *rhs; |
2818 | Boolean oneBigWord; | | 2818 | Boolean oneBigWord; |
2819 | VarParseResult res; | | 2819 | VarParseResult res; |
2820 | | | 2820 | |
2821 | char delim = (*pp)[1]; | | 2821 | char delim = (*pp)[1]; |
2822 | if (delim == '\0') { | | 2822 | if (delim == '\0') { |
2823 | Error("Missing delimiter for modifier ':S'"); | | 2823 | Error("Missing delimiter for modifier ':S'"); |
2824 | (*pp)++; | | 2824 | (*pp)++; |
2825 | return AMR_CLEANUP; | | 2825 | return AMR_CLEANUP; |
2826 | } | | 2826 | } |
2827 | | | 2827 | |
2828 | *pp += 2; | | 2828 | *pp += 2; |
2829 | | | 2829 | |
2830 | args.pflags = (VarPatternFlags){ FALSE, FALSE, FALSE, FALSE }; | | 2830 | args.pflags = (VarPatternFlags){ FALSE, FALSE, FALSE, FALSE }; |
2831 | args.matched = FALSE; | | 2831 | args.matched = FALSE; |
2832 | | | 2832 | |
2833 | if (**pp == '^') { | | 2833 | if (**pp == '^') { |
2834 | args.pflags.anchorStart = TRUE; | | 2834 | args.pflags.anchorStart = TRUE; |
2835 | (*pp)++; | | 2835 | (*pp)++; |
2836 | } | | 2836 | } |
2837 | | | 2837 | |
2838 | res = ParseModifierPartSubst(pp, delim, st->expr->eflags, st, &lhs, | | 2838 | res = ParseModifierPartSubst(pp, delim, st->expr->eflags, st, &lhs, |
2839 | &args.lhsLen, &args.pflags, NULL); | | 2839 | &args.lhsLen, &args.pflags, NULL); |
2840 | if (res != VPR_OK) | | 2840 | if (res != VPR_OK) |
2841 | return AMR_CLEANUP; | | 2841 | return AMR_CLEANUP; |
2842 | args.lhs = lhs; | | 2842 | args.lhs = lhs; |
2843 | | | 2843 | |
2844 | res = ParseModifierPartSubst(pp, delim, st->expr->eflags, st, &rhs, | | 2844 | res = ParseModifierPartSubst(pp, delim, st->expr->eflags, st, &rhs, |
2845 | &args.rhsLen, NULL, &args); | | 2845 | &args.rhsLen, NULL, &args); |
2846 | if (res != VPR_OK) | | 2846 | if (res != VPR_OK) |
2847 | return AMR_CLEANUP; | | 2847 | return AMR_CLEANUP; |
2848 | args.rhs = rhs; | | 2848 | args.rhs = rhs; |
2849 | | | 2849 | |
2850 | oneBigWord = st->oneBigWord; | | 2850 | oneBigWord = st->oneBigWord; |
2851 | ParsePatternFlags(pp, &args.pflags, &oneBigWord); | | 2851 | ParsePatternFlags(pp, &args.pflags, &oneBigWord); |
2852 | | | 2852 | |
2853 | ModifyWords(st, ModifyWord_Subst, &args, oneBigWord); | | 2853 | ModifyWords(st, ModifyWord_Subst, &args, oneBigWord); |
2854 | | | 2854 | |
2855 | free(lhs); | | 2855 | free(lhs); |
2856 | free(rhs); | | 2856 | free(rhs); |
2857 | return AMR_OK; | | 2857 | return AMR_OK; |
2858 | } | | 2858 | } |
2859 | | | 2859 | |
2860 | #ifndef NO_REGEX | | 2860 | #ifndef NO_REGEX |
2861 | | | 2861 | |
2862 | /* :C,from,to, */ | | 2862 | /* :C,from,to, */ |
2863 | static ApplyModifierResult | | 2863 | static ApplyModifierResult |
2864 | ApplyModifier_Regex(const char **pp, ApplyModifiersState *st) | | 2864 | ApplyModifier_Regex(const char **pp, ApplyModifiersState *st) |
2865 | { | | 2865 | { |
2866 | char *re; | | 2866 | char *re; |
2867 | struct ModifyWord_SubstRegexArgs args; | | 2867 | struct ModifyWord_SubstRegexArgs args; |
2868 | Boolean oneBigWord; | | 2868 | Boolean oneBigWord; |
2869 | int error; | | 2869 | int error; |
2870 | VarParseResult res; | | 2870 | VarParseResult res; |
2871 | | | 2871 | |
2872 | char delim = (*pp)[1]; | | 2872 | char delim = (*pp)[1]; |
2873 | if (delim == '\0') { | | 2873 | if (delim == '\0') { |
2874 | Error("Missing delimiter for :C modifier"); | | 2874 | Error("Missing delimiter for :C modifier"); |
2875 | (*pp)++; | | 2875 | (*pp)++; |
2876 | return AMR_CLEANUP; | | 2876 | return AMR_CLEANUP; |
2877 | } | | 2877 | } |
2878 | | | 2878 | |
2879 | *pp += 2; | | 2879 | *pp += 2; |
2880 | | | 2880 | |
2881 | res = ParseModifierPart(pp, delim, st->expr->eflags, st, &re); | | 2881 | res = ParseModifierPart(pp, delim, st->expr->eflags, st, &re); |
2882 | if (res != VPR_OK) | | 2882 | if (res != VPR_OK) |
2883 | return AMR_CLEANUP; | | 2883 | return AMR_CLEANUP; |
2884 | | | 2884 | |
2885 | res = ParseModifierPart(pp, delim, st->expr->eflags, st, &args.replace); | | 2885 | res = ParseModifierPart(pp, delim, st->expr->eflags, st, &args.replace); |
2886 | if (args.replace == NULL) { | | 2886 | if (args.replace == NULL) { |
2887 | free(re); | | 2887 | free(re); |
2888 | return AMR_CLEANUP; | | 2888 | return AMR_CLEANUP; |
2889 | } | | 2889 | } |
2890 | | | 2890 | |
2891 | args.pflags = (VarPatternFlags){ FALSE, FALSE, FALSE, FALSE }; | | 2891 | args.pflags = (VarPatternFlags){ FALSE, FALSE, FALSE, FALSE }; |
2892 | args.matched = FALSE; | | 2892 | args.matched = FALSE; |
2893 | oneBigWord = st->oneBigWord; | | 2893 | oneBigWord = st->oneBigWord; |
2894 | ParsePatternFlags(pp, &args.pflags, &oneBigWord); | | 2894 | ParsePatternFlags(pp, &args.pflags, &oneBigWord); |
2895 | | | 2895 | |
2896 | if (!(st->expr->eflags & VARE_WANTRES)) { | | 2896 | if (!(st->expr->eflags & VARE_WANTRES)) { |
2897 | free(args.replace); | | 2897 | free(args.replace); |
2898 | free(re); | | 2898 | free(re); |
2899 | return AMR_OK; | | 2899 | return AMR_OK; |
2900 | } | | 2900 | } |
2901 | | | 2901 | |
2902 | error = regcomp(&args.re, re, REG_EXTENDED); | | 2902 | error = regcomp(&args.re, re, REG_EXTENDED); |
2903 | free(re); | | 2903 | free(re); |
2904 | if (error != 0) { | | 2904 | if (error != 0) { |
2905 | VarREError(error, &args.re, "Regex compilation error"); | | 2905 | VarREError(error, &args.re, "Regex compilation error"); |
2906 | free(args.replace); | | 2906 | free(args.replace); |
2907 | return AMR_CLEANUP; | | 2907 | return AMR_CLEANUP; |
2908 | } | | 2908 | } |
2909 | | | 2909 | |
2910 | args.nsub = args.re.re_nsub + 1; | | 2910 | args.nsub = args.re.re_nsub + 1; |
2911 | if (args.nsub > 10) | | 2911 | if (args.nsub > 10) |
2912 | args.nsub = 10; | | 2912 | args.nsub = 10; |
2913 | | | 2913 | |
2914 | ModifyWords(st, ModifyWord_SubstRegex, &args, oneBigWord); | | 2914 | ModifyWords(st, ModifyWord_SubstRegex, &args, oneBigWord); |
2915 | | | 2915 | |
2916 | regfree(&args.re); | | 2916 | regfree(&args.re); |
2917 | free(args.replace); | | 2917 | free(args.replace); |
2918 | return AMR_OK; | | 2918 | return AMR_OK; |
2919 | } | | 2919 | } |
2920 | | | 2920 | |
2921 | #endif | | 2921 | #endif |
2922 | | | 2922 | |
2923 | /* :Q, :q */ | | 2923 | /* :Q, :q */ |
2924 | static ApplyModifierResult | | 2924 | static ApplyModifierResult |
2925 | ApplyModifier_Quote(const char **pp, ApplyModifiersState *st) | | 2925 | ApplyModifier_Quote(const char **pp, ApplyModifiersState *st) |
2926 | { | | 2926 | { |
2927 | if (IsDelimiter((*pp)[1], st)) { | | 2927 | Boolean quoteDollar = **pp == 'q'; |
2928 | Expr_SetValueOwn(st->expr, | | 2928 | if (!IsDelimiter((*pp)[1], st)) |
2929 | VarQuote(st->expr->value.str, **pp == 'q')); | | | |
2930 | (*pp)++; | | | |
2931 | return AMR_OK; | | | |
2932 | } else | | | |
2933 | return AMR_UNKNOWN; | | 2929 | return AMR_UNKNOWN; |
| | | 2930 | (*pp)++; |
| | | 2931 | |
| | | 2932 | Expr_SetValueOwn(st->expr, VarQuote(st->expr->value.str, quoteDollar)); |
| | | 2933 | |
| | | 2934 | return AMR_OK; |
2934 | } | | 2935 | } |
2935 | | | 2936 | |
2936 | /*ARGSUSED*/ | | 2937 | /*ARGSUSED*/ |
2937 | static void | | 2938 | static void |
2938 | ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED) | | 2939 | ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED) |
2939 | { | | 2940 | { |
2940 | SepBuf_AddStr(buf, word); | | 2941 | SepBuf_AddStr(buf, word); |
2941 | } | | 2942 | } |
2942 | | | 2943 | |
2943 | /* :ts<separator> */ | | 2944 | /* :ts<separator> */ |
2944 | static ApplyModifierResult | | 2945 | static ApplyModifierResult |
2945 | ApplyModifier_ToSep(const char **pp, ApplyModifiersState *st) | | 2946 | ApplyModifier_ToSep(const char **pp, ApplyModifiersState *st) |
2946 | { | | 2947 | { |
2947 | const char *sep = *pp + 2; | | 2948 | const char *sep = *pp + 2; |
2948 | | | 2949 | |
2949 | /* ":ts<any><endc>" or ":ts<any>:" */ | | 2950 | /* ":ts<any><endc>" or ":ts<any>:" */ |
2950 | if (sep[0] != st->endc && IsDelimiter(sep[1], st)) { | | 2951 | if (sep[0] != st->endc && IsDelimiter(sep[1], st)) { |
2951 | st->sep = sep[0]; | | 2952 | st->sep = sep[0]; |
2952 | *pp = sep + 1; | | 2953 | *pp = sep + 1; |
2953 | goto ok; | | 2954 | goto ok; |
2954 | } | | 2955 | } |
2955 | | | 2956 | |
2956 | /* ":ts<endc>" or ":ts:" */ | | 2957 | /* ":ts<endc>" or ":ts:" */ |
2957 | if (IsDelimiter(sep[0], st)) { | | 2958 | if (IsDelimiter(sep[0], st)) { |
2958 | st->sep = '\0'; /* no separator */ | | 2959 | st->sep = '\0'; /* no separator */ |
2959 | *pp = sep; | | 2960 | *pp = sep; |
2960 | goto ok; | | 2961 | goto ok; |
2961 | } | | 2962 | } |
2962 | | | 2963 | |
2963 | /* ":ts<unrecognised><unrecognised>". */ | | 2964 | /* ":ts<unrecognised><unrecognised>". */ |
2964 | if (sep[0] != '\\') { | | 2965 | if (sep[0] != '\\') { |
2965 | (*pp)++; /* just for backwards compatibility */ | | 2966 | (*pp)++; /* just for backwards compatibility */ |
2966 | return AMR_BAD; | | 2967 | return AMR_BAD; |
2967 | } | | 2968 | } |
2968 | | | 2969 | |
2969 | /* ":ts\n" */ | | 2970 | /* ":ts\n" */ |
2970 | if (sep[1] == 'n') { | | 2971 | if (sep[1] == 'n') { |
2971 | st->sep = '\n'; | | 2972 | st->sep = '\n'; |
2972 | *pp = sep + 2; | | 2973 | *pp = sep + 2; |
2973 | goto ok; | | 2974 | goto ok; |
2974 | } | | 2975 | } |
2975 | | | 2976 | |
2976 | /* ":ts\t" */ | | 2977 | /* ":ts\t" */ |
2977 | if (sep[1] == 't') { | | 2978 | if (sep[1] == 't') { |
2978 | st->sep = '\t'; | | 2979 | st->sep = '\t'; |
2979 | *pp = sep + 2; | | 2980 | *pp = sep + 2; |
2980 | goto ok; | | 2981 | goto ok; |
2981 | } | | 2982 | } |
2982 | | | 2983 | |
2983 | /* ":ts\x40" or ":ts\100" */ | | 2984 | /* ":ts\x40" or ":ts\100" */ |
2984 | { | | 2985 | { |
2985 | const char *p = sep + 1; | | 2986 | const char *p = sep + 1; |
2986 | int base = 8; /* assume octal */ | | 2987 | int base = 8; /* assume octal */ |
2987 | | | 2988 | |
2988 | if (sep[1] == 'x') { | | 2989 | if (sep[1] == 'x') { |
2989 | base = 16; | | 2990 | base = 16; |
2990 | p++; | | 2991 | p++; |
2991 | } else if (!ch_isdigit(sep[1])) { | | 2992 | } else if (!ch_isdigit(sep[1])) { |
2992 | (*pp)++; /* just for backwards compatibility */ | | 2993 | (*pp)++; /* just for backwards compatibility */ |
2993 | return AMR_BAD; /* ":ts<backslash><unrecognised>". */ | | 2994 | return AMR_BAD; /* ":ts<backslash><unrecognised>". */ |
2994 | } | | 2995 | } |
2995 | | | 2996 | |
2996 | if (!TryParseChar(&p, base, &st->sep)) { | | 2997 | if (!TryParseChar(&p, base, &st->sep)) { |
2997 | Parse_Error(PARSE_FATAL, | | 2998 | Parse_Error(PARSE_FATAL, |
2998 | "Invalid character number: %s", p); | | 2999 | "Invalid character number: %s", p); |
2999 | return AMR_CLEANUP; | | 3000 | return AMR_CLEANUP; |
3000 | } | | 3001 | } |
3001 | if (!IsDelimiter(*p, st)) { | | 3002 | if (!IsDelimiter(*p, st)) { |
3002 | (*pp)++; /* just for backwards compatibility */ | | 3003 | (*pp)++; /* just for backwards compatibility */ |
3003 | return AMR_BAD; | | 3004 | return AMR_BAD; |
3004 | } | | 3005 | } |
3005 | | | 3006 | |
3006 | *pp = p; | | 3007 | *pp = p; |
3007 | } | | 3008 | } |
3008 | | | 3009 | |
3009 | ok: | | 3010 | ok: |
3010 | ModifyWords(st, ModifyWord_Copy, NULL, st->oneBigWord); | | 3011 | ModifyWords(st, ModifyWord_Copy, NULL, st->oneBigWord); |
3011 | return AMR_OK; | | 3012 | return AMR_OK; |
3012 | } | | 3013 | } |
3013 | | | 3014 | |
3014 | static char * | | 3015 | static char * |
3015 | str_toupper(const char *str) | | 3016 | str_toupper(const char *str) |
3016 | { | | 3017 | { |
3017 | char *res; | | 3018 | char *res; |
3018 | size_t i, len; | | 3019 | size_t i, len; |
3019 | | | 3020 | |
3020 | len = strlen(str); | | 3021 | len = strlen(str); |
3021 | res = bmake_malloc(len + 1); | | 3022 | res = bmake_malloc(len + 1); |
3022 | for (i = 0; i < len + 1; i++) | | 3023 | for (i = 0; i < len + 1; i++) |
3023 | res[i] = ch_toupper(str[i]); | | 3024 | res[i] = ch_toupper(str[i]); |
3024 | | | 3025 | |
3025 | return res; | | 3026 | return res; |
3026 | } | | 3027 | } |
3027 | | | 3028 | |
3028 | static char * | | 3029 | static char * |
3029 | str_tolower(const char *str) | | 3030 | str_tolower(const char *str) |
3030 | { | | 3031 | { |
3031 | char *res; | | 3032 | char *res; |
3032 | size_t i, len; | | 3033 | size_t i, len; |
3033 | | | 3034 | |
3034 | len = strlen(str); | | 3035 | len = strlen(str); |
3035 | res = bmake_malloc(len + 1); | | 3036 | res = bmake_malloc(len + 1); |
3036 | for (i = 0; i < len + 1; i++) | | 3037 | for (i = 0; i < len + 1; i++) |
3037 | res[i] = ch_tolower(str[i]); | | 3038 | res[i] = ch_tolower(str[i]); |
3038 | | | 3039 | |
3039 | return res; | | 3040 | return res; |
3040 | } | | 3041 | } |
3041 | | | 3042 | |
3042 | /* :tA, :tu, :tl, :ts<separator>, etc. */ | | 3043 | /* :tA, :tu, :tl, :ts<separator>, etc. */ |
3043 | static ApplyModifierResult | | 3044 | static ApplyModifierResult |
3044 | ApplyModifier_To(const char **pp, ApplyModifiersState *st) | | 3045 | ApplyModifier_To(const char **pp, ApplyModifiersState *st) |
3045 | { | | 3046 | { |
3046 | Expr *expr = st->expr; | | 3047 | Expr *expr = st->expr; |
3047 | const char *mod = *pp; | | 3048 | const char *mod = *pp; |
3048 | assert(mod[0] == 't'); | | 3049 | assert(mod[0] == 't'); |
3049 | | | 3050 | |
3050 | if (IsDelimiter(mod[1], st) || mod[1] == '\0') { | | 3051 | if (IsDelimiter(mod[1], st) || mod[1] == '\0') { |
3051 | *pp = mod + 1; | | 3052 | *pp = mod + 1; |
3052 | return AMR_BAD; /* Found ":t<endc>" or ":t:". */ | | 3053 | return AMR_BAD; /* Found ":t<endc>" or ":t:". */ |
3053 | } | | 3054 | } |
3054 | | | 3055 | |
3055 | if (mod[1] == 's') | | 3056 | if (mod[1] == 's') |
3056 | return ApplyModifier_ToSep(pp, st); | | 3057 | return ApplyModifier_ToSep(pp, st); |
3057 | | | 3058 | |
3058 | if (!IsDelimiter(mod[2], st)) { /* :t<unrecognized> */ | | 3059 | if (!IsDelimiter(mod[2], st)) { /* :t<unrecognized> */ |
3059 | *pp = mod + 1; | | 3060 | *pp = mod + 1; |
3060 | return AMR_BAD; | | 3061 | return AMR_BAD; |
3061 | } | | 3062 | } |
3062 | | | 3063 | |
3063 | if (mod[1] == 'A') { /* :tA */ | | 3064 | if (mod[1] == 'A') { /* :tA */ |
3064 | ModifyWords(st, ModifyWord_Realpath, NULL, st->oneBigWord); | | 3065 | ModifyWords(st, ModifyWord_Realpath, NULL, st->oneBigWord); |
3065 | *pp = mod + 2; | | 3066 | *pp = mod + 2; |
3066 | return AMR_OK; | | 3067 | return AMR_OK; |
3067 | } | | 3068 | } |
3068 | | | 3069 | |
3069 | if (mod[1] == 'u') { /* :tu */ | | 3070 | if (mod[1] == 'u') { /* :tu */ |
3070 | Expr_SetValueOwn(expr, str_toupper(expr->value.str)); | | 3071 | Expr_SetValueOwn(expr, str_toupper(expr->value.str)); |
3071 | *pp = mod + 2; | | 3072 | *pp = mod + 2; |
3072 | return AMR_OK; | | 3073 | return AMR_OK; |
3073 | } | | 3074 | } |
3074 | | | 3075 | |
3075 | if (mod[1] == 'l') { /* :tl */ | | 3076 | if (mod[1] == 'l') { /* :tl */ |
3076 | Expr_SetValueOwn(expr, str_tolower(expr->value.str)); | | 3077 | Expr_SetValueOwn(expr, str_tolower(expr->value.str)); |
3077 | *pp = mod + 2; | | 3078 | *pp = mod + 2; |
3078 | return AMR_OK; | | 3079 | return AMR_OK; |
3079 | } | | 3080 | } |
3080 | | | 3081 | |
3081 | if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */ | | 3082 | if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */ |
3082 | st->oneBigWord = mod[1] == 'W'; | | 3083 | st->oneBigWord = mod[1] == 'W'; |
3083 | *pp = mod + 2; | | 3084 | *pp = mod + 2; |
3084 | return AMR_OK; | | 3085 | return AMR_OK; |
3085 | } | | 3086 | } |
3086 | | | 3087 | |
3087 | /* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */ | | 3088 | /* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */ |
3088 | *pp = mod + 1; | | 3089 | *pp = mod + 1; |
3089 | return AMR_BAD; | | 3090 | return AMR_BAD; |
3090 | } | | 3091 | } |
3091 | | | 3092 | |
3092 | /* :[#], :[1], :[-1..1], etc. */ | | 3093 | /* :[#], :[1], :[-1..1], etc. */ |
3093 | static ApplyModifierResult | | 3094 | static ApplyModifierResult |
3094 | ApplyModifier_Words(const char **pp, ApplyModifiersState *st) | | 3095 | ApplyModifier_Words(const char **pp, ApplyModifiersState *st) |
3095 | { | | 3096 | { |
3096 | Expr *expr = st->expr; | | 3097 | Expr *expr = st->expr; |
3097 | char *estr; | | 3098 | char *estr; |
3098 | int first, last; | | 3099 | int first, last; |
3099 | VarParseResult res; | | 3100 | VarParseResult res; |
3100 | const char *p; | | 3101 | const char *p; |
3101 | | | 3102 | |
3102 | (*pp)++; /* skip the '[' */ | | 3103 | (*pp)++; /* skip the '[' */ |
3103 | res = ParseModifierPart(pp, ']', expr->eflags, st, &estr); | | 3104 | res = ParseModifierPart(pp, ']', expr->eflags, st, &estr); |
3104 | if (res != VPR_OK) | | 3105 | if (res != VPR_OK) |
3105 | return AMR_CLEANUP; | | 3106 | return AMR_CLEANUP; |
3106 | | | 3107 | |
3107 | if (!IsDelimiter(**pp, st)) | | 3108 | if (!IsDelimiter(**pp, st)) |
3108 | goto bad_modifier; /* Found junk after ']' */ | | 3109 | goto bad_modifier; /* Found junk after ']' */ |
3109 | | | 3110 | |
3110 | if (estr[0] == '\0') | | 3111 | if (estr[0] == '\0') |
3111 | goto bad_modifier; /* Found ":[]". */ | | 3112 | goto bad_modifier; /* Found ":[]". */ |
3112 | | | 3113 | |
3113 | if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */ | | 3114 | if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */ |
3114 | if (st->oneBigWord) { | | 3115 | if (st->oneBigWord) { |
3115 | Expr_SetValueRefer(expr, "1"); | | 3116 | Expr_SetValueRefer(expr, "1"); |
3116 | } else { | | 3117 | } else { |
3117 | Buffer buf; | | 3118 | Buffer buf; |
3118 | | | 3119 | |
3119 | Words words = Str_Words(expr->value.str, FALSE); | | 3120 | Words words = Str_Words(expr->value.str, FALSE); |
3120 | size_t ac = words.len; | | 3121 | size_t ac = words.len; |
3121 | Words_Free(words); | | 3122 | Words_Free(words); |
3122 | | | 3123 | |
3123 | /* 3 digits + '\0' is usually enough */ | | 3124 | /* 3 digits + '\0' is usually enough */ |
3124 | Buf_InitSize(&buf, 4); | | 3125 | Buf_InitSize(&buf, 4); |
3125 | Buf_AddInt(&buf, (int)ac); | | 3126 | Buf_AddInt(&buf, (int)ac); |
3126 | Expr_SetValueOwn(expr, Buf_DoneData(&buf)); | | 3127 | Expr_SetValueOwn(expr, Buf_DoneData(&buf)); |
3127 | } | | 3128 | } |
3128 | goto ok; | | 3129 | goto ok; |
3129 | } | | 3130 | } |
3130 | | | 3131 | |
3131 | if (estr[0] == '*' && estr[1] == '\0') { /* Found ":[*]" */ | | 3132 | if (estr[0] == '*' && estr[1] == '\0') { /* Found ":[*]" */ |
3132 | st->oneBigWord = TRUE; | | 3133 | st->oneBigWord = TRUE; |
3133 | goto ok; | | 3134 | goto ok; |
3134 | } | | 3135 | } |
3135 | | | 3136 | |
3136 | if (estr[0] == '@' && estr[1] == '\0') { /* Found ":[@]" */ | | 3137 | if (estr[0] == '@' && estr[1] == '\0') { /* Found ":[@]" */ |
3137 | st->oneBigWord = FALSE; | | 3138 | st->oneBigWord = FALSE; |
3138 | goto ok; | | 3139 | goto ok; |
3139 | } | | 3140 | } |
3140 | | | 3141 | |
3141 | /* | | 3142 | /* |
3142 | * We expect estr to contain a single integer for :[N], or two | | 3143 | * We expect estr to contain a single integer for :[N], or two |
3143 | * integers separated by ".." for :[start..end]. | | 3144 | * integers separated by ".." for :[start..end]. |
3144 | */ | | 3145 | */ |
3145 | p = estr; | | 3146 | p = estr; |
3146 | if (!TryParseIntBase0(&p, &first)) | | 3147 | if (!TryParseIntBase0(&p, &first)) |
3147 | goto bad_modifier; /* Found junk instead of a number */ | | 3148 | goto bad_modifier; /* Found junk instead of a number */ |
3148 | | | 3149 | |
3149 | if (p[0] == '\0') { /* Found only one integer in :[N] */ | | 3150 | if (p[0] == '\0') { /* Found only one integer in :[N] */ |
3150 | last = first; | | 3151 | last = first; |
3151 | } else if (p[0] == '.' && p[1] == '.' && p[2] != '\0') { | | 3152 | } else if (p[0] == '.' && p[1] == '.' && p[2] != '\0') { |
3152 | /* Expecting another integer after ".." */ | | 3153 | /* Expecting another integer after ".." */ |
3153 | p += 2; | | 3154 | p += 2; |
3154 | if (!TryParseIntBase0(&p, &last) || *p != '\0') | | 3155 | if (!TryParseIntBase0(&p, &last) || *p != '\0') |
3155 | goto bad_modifier; /* Found junk after ".." */ | | 3156 | goto bad_modifier; /* Found junk after ".." */ |
3156 | } else | | 3157 | } else |
3157 | goto bad_modifier; /* Found junk instead of ".." */ | | 3158 | goto bad_modifier; /* Found junk instead of ".." */ |
3158 | | | 3159 | |
3159 | /* | | 3160 | /* |
3160 | * Now first and last are properly filled in, but we still have to | | 3161 | * Now first and last are properly filled in, but we still have to |
3161 | * check for 0 as a special case. | | 3162 | * check for 0 as a special case. |
3162 | */ | | 3163 | */ |
3163 | if (first == 0 && last == 0) { | | 3164 | if (first == 0 && last == 0) { |
3164 | /* ":[0]" or perhaps ":[0..0]" */ | | 3165 | /* ":[0]" or perhaps ":[0..0]" */ |
3165 | st->oneBigWord = TRUE; | | 3166 | st->oneBigWord = TRUE; |
3166 | goto ok; | | 3167 | goto ok; |
3167 | } | | 3168 | } |
3168 | | | 3169 | |
3169 | /* ":[0..N]" or ":[N..0]" */ | | 3170 | /* ":[0..N]" or ":[N..0]" */ |
3170 | if (first == 0 || last == 0) | | 3171 | if (first == 0 || last == 0) |
3171 | goto bad_modifier; | | 3172 | goto bad_modifier; |
3172 | | | 3173 | |
3173 | /* Normal case: select the words described by first and last. */ | | 3174 | /* Normal case: select the words described by first and last. */ |
3174 | Expr_SetValueOwn(expr, | | 3175 | Expr_SetValueOwn(expr, |
3175 | VarSelectWords(expr->value.str, first, last, | | 3176 | VarSelectWords(expr->value.str, first, last, |
3176 | st->sep, st->oneBigWord)); | | 3177 | st->sep, st->oneBigWord)); |
3177 | | | 3178 | |
3178 | ok: | | 3179 | ok: |
3179 | free(estr); | | 3180 | free(estr); |
3180 | return AMR_OK; | | 3181 | return AMR_OK; |
3181 | | | 3182 | |
3182 | bad_modifier: | | 3183 | bad_modifier: |
3183 | free(estr); | | 3184 | free(estr); |
3184 | return AMR_BAD; | | 3185 | return AMR_BAD; |
3185 | } | | 3186 | } |
3186 | | | 3187 | |
3187 | static int | | 3188 | static int |
3188 | str_cmp_asc(const void *a, const void *b) | | 3189 | str_cmp_asc(const void *a, const void *b) |
3189 | { | | 3190 | { |
3190 | return strcmp(*(const char *const *)a, *(const char *const *)b); | | 3191 | return strcmp(*(const char *const *)a, *(const char *const *)b); |
3191 | } | | 3192 | } |
3192 | | | 3193 | |
3193 | static int | | 3194 | static int |
3194 | str_cmp_desc(const void *a, const void *b) | | 3195 | str_cmp_desc(const void *a, const void *b) |
3195 | { | | 3196 | { |
3196 | return strcmp(*(const char *const *)b, *(const char *const *)a); | | 3197 | return strcmp(*(const char *const *)b, *(const char *const *)a); |
3197 | } | | 3198 | } |
3198 | | | 3199 | |
3199 | static void | | 3200 | static void |
3200 | ShuffleStrings(char **strs, size_t n) | | 3201 | ShuffleStrings(char **strs, size_t n) |
3201 | { | | 3202 | { |
3202 | size_t i; | | 3203 | size_t i; |
3203 | | | 3204 | |
3204 | for (i = n - 1; i > 0; i--) { | | 3205 | for (i = n - 1; i > 0; i--) { |
3205 | size_t rndidx = (size_t)random() % (i + 1); | | 3206 | size_t rndidx = (size_t)random() % (i + 1); |
3206 | char *t = strs[i]; | | 3207 | char *t = strs[i]; |
3207 | strs[i] = strs[rndidx]; | | 3208 | strs[i] = strs[rndidx]; |
3208 | strs[rndidx] = t; | | 3209 | strs[rndidx] = t; |
3209 | } | | 3210 | } |
3210 | } | | 3211 | } |
3211 | | | 3212 | |
3212 | /* :O (order ascending) or :Or (order descending) or :Ox (shuffle) */ | | 3213 | /* :O (order ascending) or :Or (order descending) or :Ox (shuffle) */ |
3213 | static ApplyModifierResult | | 3214 | static ApplyModifierResult |
3214 | ApplyModifier_Order(const char **pp, ApplyModifiersState *st) | | 3215 | ApplyModifier_Order(const char **pp, ApplyModifiersState *st) |
3215 | { | | 3216 | { |
3216 | const char *mod = (*pp)++; /* skip past the 'O' in any case */ | | 3217 | const char *mod = (*pp)++; /* skip past the 'O' in any case */ |
3217 | | | 3218 | |
3218 | Words words = Str_Words(st->expr->value.str, FALSE); | | 3219 | Words words = Str_Words(st->expr->value.str, FALSE); |
3219 | | | 3220 | |
3220 | if (IsDelimiter(mod[1], st)) { | | 3221 | if (IsDelimiter(mod[1], st)) { |
3221 | /* :O sorts ascending */ | | 3222 | /* :O sorts ascending */ |
3222 | qsort(words.words, words.len, sizeof words.words[0], | | 3223 | qsort(words.words, words.len, sizeof words.words[0], |
3223 | str_cmp_asc); | | 3224 | str_cmp_asc); |
3224 | | | 3225 | |
3225 | } else if ((mod[1] == 'r' || mod[1] == 'x') && | | 3226 | } else if ((mod[1] == 'r' || mod[1] == 'x') && |
3226 | IsDelimiter(mod[2], st)) { | | 3227 | IsDelimiter(mod[2], st)) { |
3227 | (*pp)++; | | 3228 | (*pp)++; |
3228 | | | 3229 | |
3229 | if (mod[1] == 'r') { /* :Or sorts descending */ | | 3230 | if (mod[1] == 'r') { /* :Or sorts descending */ |
3230 | qsort(words.words, words.len, sizeof words.words[0], | | 3231 | qsort(words.words, words.len, sizeof words.words[0], |
3231 | str_cmp_desc); | | 3232 | str_cmp_desc); |
3232 | } else | | 3233 | } else |
3233 | ShuffleStrings(words.words, words.len); | | 3234 | ShuffleStrings(words.words, words.len); |
3234 | } else { | | 3235 | } else { |
3235 | Words_Free(words); | | 3236 | Words_Free(words); |
3236 | return AMR_BAD; | | 3237 | return AMR_BAD; |
3237 | } | | 3238 | } |
3238 | | | 3239 | |
3239 | Expr_SetValueOwn(st->expr, Words_JoinFree(words)); | | 3240 | Expr_SetValueOwn(st->expr, Words_JoinFree(words)); |
3240 | return AMR_OK; | | 3241 | return AMR_OK; |
3241 | } | | 3242 | } |
3242 | | | 3243 | |
3243 | /* :? then : else */ | | 3244 | /* :? then : else */ |
3244 | static ApplyModifierResult | | 3245 | static ApplyModifierResult |
3245 | ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st) | | 3246 | ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st) |
3246 | { | | 3247 | { |
3247 | Expr *expr = st->expr; | | 3248 | Expr *expr = st->expr; |
3248 | char *then_expr, *else_expr; | | 3249 | char *then_expr, *else_expr; |
3249 | VarParseResult res; | | 3250 | VarParseResult res; |
3250 | | | 3251 | |
3251 | Boolean value = FALSE; | | 3252 | Boolean value = FALSE; |
3252 | VarEvalFlags then_eflags = VARE_NONE; | | 3253 | VarEvalFlags then_eflags = VARE_NONE; |
3253 | VarEvalFlags else_eflags = VARE_NONE; | | 3254 | VarEvalFlags else_eflags = VARE_NONE; |
3254 | | | 3255 | |
3255 | int cond_rc = COND_PARSE; /* anything other than COND_INVALID */ | | 3256 | int cond_rc = COND_PARSE; /* anything other than COND_INVALID */ |
3256 | if (expr->eflags & VARE_WANTRES) { | | 3257 | if (expr->eflags & VARE_WANTRES) { |
3257 | cond_rc = Cond_EvalCondition(expr->var->name.str, &value); | | 3258 | cond_rc = Cond_EvalCondition(expr->var->name.str, &value); |
3258 | if (cond_rc != COND_INVALID && value) | | 3259 | if (cond_rc != COND_INVALID && value) |
3259 | then_eflags = expr->eflags; | | 3260 | then_eflags = expr->eflags; |
3260 | if (cond_rc != COND_INVALID && !value) | | 3261 | if (cond_rc != COND_INVALID && !value) |
3261 | else_eflags = expr->eflags; | | 3262 | else_eflags = expr->eflags; |
3262 | } | | 3263 | } |
3263 | | | 3264 | |
3264 | (*pp)++; /* skip past the '?' */ | | 3265 | (*pp)++; /* skip past the '?' */ |
3265 | res = ParseModifierPart(pp, ':', then_eflags, st, &then_expr); | | 3266 | res = ParseModifierPart(pp, ':', then_eflags, st, &then_expr); |
3266 | if (res != VPR_OK) | | 3267 | if (res != VPR_OK) |
3267 | return AMR_CLEANUP; | | 3268 | return AMR_CLEANUP; |
3268 | | | 3269 | |
3269 | res = ParseModifierPart(pp, st->endc, else_eflags, st, &else_expr); | | 3270 | res = ParseModifierPart(pp, st->endc, else_eflags, st, &else_expr); |
3270 | if (res != VPR_OK) | | 3271 | if (res != VPR_OK) |
3271 | return AMR_CLEANUP; | | 3272 | return AMR_CLEANUP; |
3272 | | | 3273 | |
3273 | (*pp)--; /* Go back to the st->endc. */ | | 3274 | (*pp)--; /* Go back to the st->endc. */ |
3274 | | | 3275 | |
3275 | if (cond_rc == COND_INVALID) { | | 3276 | if (cond_rc == COND_INVALID) { |
3276 | Error("Bad conditional expression `%s' in %s?%s:%s", | | 3277 | Error("Bad conditional expression `%s' in %s?%s:%s", |
3277 | expr->var->name.str, expr->var->name.str, | | 3278 | expr->var->name.str, expr->var->name.str, |
3278 | then_expr, else_expr); | | 3279 | then_expr, else_expr); |
3279 | return AMR_CLEANUP; | | 3280 | return AMR_CLEANUP; |
3280 | } | | 3281 | } |
3281 | | | 3282 | |
3282 | if (value) { | | 3283 | if (value) { |
3283 | Expr_SetValueOwn(expr, then_expr); | | 3284 | Expr_SetValueOwn(expr, then_expr); |
3284 | free(else_expr); | | 3285 | free(else_expr); |
3285 | } else { | | 3286 | } else { |
3286 | Expr_SetValueOwn(expr, else_expr); | | 3287 | Expr_SetValueOwn(expr, else_expr); |
3287 | free(then_expr); | | 3288 | free(then_expr); |
3288 | } | | 3289 | } |
3289 | Expr_Define(expr); | | 3290 | Expr_Define(expr); |
3290 | return AMR_OK; | | 3291 | return AMR_OK; |
3291 | } | | 3292 | } |
3292 | | | 3293 | |
3293 | /* | | 3294 | /* |
3294 | * The ::= modifiers are special in that they do not read the variable value | | 3295 | * The ::= modifiers are special in that they do not read the variable value |
3295 | * but instead assign to that variable. They always expand to an empty | | 3296 | * but instead assign to that variable. They always expand to an empty |
3296 | * string. | | 3297 | * string. |
3297 | * | | 3298 | * |
3298 | * Their main purpose is in supporting .for loops that generate shell commands | | 3299 | * Their main purpose is in supporting .for loops that generate shell commands |
3299 | * since an ordinary variable assignment at that point would terminate the | | 3300 | * since an ordinary variable assignment at that point would terminate the |
3300 | * dependency group for these targets. For example: | | 3301 | * dependency group for these targets. For example: |
3301 | * | | 3302 | * |
3302 | * list-targets: .USE | | 3303 | * list-targets: .USE |
3303 | * .for i in ${.TARGET} ${.TARGET:R}.gz | | 3304 | * .for i in ${.TARGET} ${.TARGET:R}.gz |
3304 | * @${t::=$i} | | 3305 | * @${t::=$i} |
3305 | * @echo 'The target is ${t:T}.' | | 3306 | * @echo 'The target is ${t:T}.' |
3306 | * .endfor | | 3307 | * .endfor |
3307 | * | | 3308 | * |
3308 | * ::=<str> Assigns <str> as the new value of variable. | | 3309 | * ::=<str> Assigns <str> as the new value of variable. |
3309 | * ::?=<str> Assigns <str> as value of variable if | | 3310 | * ::?=<str> Assigns <str> as value of variable if |
3310 | * it was not already set. | | 3311 | * it was not already set. |
3311 | * ::+=<str> Appends <str> to variable. | | 3312 | * ::+=<str> Appends <str> to variable. |
3312 | * ::!=<cmd> Assigns output of <cmd> as the new value of | | 3313 | * ::!=<cmd> Assigns output of <cmd> as the new value of |
3313 | * variable. | | 3314 | * variable. |
3314 | */ | | 3315 | */ |
3315 | static ApplyModifierResult | | 3316 | static ApplyModifierResult |
3316 | ApplyModifier_Assign(const char **pp, ApplyModifiersState *st) | | 3317 | ApplyModifier_Assign(const char **pp, ApplyModifiersState *st) |
3317 | { | | 3318 | { |
3318 | Expr *expr = st->expr; | | 3319 | Expr *expr = st->expr; |
3319 | GNode *scope; | | 3320 | GNode *scope; |
3320 | char *val; | | 3321 | char *val; |
3321 | VarParseResult res; | | 3322 | VarParseResult res; |
3322 | | | 3323 | |
3323 | const char *mod = *pp; | | 3324 | const char *mod = *pp; |
3324 | const char *op = mod + 1; | | 3325 | const char *op = mod + 1; |
3325 | | | 3326 | |
3326 | if (op[0] == '=') | | 3327 | if (op[0] == '=') |
3327 | goto ok; | | 3328 | goto ok; |
3328 | if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=') | | 3329 | if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=') |
3329 | goto ok; | | 3330 | goto ok; |
3330 | return AMR_UNKNOWN; /* "::<unrecognised>" */ | | 3331 | return AMR_UNKNOWN; /* "::<unrecognised>" */ |
3331 | ok: | | 3332 | ok: |
3332 | | | 3333 | |
3333 | if (expr->var->name.str[0] == '\0') { | | 3334 | if (expr->var->name.str[0] == '\0') { |
3334 | *pp = mod + 1; | | 3335 | *pp = mod + 1; |
3335 | return AMR_BAD; | | 3336 | return AMR_BAD; |
3336 | } | | 3337 | } |
3337 | | | 3338 | |
3338 | scope = expr->scope; /* scope where v belongs */ | | 3339 | scope = expr->scope; /* scope where v belongs */ |
3339 | if (expr->defined == DEF_REGULAR && expr->scope != SCOPE_GLOBAL) { | | 3340 | if (expr->defined == DEF_REGULAR && expr->scope != SCOPE_GLOBAL) { |
3340 | Var *gv = VarFind(expr->var->name.str, expr->scope, FALSE); | | 3341 | Var *gv = VarFind(expr->var->name.str, expr->scope, FALSE); |
3341 | if (gv == NULL) | | 3342 | if (gv == NULL) |
3342 | scope = SCOPE_GLOBAL; | | 3343 | scope = SCOPE_GLOBAL; |
3343 | else | | 3344 | else |
3344 | VarFreeEnv(gv); | | 3345 | VarFreeEnv(gv); |
3345 | } | | 3346 | } |
3346 | | | 3347 | |
3347 | switch (op[0]) { | | 3348 | switch (op[0]) { |
3348 | case '+': | | 3349 | case '+': |
3349 | case '?': | | 3350 | case '?': |
3350 | case '!': | | 3351 | case '!': |
3351 | *pp = mod + 3; | | 3352 | *pp = mod + 3; |
3352 | break; | | 3353 | break; |
3353 | default: | | 3354 | default: |
3354 | *pp = mod + 2; | | 3355 | *pp = mod + 2; |
3355 | break; | | 3356 | break; |
3356 | } | | 3357 | } |
3357 | | | 3358 | |
3358 | res = ParseModifierPart(pp, st->endc, expr->eflags, st, &val); | | 3359 | res = ParseModifierPart(pp, st->endc, expr->eflags, st, &val); |
3359 | if (res != VPR_OK) | | 3360 | if (res != VPR_OK) |
3360 | return AMR_CLEANUP; | | 3361 | return AMR_CLEANUP; |
3361 | | | 3362 | |
3362 | (*pp)--; /* Go back to the st->endc. */ | | 3363 | (*pp)--; /* Go back to the st->endc. */ |
3363 | | | 3364 | |
3364 | /* XXX: Expanding the variable name at this point sounds wrong. */ | | 3365 | /* XXX: Expanding the variable name at this point sounds wrong. */ |
3365 | if (expr->eflags & VARE_WANTRES) { | | 3366 | if (expr->eflags & VARE_WANTRES) { |
3366 | switch (op[0]) { | | 3367 | switch (op[0]) { |
3367 | case '+': | | 3368 | case '+': |
3368 | Var_AppendExpand(scope, expr->var->name.str, val); | | 3369 | Var_AppendExpand(scope, expr->var->name.str, val); |
3369 | break; | | 3370 | break; |
3370 | case '!': { | | 3371 | case '!': { |
3371 | const char *errfmt; | | 3372 | const char *errfmt; |
3372 | char *cmd_output = Cmd_Exec(val, &errfmt); | | 3373 | char *cmd_output = Cmd_Exec(val, &errfmt); |
3373 | if (errfmt != NULL) | | 3374 | if (errfmt != NULL) |
3374 | Error(errfmt, val); | | 3375 | Error(errfmt, val); |
3375 | else | | 3376 | else |
3376 | Var_SetExpand(scope, | | 3377 | Var_SetExpand(scope, |
3377 | expr->var->name.str, cmd_output); | | 3378 | expr->var->name.str, cmd_output); |
3378 | free(cmd_output); | | 3379 | free(cmd_output); |
3379 | break; | | 3380 | break; |
3380 | } | | 3381 | } |
3381 | case '?': | | 3382 | case '?': |
3382 | if (expr->defined == DEF_REGULAR) | | 3383 | if (expr->defined == DEF_REGULAR) |
3383 | break; | | 3384 | break; |
3384 | /* FALLTHROUGH */ | | 3385 | /* FALLTHROUGH */ |
3385 | default: | | 3386 | default: |
3386 | Var_SetExpand(scope, expr->var->name.str, val); | | 3387 | Var_SetExpand(scope, expr->var->name.str, val); |
3387 | break; | | 3388 | break; |
3388 | } | | 3389 | } |
3389 | } | | 3390 | } |
3390 | free(val); | | 3391 | free(val); |
3391 | Expr_SetValueRefer(expr, ""); | | 3392 | Expr_SetValueRefer(expr, ""); |
3392 | return AMR_OK; | | 3393 | return AMR_OK; |
3393 | } | | 3394 | } |
3394 | | | 3395 | |
3395 | /* | | 3396 | /* |
3396 | * :_=... | | 3397 | * :_=... |
3397 | * remember current value | | 3398 | * remember current value |
3398 | */ | | 3399 | */ |
3399 | static ApplyModifierResult | | 3400 | static ApplyModifierResult |
3400 | ApplyModifier_Remember(const char **pp, ApplyModifiersState *st) | | 3401 | ApplyModifier_Remember(const char **pp, ApplyModifiersState *st) |
3401 | { | | 3402 | { |
3402 | Expr *expr = st->expr; | | 3403 | Expr *expr = st->expr; |
3403 | const char *mod = *pp; | | 3404 | const char *mod = *pp; |
3404 | if (!ModMatchEq(mod, "_", st)) | | 3405 | if (!ModMatchEq(mod, "_", st)) |
3405 | return AMR_UNKNOWN; | | 3406 | return AMR_UNKNOWN; |
3406 | | | 3407 | |
3407 | if (mod[1] == '=') { | | 3408 | if (mod[1] == '=') { |
3408 | /* | | 3409 | /* |
3409 | * XXX: This ad-hoc call to strcspn deviates from the usual | | 3410 | * XXX: This ad-hoc call to strcspn deviates from the usual |
3410 | * behavior defined in ParseModifierPart. This creates an | | 3411 | * behavior defined in ParseModifierPart. This creates an |
3411 | * unnecessary, undocumented inconsistency in make. | | 3412 | * unnecessary, undocumented inconsistency in make. |
3412 | */ | | 3413 | */ |
3413 | size_t n = strcspn(mod + 2, ":)}"); | | 3414 | size_t n = strcspn(mod + 2, ":)}"); |
3414 | char *name = bmake_strldup(mod + 2, n); | | 3415 | char *name = bmake_strldup(mod + 2, n); |
3415 | Var_SetExpand(expr->scope, name, expr->value.str); | | 3416 | Var_SetExpand(expr->scope, name, expr->value.str); |
3416 | free(name); | | 3417 | free(name); |
3417 | *pp = mod + 2 + n; | | 3418 | *pp = mod + 2 + n; |
3418 | } else { | | 3419 | } else { |
3419 | Var_Set(expr->scope, "_", expr->value.str); | | 3420 | Var_Set(expr->scope, "_", expr->value.str); |
3420 | *pp = mod + 1; | | 3421 | *pp = mod + 1; |
3421 | } | | 3422 | } |
3422 | return AMR_OK; | | 3423 | return AMR_OK; |
3423 | } | | 3424 | } |
3424 | | | 3425 | |
3425 | /* | | 3426 | /* |
3426 | * Apply the given function to each word of the variable value, | | 3427 | * Apply the given function to each word of the variable value, |
3427 | * for a single-letter modifier such as :H, :T. | | 3428 | * for a single-letter modifier such as :H, :T. |
3428 | */ | | 3429 | */ |
3429 | static ApplyModifierResult | | 3430 | static ApplyModifierResult |
3430 | ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st, | | 3431 | ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st, |
3431 | ModifyWordProc modifyWord) | | 3432 | ModifyWordProc modifyWord) |
3432 | { | | 3433 | { |
3433 | if (!IsDelimiter((*pp)[1], st)) | | 3434 | if (!IsDelimiter((*pp)[1], st)) |
3434 | return AMR_UNKNOWN; | | 3435 | return AMR_UNKNOWN; |
3435 | | | 3436 | |
3436 | ModifyWords(st, modifyWord, NULL, st->oneBigWord); | | 3437 | ModifyWords(st, modifyWord, NULL, st->oneBigWord); |
3437 | (*pp)++; | | 3438 | (*pp)++; |
3438 | return AMR_OK; | | 3439 | return AMR_OK; |
3439 | } | | 3440 | } |
3440 | | | 3441 | |
3441 | static ApplyModifierResult | | 3442 | static ApplyModifierResult |
3442 | ApplyModifier_Unique(const char **pp, ApplyModifiersState *st) | | 3443 | ApplyModifier_Unique(const char **pp, ApplyModifiersState *st) |
3443 | { | | 3444 | { |
3444 | if (IsDelimiter((*pp)[1], st)) { | | 3445 | if (IsDelimiter((*pp)[1], st)) { |
3445 | Expr_SetValueOwn(st->expr, VarUniq(st->expr->value.str)); | | 3446 | Expr_SetValueOwn(st->expr, VarUniq(st->expr->value.str)); |
3446 | (*pp)++; | | 3447 | (*pp)++; |
3447 | return AMR_OK; | | 3448 | return AMR_OK; |
3448 | } else | | 3449 | } else |
3449 | return AMR_UNKNOWN; | | 3450 | return AMR_UNKNOWN; |
3450 | } | | 3451 | } |
3451 | | | 3452 | |
3452 | #ifdef SYSVVARSUB | | 3453 | #ifdef SYSVVARSUB |
3453 | /* :from=to */ | | 3454 | /* :from=to */ |
3454 | static ApplyModifierResult | | 3455 | static ApplyModifierResult |
3455 | ApplyModifier_SysV(const char **pp, ApplyModifiersState *st) | | 3456 | ApplyModifier_SysV(const char **pp, ApplyModifiersState *st) |
3456 | { | | 3457 | { |
3457 | Expr *expr = st->expr; | | 3458 | Expr *expr = st->expr; |
3458 | char *lhs, *rhs; | | 3459 | char *lhs, *rhs; |
3459 | VarParseResult res; | | 3460 | VarParseResult res; |
3460 | | | 3461 | |
3461 | const char *mod = *pp; | | 3462 | const char *mod = *pp; |
3462 | Boolean eqFound = FALSE; | | 3463 | Boolean eqFound = FALSE; |
3463 | | | 3464 | |
3464 | /* | | 3465 | /* |
3465 | * First we make a pass through the string trying to verify it is a | | 3466 | * First we make a pass through the string trying to verify it is a |
3466 | * SysV-make-style translation. It must be: <lhs>=<rhs> | | 3467 | * SysV-make-style translation. It must be: <lhs>=<rhs> |
3467 | */ | | 3468 | */ |
3468 | int depth = 1; | | 3469 | int depth = 1; |
3469 | const char *p = mod; | | 3470 | const char *p = mod; |
3470 | while (*p != '\0' && depth > 0) { | | 3471 | while (*p != '\0' && depth > 0) { |
3471 | if (*p == '=') { /* XXX: should also test depth == 1 */ | | 3472 | if (*p == '=') { /* XXX: should also test depth == 1 */ |
3472 | eqFound = TRUE; | | 3473 | eqFound = TRUE; |
3473 | /* continue looking for st->endc */ | | 3474 | /* continue looking for st->endc */ |
3474 | } else if (*p == st->endc) | | 3475 | } else if (*p == st->endc) |
3475 | depth--; | | 3476 | depth--; |
3476 | else if (*p == st->startc) | | 3477 | else if (*p == st->startc) |
3477 | depth++; | | 3478 | depth++; |
3478 | if (depth > 0) | | 3479 | if (depth > 0) |
3479 | p++; | | 3480 | p++; |
3480 | } | | 3481 | } |
3481 | if (*p != st->endc || !eqFound) | | 3482 | if (*p != st->endc || !eqFound) |
3482 | return AMR_UNKNOWN; | | 3483 | return AMR_UNKNOWN; |
3483 | | | 3484 | |
3484 | res = ParseModifierPart(pp, '=', expr->eflags, st, &lhs); | | 3485 | res = ParseModifierPart(pp, '=', expr->eflags, st, &lhs); |
3485 | if (res != VPR_OK) | | 3486 | if (res != VPR_OK) |
3486 | return AMR_CLEANUP; | | 3487 | return AMR_CLEANUP; |
3487 | | | 3488 | |
3488 | /* The SysV modifier lasts until the end of the variable expression. */ | | 3489 | /* The SysV modifier lasts until the end of the variable expression. */ |
3489 | res = ParseModifierPart(pp, st->endc, expr->eflags, st, &rhs); | | 3490 | res = ParseModifierPart(pp, st->endc, expr->eflags, st, &rhs); |
3490 | if (res != VPR_OK) | | 3491 | if (res != VPR_OK) |
3491 | return AMR_CLEANUP; | | 3492 | return AMR_CLEANUP; |
3492 | | | 3493 | |
3493 | (*pp)--; /* Go back to the st->endc. */ | | 3494 | (*pp)--; /* Go back to the st->endc. */ |
3494 | | | 3495 | |
3495 | if (lhs[0] == '\0' && expr->value.str[0] == '\0') { | | 3496 | if (lhs[0] == '\0' && expr->value.str[0] == '\0') { |
3496 | /* Do not turn an empty expression into non-empty. */ | | 3497 | /* Do not turn an empty expression into non-empty. */ |
3497 | } else { | | 3498 | } else { |
3498 | struct ModifyWord_SYSVSubstArgs args = { | | 3499 | struct ModifyWord_SYSVSubstArgs args = { |
3499 | expr->scope, lhs, rhs | | 3500 | expr->scope, lhs, rhs |
3500 | }; | | 3501 | }; |
3501 | ModifyWords(st, ModifyWord_SYSVSubst, &args, st->oneBigWord); | | 3502 | ModifyWords(st, ModifyWord_SYSVSubst, &args, st->oneBigWord); |
3502 | } | | 3503 | } |
3503 | free(lhs); | | 3504 | free(lhs); |
3504 | free(rhs); | | 3505 | free(rhs); |
3505 | return AMR_OK; | | 3506 | return AMR_OK; |
3506 | } | | 3507 | } |
3507 | #endif | | 3508 | #endif |
3508 | | | 3509 | |
3509 | #ifdef SUNSHCMD | | 3510 | #ifdef SUNSHCMD |
3510 | /* :sh */ | | 3511 | /* :sh */ |
3511 | static ApplyModifierResult | | 3512 | static ApplyModifierResult |
3512 | ApplyModifier_SunShell(const char **pp, ApplyModifiersState *st) | | 3513 | ApplyModifier_SunShell(const char **pp, ApplyModifiersState *st) |
3513 | { | | 3514 | { |
3514 | Expr *expr = st->expr; | | 3515 | Expr *expr = st->expr; |
3515 | const char *p = *pp; | | 3516 | const char *p = *pp; |
3516 | if (p[1] == 'h' && IsDelimiter(p[2], st)) { | | 3517 | if (p[1] == 'h' && IsDelimiter(p[2], st)) { |
3517 | if (expr->eflags & VARE_WANTRES) { | | 3518 | if (expr->eflags & VARE_WANTRES) { |
3518 | const char *errfmt; | | 3519 | const char *errfmt; |
3519 | char *output = Cmd_Exec(expr->value.str, &errfmt); | | 3520 | char *output = Cmd_Exec(expr->value.str, &errfmt); |
3520 | if (errfmt != NULL) | | 3521 | if (errfmt != NULL) |
3521 | Error(errfmt, expr->value.str); | | 3522 | Error(errfmt, expr->value.str); |
3522 | Expr_SetValueOwn(expr, output); | | 3523 | Expr_SetValueOwn(expr, output); |
3523 | } else { | | 3524 | } else { |
3524 | /* | | 3525 | /* |
3525 | * TODO: Check whether returning ":sh" would be | | 3526 | * TODO: Check whether returning ":sh" would be |
3526 | * more consistent with the other modifiers. | | 3527 | * more consistent with the other modifiers. |
3527 | * | | 3528 | * |
3528 | * TODO: Add a unit test demonstrating that the | | 3529 | * TODO: Add a unit test demonstrating that the |
3529 | * actual value of this expression has any effect. | | 3530 | * actual value of this expression has any effect. |
3530 | */ | | 3531 | */ |
3531 | Expr_SetValueRefer(expr, ""); | | 3532 | Expr_SetValueRefer(expr, ""); |
3532 | } | | 3533 | } |
3533 | *pp = p + 2; | | 3534 | *pp = p + 2; |
3534 | return AMR_OK; | | 3535 | return AMR_OK; |
3535 | } else | | 3536 | } else |
3536 | return AMR_UNKNOWN; | | 3537 | return AMR_UNKNOWN; |
3537 | } | | 3538 | } |
3538 | #endif | | 3539 | #endif |
3539 | | | 3540 | |
3540 | static void | | 3541 | static void |
3541 | LogBeforeApply(const ApplyModifiersState *st, const char *mod) | | 3542 | LogBeforeApply(const ApplyModifiersState *st, const char *mod) |
3542 | { | | 3543 | { |
3543 | const Expr *expr = st->expr; | | 3544 | const Expr *expr = st->expr; |
3544 | char eflags_str[VarEvalFlags_ToStringSize]; | | 3545 | char eflags_str[VarEvalFlags_ToStringSize]; |
3545 | char vflags_str[VarFlags_ToStringSize]; | | 3546 | char vflags_str[VarFlags_ToStringSize]; |
3546 | Boolean is_single_char = mod[0] != '\0' && IsDelimiter(mod[1], st); | | 3547 | Boolean is_single_char = mod[0] != '\0' && IsDelimiter(mod[1], st); |
3547 | | | 3548 | |
3548 | /* At this point, only the first character of the modifier can | | 3549 | /* At this point, only the first character of the modifier can |
3549 | * be used since the end of the modifier is not yet known. */ | | 3550 | * be used since the end of the modifier is not yet known. */ |
3550 | debug_printf("Applying ${%s:%c%s} to \"%s\" (%s, %s, %s)\n", | | 3551 | debug_printf("Applying ${%s:%c%s} to \"%s\" (%s, %s, %s)\n", |
3551 | expr->var->name.str, mod[0], is_single_char ? "" : "...", | | 3552 | expr->var->name.str, mod[0], is_single_char ? "" : "...", |
3552 | expr->value.str, | | 3553 | expr->value.str, |
3553 | VarEvalFlags_ToString(eflags_str, expr->eflags), | | 3554 | VarEvalFlags_ToString(eflags_str, expr->eflags), |
3554 | VarFlags_ToString(vflags_str, expr->var->flags), | | 3555 | VarFlags_ToString(vflags_str, expr->var->flags), |
3555 | ExprDefined_Name[expr->defined]); | | 3556 | ExprDefined_Name[expr->defined]); |
3556 | } | | 3557 | } |
3557 | | | 3558 | |
3558 | static void | | 3559 | static void |
3559 | LogAfterApply(const ApplyModifiersState *st, const char *p, const char *mod) | | 3560 | LogAfterApply(const ApplyModifiersState *st, const char *p, const char *mod) |
3560 | { | | 3561 | { |
3561 | const Expr *expr = st->expr; | | 3562 | const Expr *expr = st->expr; |
3562 | const char *value = expr->value.str; | | 3563 | const char *value = expr->value.str; |
3563 | char eflags_str[VarEvalFlags_ToStringSize]; | | 3564 | char eflags_str[VarEvalFlags_ToStringSize]; |
3564 | char vflags_str[VarFlags_ToStringSize]; | | 3565 | char vflags_str[VarFlags_ToStringSize]; |
3565 | const char *quot = value == var_Error ? "" : "\""; | | 3566 | const char *quot = value == var_Error ? "" : "\""; |
3566 | | | 3567 | |
3567 | debug_printf("Result of ${%s:%.*s} is %s%s%s (%s, %s, %s)\n", | | 3568 | debug_printf("Result of ${%s:%.*s} is %s%s%s (%s, %s, %s)\n", |
3568 | expr->var->name.str, (int)(p - mod), mod, | | 3569 | expr->var->name.str, (int)(p - mod), mod, |
3569 | quot, value == var_Error ? "error" : value, quot, | | 3570 | quot, value == var_Error ? "error" : value, quot, |
3570 | VarEvalFlags_ToString(eflags_str, expr->eflags), | | 3571 | VarEvalFlags_ToString(eflags_str, expr->eflags), |
3571 | VarFlags_ToString(vflags_str, expr->var->flags), | | 3572 | VarFlags_ToString(vflags_str, expr->var->flags), |
3572 | ExprDefined_Name[expr->defined]); | | 3573 | ExprDefined_Name[expr->defined]); |
3573 | } | | 3574 | } |
3574 | | | 3575 | |
3575 | static ApplyModifierResult | | 3576 | static ApplyModifierResult |
3576 | ApplyModifier(const char **pp, ApplyModifiersState *st) | | 3577 | ApplyModifier(const char **pp, ApplyModifiersState *st) |
3577 | { | | 3578 | { |
3578 | switch (**pp) { | | 3579 | switch (**pp) { |
3579 | case '!': | | 3580 | case '!': |
3580 | return ApplyModifier_ShellCommand(pp, st); | | 3581 | return ApplyModifier_ShellCommand(pp, st); |
3581 | case ':': | | 3582 | case ':': |
3582 | return ApplyModifier_Assign(pp, st); | | 3583 | return ApplyModifier_Assign(pp, st); |
3583 | case '?': | | 3584 | case '?': |
3584 | return ApplyModifier_IfElse(pp, st); | | 3585 | return ApplyModifier_IfElse(pp, st); |
3585 | case '@': | | 3586 | case '@': |
3586 | return ApplyModifier_Loop(pp, st); | | 3587 | return ApplyModifier_Loop(pp, st); |
3587 | case '[': | | 3588 | case '[': |
3588 | return ApplyModifier_Words(pp, st); | | 3589 | return ApplyModifier_Words(pp, st); |
3589 | case '_': | | 3590 | case '_': |
3590 | return ApplyModifier_Remember(pp, st); | | 3591 | return ApplyModifier_Remember(pp, st); |
3591 | #ifndef NO_REGEX | | 3592 | #ifndef NO_REGEX |
3592 | case 'C': | | 3593 | case 'C': |
3593 | return ApplyModifier_Regex(pp, st); | | 3594 | return ApplyModifier_Regex(pp, st); |
3594 | #endif | | 3595 | #endif |
3595 | case 'D': | | 3596 | case 'D': |
3596 | return ApplyModifier_Defined(pp, st); | | 3597 | return ApplyModifier_Defined(pp, st); |
3597 | case 'E': | | 3598 | case 'E': |
3598 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix); | | 3599 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix); |
3599 | case 'g': | | 3600 | case 'g': |
3600 | return ApplyModifier_Gmtime(pp, st); | | 3601 | return ApplyModifier_Gmtime(pp, st); |
3601 | case 'H': | | 3602 | case 'H': |
3602 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Head); | | 3603 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Head); |
3603 | case 'h': | | 3604 | case 'h': |
3604 | return ApplyModifier_Hash(pp, st); | | 3605 | return ApplyModifier_Hash(pp, st); |
3605 | case 'L': | | 3606 | case 'L': |
3606 | return ApplyModifier_Literal(pp, st); | | 3607 | return ApplyModifier_Literal(pp, st); |
3607 | case 'l': | | 3608 | case 'l': |
3608 | return ApplyModifier_Localtime(pp, st); | | 3609 | return ApplyModifier_Localtime(pp, st); |
3609 | case 'M': | | 3610 | case 'M': |
3610 | case 'N': | | 3611 | case 'N': |
3611 | return ApplyModifier_Match(pp, st); | | 3612 | return ApplyModifier_Match(pp, st); |
3612 | case 'O': | | 3613 | case 'O': |
3613 | return ApplyModifier_Order(pp, st); | | 3614 | return ApplyModifier_Order(pp, st); |
3614 | case 'P': | | 3615 | case 'P': |
3615 | return ApplyModifier_Path(pp, st); | | 3616 | return ApplyModifier_Path(pp, st); |
3616 | case 'Q': | | 3617 | case 'Q': |
3617 | case 'q': | | 3618 | case 'q': |
3618 | return ApplyModifier_Quote(pp, st); | | 3619 | return ApplyModifier_Quote(pp, st); |
3619 | case 'R': | | 3620 | case 'R': |
3620 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Root); | | 3621 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Root); |
3621 | case 'r': | | 3622 | case 'r': |
3622 | return ApplyModifier_Range(pp, st); | | 3623 | return ApplyModifier_Range(pp, st); |
3623 | case 'S': | | 3624 | case 'S': |
3624 | return ApplyModifier_Subst(pp, st); | | 3625 | return ApplyModifier_Subst(pp, st); |
3625 | #ifdef SUNSHCMD | | 3626 | #ifdef SUNSHCMD |
3626 | case 's': | | 3627 | case 's': |
3627 | return ApplyModifier_SunShell(pp, st); | | 3628 | return ApplyModifier_SunShell(pp, st); |
3628 | #endif | | 3629 | #endif |
3629 | case 'T': | | 3630 | case 'T': |
3630 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail); | | 3631 | return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail); |
3631 | case 't': | | 3632 | case 't': |
3632 | return ApplyModifier_To(pp, st); | | 3633 | return ApplyModifier_To(pp, st); |
3633 | case 'U': | | 3634 | case 'U': |
3634 | return ApplyModifier_Defined(pp, st); | | 3635 | return ApplyModifier_Defined(pp, st); |
3635 | case 'u': | | 3636 | case 'u': |
3636 | return ApplyModifier_Unique(pp, st); | | 3637 | return ApplyModifier_Unique(pp, st); |
3637 | default: | | 3638 | default: |
3638 | return AMR_UNKNOWN; | | 3639 | return AMR_UNKNOWN; |
3639 | } | | 3640 | } |
3640 | } | | 3641 | } |
3641 | | | 3642 | |
3642 | static void ApplyModifiers(Expr *, const char **, char, char); | | 3643 | static void ApplyModifiers(Expr *, const char **, char, char); |
3643 | | | 3644 | |
3644 | typedef enum ApplyModifiersIndirectResult { | | 3645 | typedef enum ApplyModifiersIndirectResult { |
3645 | /* The indirect modifiers have been applied successfully. */ | | 3646 | /* The indirect modifiers have been applied successfully. */ |
3646 | AMIR_CONTINUE, | | 3647 | AMIR_CONTINUE, |
3647 | /* Fall back to the SysV modifier. */ | | 3648 | /* Fall back to the SysV modifier. */ |
3648 | AMIR_SYSV, | | 3649 | AMIR_SYSV, |
3649 | /* Error out. */ | | 3650 | /* Error out. */ |
3650 | AMIR_OUT | | 3651 | AMIR_OUT |
3651 | } ApplyModifiersIndirectResult; | | 3652 | } ApplyModifiersIndirectResult; |
3652 | | | 3653 | |
3653 | /* | | 3654 | /* |
3654 | * While expanding a variable expression, expand and apply indirect modifiers, | | 3655 | * While expanding a variable expression, expand and apply indirect modifiers, |
3655 | * such as in ${VAR:${M_indirect}}. | | 3656 | * such as in ${VAR:${M_indirect}}. |
3656 | * | | 3657 | * |
3657 | * All indirect modifiers of a group must come from a single variable | | 3658 | * All indirect modifiers of a group must come from a single variable |
3658 | * expression. ${VAR:${M1}} is valid but ${VAR:${M1}${M2}} is not. | | 3659 | * expression. ${VAR:${M1}} is valid but ${VAR:${M1}${M2}} is not. |
3659 | * | | 3660 | * |
3660 | * Multiple groups of indirect modifiers can be chained by separating them | | 3661 | * Multiple groups of indirect modifiers can be chained by separating them |
3661 | * with colons. ${VAR:${M1}:${M2}} contains 2 indirect modifiers. | | 3662 | * with colons. ${VAR:${M1}:${M2}} contains 2 indirect modifiers. |
3662 | * | | 3663 | * |
3663 | * If the variable expression is not followed by st->endc or ':', fall | | 3664 | * If the variable expression is not followed by st->endc or ':', fall |
3664 | * back to trying the SysV modifier, such as in ${VAR:${FROM}=${TO}}. | | 3665 | * back to trying the SysV modifier, such as in ${VAR:${FROM}=${TO}}. |
3665 | */ | | 3666 | */ |
3666 | static ApplyModifiersIndirectResult | | 3667 | static ApplyModifiersIndirectResult |
3667 | ApplyModifiersIndirect(ApplyModifiersState *st, const char **pp) | | 3668 | ApplyModifiersIndirect(ApplyModifiersState *st, const char **pp) |
3668 | { | | 3669 | { |
3669 | Expr *expr = st->expr; | | 3670 | Expr *expr = st->expr; |
3670 | const char *p = *pp; | | 3671 | const char *p = *pp; |
3671 | FStr mods; | | 3672 | FStr mods; |
3672 | | | 3673 | |
3673 | (void)Var_Parse(&p, expr->scope, expr->eflags, &mods); | | 3674 | (void)Var_Parse(&p, expr->scope, expr->eflags, &mods); |
3674 | /* TODO: handle errors */ | | 3675 | /* TODO: handle errors */ |
3675 | | | 3676 | |
3676 | if (mods.str[0] != '\0' && *p != '\0' && !IsDelimiter(*p, st)) { | | 3677 | if (mods.str[0] != '\0' && *p != '\0' && !IsDelimiter(*p, st)) { |
3677 | FStr_Done(&mods); | | 3678 | FStr_Done(&mods); |
3678 | return AMIR_SYSV; | | 3679 | return AMIR_SYSV; |
3679 | } | | 3680 | } |
3680 | | | 3681 | |
3681 | DEBUG3(VAR, "Indirect modifier \"%s\" from \"%.*s\"\n", | | 3682 | DEBUG3(VAR, "Indirect modifier \"%s\" from \"%.*s\"\n", |
3682 | mods.str, (int)(p - *pp), *pp); | | 3683 | mods.str, (int)(p - *pp), *pp); |
3683 | | | 3684 | |
3684 | if (mods.str[0] != '\0') { | | 3685 | if (mods.str[0] != '\0') { |
3685 | const char *modsp = mods.str; | | 3686 | const char *modsp = mods.str; |
3686 | ApplyModifiers(expr, &modsp, '\0', '\0'); | | 3687 | ApplyModifiers(expr, &modsp, '\0', '\0'); |
3687 | if (expr->value.str == var_Error || *modsp != '\0') { | | 3688 | if (expr->value.str == var_Error || *modsp != '\0') { |
3688 | FStr_Done(&mods); | | 3689 | FStr_Done(&mods); |
3689 | *pp = p; | | 3690 | *pp = p; |
3690 | return AMIR_OUT; /* error already reported */ | | 3691 | return AMIR_OUT; /* error already reported */ |
3691 | } | | 3692 | } |
3692 | } | | 3693 | } |
3693 | FStr_Done(&mods); | | 3694 | FStr_Done(&mods); |
3694 | | | 3695 | |
3695 | if (*p == ':') | | 3696 | if (*p == ':') |
3696 | p++; | | 3697 | p++; |
3697 | else if (*p == '\0' && st->endc != '\0') { | | 3698 | else if (*p == '\0' && st->endc != '\0') { |
3698 | Error("Unclosed variable expression after indirect " | | 3699 | Error("Unclosed variable expression after indirect " |
3699 | "modifier, expecting '%c' for variable \"%s\"", | | 3700 | "modifier, expecting '%c' for variable \"%s\"", |
3700 | st->endc, expr->var->name.str); | | 3701 | st->endc, expr->var->name.str); |
3701 | *pp = p; | | 3702 | *pp = p; |
3702 | return AMIR_OUT; | | 3703 | return AMIR_OUT; |
3703 | } | | 3704 | } |
3704 | | | 3705 | |
3705 | *pp = p; | | 3706 | *pp = p; |
3706 | return AMIR_CONTINUE; | | 3707 | return AMIR_CONTINUE; |
3707 | } | | 3708 | } |
3708 | | | 3709 | |
3709 | static ApplyModifierResult | | 3710 | static ApplyModifierResult |
3710 | ApplySingleModifier(const char **pp, ApplyModifiersState *st) | | 3711 | ApplySingleModifier(const char **pp, ApplyModifiersState *st) |
3711 | { | | 3712 | { |
3712 | ApplyModifierResult res; | | 3713 | ApplyModifierResult res; |
3713 | const char *mod = *pp; | | 3714 | const char *mod = *pp; |
3714 | const char *p = *pp; | | 3715 | const char *p = *pp; |
3715 | | | 3716 | |
3716 | if (DEBUG(VAR)) | | 3717 | if (DEBUG(VAR)) |
3717 | LogBeforeApply(st, mod); | | 3718 | LogBeforeApply(st, mod); |
3718 | | | 3719 | |
3719 | res = ApplyModifier(&p, st); | | 3720 | res = ApplyModifier(&p, st); |
3720 | | | 3721 | |
3721 | #ifdef SYSVVARSUB | | 3722 | #ifdef SYSVVARSUB |
3722 | if (res == AMR_UNKNOWN) { | | 3723 | if (res == AMR_UNKNOWN) { |
3723 | assert(p == mod); | | 3724 | assert(p == mod); |
3724 | res = ApplyModifier_SysV(&p, st); | | 3725 | res = ApplyModifier_SysV(&p, st); |
3725 | } | | 3726 | } |
3726 | #endif | | 3727 | #endif |
3727 | | | 3728 | |
3728 | if (res == AMR_UNKNOWN) { | | 3729 | if (res == AMR_UNKNOWN) { |
3729 | /* | | 3730 | /* |
3730 | * Guess the end of the current modifier. | | 3731 | * Guess the end of the current modifier. |
3731 | * XXX: Skipping the rest of the modifier hides | | 3732 | * XXX: Skipping the rest of the modifier hides |
3732 | * errors and leads to wrong results. | | 3733 | * errors and leads to wrong results. |
3733 | * Parsing should rather stop here. | | 3734 | * Parsing should rather stop here. |
3734 | */ | | 3735 | */ |
3735 | for (p++; !IsDelimiter(*p, st) && *p != '\0'; p++) | | 3736 | for (p++; !IsDelimiter(*p, st) && *p != '\0'; p++) |
3736 | continue; | | 3737 | continue; |
3737 | Parse_Error(PARSE_FATAL, "Unknown modifier \"%.*s\"", | | 3738 | Parse_Error(PARSE_FATAL, "Unknown modifier \"%.*s\"", |
3738 | (int)(p - mod), mod); | | 3739 | (int)(p - mod), mod); |
3739 | Expr_SetValueRefer(st->expr, var_Error); | | 3740 | Expr_SetValueRefer(st->expr, var_Error); |
3740 | } | | 3741 | } |
3741 | if (res == AMR_CLEANUP || res == AMR_BAD) { | | 3742 | if (res == AMR_CLEANUP || res == AMR_BAD) { |
3742 | *pp = p; | | 3743 | *pp = p; |
3743 | return res; | | 3744 | return res; |
3744 | } | | 3745 | } |
3745 | | | 3746 | |
3746 | if (DEBUG(VAR)) | | 3747 | if (DEBUG(VAR)) |
3747 | LogAfterApply(st, p, mod); | | 3748 | LogAfterApply(st, p, mod); |
3748 | | | 3749 | |
3749 | if (*p == '\0' && st->endc != '\0') { | | 3750 | if (*p == '\0' && st->endc != '\0') { |
3750 | Error( | | 3751 | Error( |
3751 | "Unclosed variable expression, expecting '%c' for " | | 3752 | "Unclosed variable expression, expecting '%c' for " |
3752 | "modifier \"%.*s\" of variable \"%s\" with value \"%s\"", | | 3753 | "modifier \"%.*s\" of variable \"%s\" with value \"%s\"", |
3753 | st->endc, | | 3754 | st->endc, |
3754 | (int)(p - mod), mod, | | 3755 | (int)(p - mod), mod, |
3755 | st->expr->var->name.str, st->expr->value.str); | | 3756 | st->expr->var->name.str, st->expr->value.str); |
3756 | } else if (*p == ':') { | | 3757 | } else if (*p == ':') { |
3757 | p++; | | 3758 | p++; |
3758 | } else if (opts.strict && *p != '\0' && *p != st->endc) { | | 3759 | } else if (opts.strict && *p != '\0' && *p != st->endc) { |
3759 | Parse_Error(PARSE_FATAL, | | 3760 | Parse_Error(PARSE_FATAL, |
3760 | "Missing delimiter ':' after modifier \"%.*s\"", | | 3761 | "Missing delimiter ':' after modifier \"%.*s\"", |
3761 | (int)(p - mod), mod); | | 3762 | (int)(p - mod), mod); |
3762 | /* | | 3763 | /* |
3763 | * TODO: propagate parse error to the enclosing | | 3764 | * TODO: propagate parse error to the enclosing |
3764 | * expression | | 3765 | * expression |
3765 | */ | | 3766 | */ |
3766 | } | | 3767 | } |
3767 | *pp = p; | | 3768 | *pp = p; |
3768 | return AMR_OK; | | 3769 | return AMR_OK; |
3769 | } | | 3770 | } |
3770 | | | 3771 | |
3771 | /* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */ | | 3772 | /* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */ |
3772 | static void | | 3773 | static void |
3773 | ApplyModifiers( | | 3774 | ApplyModifiers( |
3774 | Expr *expr, | | 3775 | Expr *expr, |
3775 | const char **pp, /* the parsing position, updated upon return */ | | 3776 | const char **pp, /* the parsing position, updated upon return */ |
3776 | char startc, /* '(' or '{'; or '\0' for indirect modifiers */ | | 3777 | char startc, /* '(' or '{'; or '\0' for indirect modifiers */ |
3777 | char endc /* ')' or '}'; or '\0' for indirect modifiers */ | | 3778 | char endc /* ')' or '}'; or '\0' for indirect modifiers */ |
3778 | ) | | 3779 | ) |
3779 | { | | 3780 | { |
3780 | ApplyModifiersState st = { | | 3781 | ApplyModifiersState st = { |
3781 | expr, | | 3782 | expr, |
3782 | startc, | | 3783 | startc, |
3783 | endc, | | 3784 | endc, |
3784 | ' ', /* .sep */ | | 3785 | ' ', /* .sep */ |
3785 | FALSE /* .oneBigWord */ | | 3786 | FALSE /* .oneBigWord */ |
3786 | }; | | 3787 | }; |
3787 | const char *p; | | 3788 | const char *p; |
3788 | const char *mod; | | 3789 | const char *mod; |
3789 | | | 3790 | |
3790 | assert(startc == '(' || startc == '{' || startc == '\0'); | | 3791 | assert(startc == '(' || startc == '{' || startc == '\0'); |
3791 | assert(endc == ')' || endc == '}' || endc == '\0'); | | 3792 | assert(endc == ')' || endc == '}' || endc == '\0'); |
3792 | assert(expr->value.str != NULL); | | 3793 | assert(expr->value.str != NULL); |
3793 | | | 3794 | |
3794 | p = *pp; | | 3795 | p = *pp; |
3795 | | | 3796 | |
3796 | if (*p == '\0' && endc != '\0') { | | 3797 | if (*p == '\0' && endc != '\0') { |
3797 | Error( | | 3798 | Error( |
3798 | "Unclosed variable expression (expecting '%c') for \"%s\"", | | 3799 | "Unclosed variable expression (expecting '%c') for \"%s\"", |
3799 | st.endc, expr->var->name.str); | | 3800 | st.endc, expr->var->name.str); |
3800 | goto cleanup; | | 3801 | goto cleanup; |
3801 | } | | 3802 | } |
3802 | | | 3803 | |
3803 | while (*p != '\0' && *p != endc) { | | 3804 | while (*p != '\0' && *p != endc) { |
3804 | ApplyModifierResult res; | | 3805 | ApplyModifierResult res; |
3805 | | | 3806 | |
3806 | if (*p == '$') { | | 3807 | if (*p == '$') { |
3807 | ApplyModifiersIndirectResult amir = | | 3808 | ApplyModifiersIndirectResult amir = |
3808 | ApplyModifiersIndirect(&st, &p); | | 3809 | ApplyModifiersIndirect(&st, &p); |
3809 | if (amir == AMIR_CONTINUE) | | 3810 | if (amir == AMIR_CONTINUE) |
3810 | continue; | | 3811 | continue; |
3811 | if (amir == AMIR_OUT) | | 3812 | if (amir == AMIR_OUT) |
3812 | break; | | 3813 | break; |
3813 | /* | | 3814 | /* |
3814 | * It's neither '${VAR}:' nor '${VAR}}'. Try to parse | | 3815 | * It's neither '${VAR}:' nor '${VAR}}'. Try to parse |
3815 | * it as a SysV modifier, as that is the only modifier | | 3816 | * it as a SysV modifier, as that is the only modifier |
3816 | * that can start with '$'. | | 3817 | * that can start with '$'. |
3817 | */ | | 3818 | */ |
3818 | } | | 3819 | } |
3819 | | | 3820 | |
3820 | mod = p; | | 3821 | mod = p; |
3821 | | | 3822 | |
3822 | res = ApplySingleModifier(&p, &st); | | 3823 | res = ApplySingleModifier(&p, &st); |
3823 | if (res == AMR_CLEANUP) | | 3824 | if (res == AMR_CLEANUP) |
3824 | goto cleanup; | | 3825 | goto cleanup; |
3825 | if (res == AMR_BAD) | | 3826 | if (res == AMR_BAD) |
3826 | goto bad_modifier; | | 3827 | goto bad_modifier; |
3827 | } | | 3828 | } |
3828 | | | 3829 | |
3829 | *pp = p; | | 3830 | *pp = p; |
3830 | assert(expr->value.str != NULL); /* Use var_Error or varUndefined. */ | | 3831 | assert(expr->value.str != NULL); /* Use var_Error or varUndefined. */ |
3831 | return; | | 3832 | return; |
3832 | | | 3833 | |
3833 | bad_modifier: | | 3834 | bad_modifier: |
3834 | /* XXX: The modifier end is only guessed. */ | | 3835 | /* XXX: The modifier end is only guessed. */ |
3835 | Error("Bad modifier \":%.*s\" for variable \"%s\"", | | 3836 | Error("Bad modifier \":%.*s\" for variable \"%s\"", |
3836 | (int)strcspn(mod, ":)}"), mod, expr->var->name.str); | | 3837 | (int)strcspn(mod, ":)}"), mod, expr->var->name.str); |
3837 | | | 3838 | |
3838 | cleanup: | | 3839 | cleanup: |
3839 | /* | | 3840 | /* |
3840 | * TODO: Use p + strlen(p) instead, to stop parsing immediately. | | 3841 | * TODO: Use p + strlen(p) instead, to stop parsing immediately. |
3841 | * | | 3842 | * |
3842 | * In the unit tests, this generates a few unterminated strings in the | | 3843 | * In the unit tests, this generates a few unterminated strings in the |
3843 | * shell commands though. Instead of producing these unfinished | | 3844 | * shell commands though. Instead of producing these unfinished |
3844 | * strings, commands with evaluation errors should not be run at all. | | 3845 | * strings, commands with evaluation errors should not be run at all. |
3845 | * | | 3846 | * |
3846 | * To make that happen, Var_Subst must report the actual errors | | 3847 | * To make that happen, Var_Subst must report the actual errors |
3847 | * instead of returning VPR_OK unconditionally. | | 3848 | * instead of returning VPR_OK unconditionally. |
3848 | */ | | 3849 | */ |
3849 | *pp = p; | | 3850 | *pp = p; |
3850 | Expr_SetValueRefer(expr, var_Error); | | 3851 | Expr_SetValueRefer(expr, var_Error); |
3851 | } | | 3852 | } |
3852 | | | 3853 | |
3853 | /* | | 3854 | /* |
3854 | * Only four of the local variables are treated specially as they are the | | 3855 | * Only four of the local variables are treated specially as they are the |
3855 | * only four that will be set when dynamic sources are expanded. | | 3856 | * only four that will be set when dynamic sources are expanded. |
3856 | */ | | 3857 | */ |
3857 | static Boolean | | 3858 | static Boolean |
3858 | VarnameIsDynamic(const char *name, size_t len) | | 3859 | VarnameIsDynamic(const char *name, size_t len) |
3859 | { | | 3860 | { |
3860 | if (len == 1 || (len == 2 && (name[1] == 'F' || name[1] == 'D'))) { | | 3861 | if (len == 1 || (len == 2 && (name[1] == 'F' || name[1] == 'D'))) { |
3861 | switch (name[0]) { | | 3862 | switch (name[0]) { |
3862 | case '@': | | 3863 | case '@': |
3863 | case '%': | | 3864 | case '%': |
3864 | case '*': | | 3865 | case '*': |
3865 | case '!': | | 3866 | case '!': |
3866 | return TRUE; | | 3867 | return TRUE; |
3867 | } | | 3868 | } |
3868 | return FALSE; | | 3869 | return FALSE; |
3869 | } | | 3870 | } |
3870 | | | 3871 | |
3871 | if ((len == 7 || len == 8) && name[0] == '.' && ch_isupper(name[1])) { | | 3872 | if ((len == 7 || len == 8) && name[0] == '.' && ch_isupper(name[1])) { |
3872 | return strcmp(name, ".TARGET") == 0 || | | 3873 | return strcmp(name, ".TARGET") == 0 || |
3873 | strcmp(name, ".ARCHIVE") == 0 || | | 3874 | strcmp(name, ".ARCHIVE") == 0 || |
3874 | strcmp(name, ".PREFIX") == 0 || | | 3875 | strcmp(name, ".PREFIX") == 0 || |
3875 | strcmp(name, ".MEMBER") == 0; | | 3876 | strcmp(name, ".MEMBER") == 0; |
3876 | } | | 3877 | } |
3877 | | | 3878 | |
3878 | return FALSE; | | 3879 | return FALSE; |
3879 | } | | 3880 | } |
3880 | | | 3881 | |
3881 | static const char * | | 3882 | static const char * |
3882 | UndefinedShortVarValue(char varname, const GNode *scope) | | 3883 | UndefinedShortVarValue(char varname, const GNode *scope) |
3883 | { | | 3884 | { |
3884 | if (scope == SCOPE_CMDLINE || scope == SCOPE_GLOBAL) { | | 3885 | if (scope == SCOPE_CMDLINE || scope == SCOPE_GLOBAL) { |
3885 | /* | | 3886 | /* |
3886 | * If substituting a local variable in a non-local scope, | | 3887 | * If substituting a local variable in a non-local scope, |
3887 | * assume it's for dynamic source stuff. We have to handle | | 3888 | * assume it's for dynamic source stuff. We have to handle |
3888 | * this specially and return the longhand for the variable | | 3889 | * this specially and return the longhand for the variable |
3889 | * with the dollar sign escaped so it makes it back to the | | 3890 | * with the dollar sign escaped so it makes it back to the |
3890 | * caller. Only four of the local variables are treated | | 3891 | * caller. Only four of the local variables are treated |
3891 | * specially as they are the only four that will be set | | 3892 | * specially as they are the only four that will be set |
3892 | * when dynamic sources are expanded. | | 3893 | * when dynamic sources are expanded. |
3893 | */ | | 3894 | */ |
3894 | switch (varname) { | | 3895 | switch (varname) { |
3895 | case '@': | | 3896 | case '@': |
3896 | return "$(.TARGET)"; | | 3897 | return "$(.TARGET)"; |
3897 | case '%': | | 3898 | case '%': |
3898 | return "$(.MEMBER)"; | | 3899 | return "$(.MEMBER)"; |
3899 | case '*': | | 3900 | case '*': |
3900 | return "$(.PREFIX)"; | | 3901 | return "$(.PREFIX)"; |
3901 | case '!': | | 3902 | case '!': |
3902 | return "$(.ARCHIVE)"; | | 3903 | return "$(.ARCHIVE)"; |
3903 | } | | 3904 | } |
3904 | } | | 3905 | } |
3905 | return NULL; | | 3906 | return NULL; |
3906 | } | | 3907 | } |
3907 | | | 3908 | |
3908 | /* | | 3909 | /* |
3909 | * Parse a variable name, until the end character or a colon, whichever | | 3910 | * Parse a variable name, until the end character or a colon, whichever |
3910 | * comes first. | | 3911 | * comes first. |
3911 | */ | | 3912 | */ |
3912 | static char * | | 3913 | static char * |
3913 | ParseVarname(const char **pp, char startc, char endc, | | 3914 | ParseVarname(const char **pp, char startc, char endc, |
3914 | GNode *scope, VarEvalFlags eflags, | | 3915 | GNode *scope, VarEvalFlags eflags, |
3915 | size_t *out_varname_len) | | 3916 | size_t *out_varname_len) |
3916 | { | | 3917 | { |
3917 | Buffer buf; | | 3918 | Buffer buf; |
3918 | const char *p = *pp; | | 3919 | const char *p = *pp; |
3919 | int depth = 0; /* Track depth so we can spot parse errors. */ | | 3920 | int depth = 0; /* Track depth so we can spot parse errors. */ |
3920 | | | 3921 | |
3921 | Buf_Init(&buf); | | 3922 | Buf_Init(&buf); |
3922 | | | 3923 | |
3923 | while (*p != '\0') { | | 3924 | while (*p != '\0') { |
3924 | if ((*p == endc || *p == ':') && depth == 0) | | 3925 | if ((*p == endc || *p == ':') && depth == 0) |
3925 | break; | | 3926 | break; |
3926 | if (*p == startc) | | 3927 | if (*p == startc) |
3927 | depth++; | | 3928 | depth++; |
3928 | if (*p == endc) | | 3929 | if (*p == endc) |
3929 | depth--; | | 3930 | depth--; |
3930 | | | 3931 | |
3931 | /* A variable inside a variable, expand. */ | | 3932 | /* A variable inside a variable, expand. */ |
3932 | if (*p == '$') { | | 3933 | if (*p == '$') { |