GNU has a very useful third argument to match() but this is not supported
in the POSIX awk. It is a great shame.
Update the code to cope.
Signed-off-by: Simon Glass <s...@chromium.org>
---
scripts/env2string.awk | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/scripts/env2string.awk b/scripts/env2string.awk
index 57d0fc8f3ba..4c109eee32a 100644
--- a/scripts/env2string.awk
+++ b/scripts/env2string.awk
@@ -24,26 +24,33 @@ NF {
# Quote quotes
gsub("\"", "\\\"")
+ # Avoid using the non-POSIX third parameter to match() which is very
+ # inconvenient
+ has_var = match($0, "^([^ \t=][^ =]*)=(.*)$", arr)
+
# Is this the start of a new environment variable?
- if (match($0, "^([^ \t=][^ =]*)=(.*)$", arr)) {
+ if (has_var) {
if (length(env) != 0) {
# Record the value of the variable now completed
vars[var] = env
}
- var = arr[1]
- env = arr[2]
+
+ # Collect the variable name. The value follows the '='
+ match($0, "^([^ \t=][^ =]*)=")
+ var = substr($0, 1, RLENGTH - 1)
+ env = substr($0, RLENGTH + 1)
# Deal with += which concatenates the new string to the existing
- # variable
- if (length(env) != 0 && match(var, "^(.*)[+]$", var_arr))
- {
+ # variable. Again we are careful to use POSIX match()
+ if (length(env) != 0 && match(var, "^(.*)[+]$")) {
+ plusname = substr(var, RSTART, RLENGTH - 1)
# Allow var\+=val to indicate that the variable name is
# var+ and this is not actually a concatenation
- if (substr(var_arr[1], length(var_arr[1])) == "\\") {
+ if (substr(plusname, length(plusname)) == "\\") {
# Drop the backslash
sub(/\\[+]$/, "+", var)
} else {
- var = var_arr[1]
+ var = plusname
env = vars[var] env
}
}
--
2.34.0.rc2.393.gf8c9666880-goog
