diff options
| author | Dirk Brenken <dev@brenken.org> | 2019-06-29 19:26:07 +0200 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2019-06-29 19:26:07 +0200 |
| commit | f73da9ca82ff8e0352c3942ea78ab7d1d0317668 (patch) | |
| tree | c4f988db0f2bb8049230cefe52469b54c6007178 /modules/luci-base/luasrc/util.lua | |
| parent | 86fd703bae2089cfd0dd7e06c1dd20c4b956767a (diff) | |
system-wide: fix escaping of magic chars
* fix escaping of magic lua chars (#2800)
* fix redundant second gsub line in shellstartsqescape function
* fix return value of shellstartsqescape function
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'modules/luci-base/luasrc/util.lua')
| -rw-r--r-- | modules/luci-base/luasrc/util.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua index 1a329f3f2..a30e8b72f 100644 --- a/modules/luci-base/luasrc/util.lua +++ b/modules/luci-base/luasrc/util.lua @@ -207,9 +207,8 @@ end -- handling. It may actually be a property of the getopt function -- rather than the shell proper. function shellstartsqescape(value) - res, _ = string.gsub(value, "^\-", "\\-") - res, _ = string.gsub(res, "^-", "\-") - return shellsqescape(value) + res, _ = string.gsub(value, "^%-", "\\-") + return shellsqescape(res) end -- containing the resulting substrings. The optional max parameter specifies |