diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:11:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:11:50 +0000 |
| commit | 054d2bd549b979947565f10890bf2d2b4a6feba2 (patch) | |
| tree | ec06707546c523d3ca43b34503af94c99e704b65 /lib/search | |
| parent | Adding debian version 3:4.8.30-1. (diff) | |
| download | mc-054d2bd549b979947565f10890bf2d2b4a6feba2.tar.xz mc-054d2bd549b979947565f10890bf2d2b4a6feba2.zip | |
Merging upstream version 3:4.8.31.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/search')
| -rw-r--r-- | lib/search/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/search/glob.c | 2 | ||||
| -rw-r--r-- | lib/search/hex.c | 2 | ||||
| -rw-r--r-- | lib/search/lib.c | 2 | ||||
| -rw-r--r-- | lib/search/normal.c | 2 | ||||
| -rw-r--r-- | lib/search/regex.c | 9 | ||||
| -rw-r--r-- | lib/search/search.c | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/lib/search/Makefile.in b/lib/search/Makefile.in index b587d13..b081433 100644 --- a/lib/search/Makefile.in +++ b/lib/search/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/search/glob.c b/lib/search/glob.c index 5874aba..a0326d0 100644 --- a/lib/search/glob.c +++ b/lib/search/glob.c @@ -2,7 +2,7 @@ Search text engine. Glob-style pattern matching - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/hex.c b/lib/search/hex.c index 50af6fb..a5764d8 100644 --- a/lib/search/hex.c +++ b/lib/search/hex.c @@ -2,7 +2,7 @@ Search text engine. HEX-style pattern matching - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/lib.c b/lib/search/lib.c index 2c22504..1158e83 100644 --- a/lib/search/lib.c +++ b/lib/search/lib.c @@ -2,7 +2,7 @@ Search text engine. Common share code for module. - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/normal.c b/lib/search/normal.c index 9042bfc..9d86b44 100644 --- a/lib/search/normal.c +++ b/lib/search/normal.c @@ -2,7 +2,7 @@ Search text engine. Plain search - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/regex.c b/lib/search/regex.c index d24cf48..b1c61c5 100644 --- a/lib/search/regex.c +++ b/lib/search/regex.c @@ -2,7 +2,7 @@ Search text engine. Regex search - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -397,17 +397,16 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len) { int max_token = 0; gsize loop; + for (loop = 0; loop < len - 1; loop++) - { if (str[loop] == '\\' && g_ascii_isdigit (str[loop + 1])) { if (strutils_is_char_escaped (str, &str[loop])) continue; if (max_token < str[loop + 1] - '0') max_token = str[loop + 1] - '0'; - continue; } - if (str[loop] == '$' && str[loop + 1] == '{') + else if (str[loop] == '$' && str[loop + 1] == '{') { gsize tmp_len; @@ -430,7 +429,7 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len) g_free (tmp_str); } } - } + return max_token; } diff --git a/lib/search/search.c b/lib/search/search.c index 8ccb65f..ddbdc2b 100644 --- a/lib/search/search.c +++ b/lib/search/search.c @@ -2,7 +2,7 @@ Search text engine. Interface functions - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: |