| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: var.c,v 1.215 2017/04/16 21:39:49 riastradh Exp $ */ | | 1 | /* $NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $ */ |
| 2 | | | 2 | |
| 3 | /* | | 3 | /* |
| 4 | * Copyright (c) 1988, 1989, 1990, 1993 | | 4 | * Copyright (c) 1988, 1989, 1990, 1993 |
| 5 | * The Regents of the University of California. All rights reserved. | | 5 | * The Regents of the University of California. All rights reserved. |
| 6 | * | | 6 | * |
| 7 | * This code is derived from software contributed to Berkeley by | | 7 | * This code is derived from software contributed to Berkeley by |
| 8 | * Adam de Boor. | | 8 | * Adam de Boor. |
| 9 | * | | 9 | * |
| 10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
| 11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
| 12 | * are met: | | 12 | * are met: |
| 13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
| 14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -59,34 +59,34 @@ | | | @@ -59,34 +59,34 @@ |
| 59 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | | 59 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 60 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | | 60 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 61 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | | 61 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
| 62 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | | 62 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| 63 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | | 63 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
| 64 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 64 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
| 65 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | | 65 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
| 66 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | | 66 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| 67 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | | 67 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 68 | * SUCH DAMAGE. | | 68 | * SUCH DAMAGE. |
| 69 | */ | | 69 | */ |
| 70 | | | 70 | |
| 71 | #ifndef MAKE_NATIVE | | 71 | #ifndef MAKE_NATIVE |
| 72 | static char rcsid[] = "$NetBSD: var.c,v 1.215 2017/04/16 21:39:49 riastradh Exp $"; | | 72 | static char rcsid[] = "$NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $"; |
| 73 | #else | | 73 | #else |
| 74 | #include <sys/cdefs.h> | | 74 | #include <sys/cdefs.h> |
| 75 | #ifndef lint | | 75 | #ifndef lint |
| 76 | #if 0 | | 76 | #if 0 |
| 77 | static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; | | 77 | static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; |
| 78 | #else | | 78 | #else |
| 79 | __RCSID("$NetBSD: var.c,v 1.215 2017/04/16 21:39:49 riastradh Exp $"); | | 79 | __RCSID("$NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $"); |
| 80 | #endif | | 80 | #endif |
| 81 | #endif /* not lint */ | | 81 | #endif /* not lint */ |
| 82 | #endif | | 82 | #endif |
| 83 | | | 83 | |
| 84 | /*- | | 84 | /*- |
| 85 | * var.c -- | | 85 | * var.c -- |
| 86 | * Variable-handling functions | | 86 | * Variable-handling functions |
| 87 | * | | 87 | * |
| 88 | * Interface: | | 88 | * Interface: |
| 89 | * Var_Set Set the value of a variable in the given | | 89 | * Var_Set Set the value of a variable in the given |
| 90 | * context. The variable is created if it doesn't | | 90 | * context. The variable is created if it doesn't |
| 91 | * yet exist. The value and variable name need not | | 91 | * yet exist. The value and variable name need not |
| 92 | * be preserved. | | 92 | * be preserved. |
| @@ -2336,26 +2336,28 @@ VarQuote(char *str) | | | @@ -2336,26 +2336,28 @@ VarQuote(char *str) |
| 2336 | newline = "\\\n"; | | 2336 | newline = "\\\n"; |
| 2337 | nlen = strlen(newline); | | 2337 | nlen = strlen(newline); |
| 2338 | | | 2338 | |
| 2339 | Buf_Init(&buf, 0); | | 2339 | Buf_Init(&buf, 0); |
| 2340 | | | 2340 | |
| 2341 | for (; *str != '\0'; str++) { | | 2341 | for (; *str != '\0'; str++) { |
| 2342 | if (*str == '\n') { | | 2342 | if (*str == '\n') { |
| 2343 | Buf_AddBytes(&buf, nlen, newline); | | 2343 | Buf_AddBytes(&buf, nlen, newline); |
| 2344 | continue; | | 2344 | continue; |
| 2345 | } | | 2345 | } |
| 2346 | if (isspace((unsigned char)*str) || ismeta((unsigned char)*str)) | | 2346 | if (isspace((unsigned char)*str) || ismeta((unsigned char)*str)) |
| 2347 | Buf_AddByte(&buf, '\\'); | | 2347 | Buf_AddByte(&buf, '\\'); |
| 2348 | Buf_AddByte(&buf, *str); | | 2348 | Buf_AddByte(&buf, *str); |
| | | 2349 | if (*str == '$') |
| | | 2350 | Buf_AddBytes(&buf, 2, "\\$"); |
| 2349 | } | | 2351 | } |
| 2350 | | | 2352 | |
| 2351 | str = Buf_Destroy(&buf, FALSE); | | 2353 | str = Buf_Destroy(&buf, FALSE); |
| 2352 | if (DEBUG(VAR)) | | 2354 | if (DEBUG(VAR)) |
| 2353 | fprintf(debug_file, "QuoteMeta: [%s]\n", str); | | 2355 | fprintf(debug_file, "QuoteMeta: [%s]\n", str); |
| 2354 | return str; | | 2356 | return str; |
| 2355 | } | | 2357 | } |
| 2356 | | | 2358 | |
| 2357 | /*- | | 2359 | /*- |
| 2358 | *----------------------------------------------------------------------- | | 2360 | *----------------------------------------------------------------------- |
| 2359 | * VarHash -- | | 2361 | * VarHash -- |
| 2360 | * Hash the string using the MurmurHash3 algorithm. | | 2362 | * Hash the string using the MurmurHash3 algorithm. |
| 2361 | * Output is computed using 32bit Little Endian arithmetic. | | 2363 | * Output is computed using 32bit Little Endian arithmetic. |