diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-12-01 14:19:21 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-12-01 14:19:21 -0800 |
| commit | 003a06f030de7bf52b2617f2d24976ff22dd3d5e (patch) | |
| tree | d519f12b8395bf9b470261331914ec046de312ff /src | |
| parent | Merge pull request #6910 (diff) | |
| parent | util: fix escaping more than one ?* in glob_to_regex (diff) | |
| download | monero-003a06f030de7bf52b2617f2d24976ff22dd3d5e.tar.xz | |
Merge pull request #6923
cc034fe0c util: fix escaping more than one ?* in glob_to_regex (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/util.cpp b/src/common/util.cpp index 433cb4919..f8707d65c 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -1000,13 +1000,13 @@ std::string get_nix_version_display_string() for (char c: val) { if (c == '*') - newval += escape ? "*" : ".*"; + newval += escape ? "*" : ".*", escape = false; else if (c == '?') - newval += escape ? "?" : "."; + newval += escape ? "?" : ".", escape = false; else if (c == '\\') newval += '\\', escape = !escape; else - newval += c; + newval += c, escape = false; } return newval; } |