h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-17 02:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make string match -rnv work

Browse Source 
Fixes #3098.
This commit is contained in:
Fabian Homborg
2016-05-31 23:14:03 +02:00
parent 3d74b160b3
commit 8d6735cb41
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/builtin_string.cpp
View File

@@ -376,8 +376,12 @@ class pcre2_matcher_t : public string_matcher_t {
// Return values: -1 = error, 0 = no match, 1 = match.
if (pcre2_rc == PCRE2_ERROR_NOMATCH) {
if (opts.invert_match && !opts.quiet) {
streams.out.append(arg);
streams.out.push_back(L'\n');
if (opts.index) {
streams.out.append_format(L"1 %lu\n", wcslen(arg));
} else {
streams.out.append(arg);
streams.out.push_back(L'\n');
}
}
return opts.invert_match ? 1 : 0;