mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-22 03:02:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Total replacement to mc_search stuff in all places

Browse Source
This commit is contained in:
Slava Zanko 2009-05-06 19:12:32 +03:00
parent 0d76e9aa34
commit 087ef15b1f
19 changed files with 130 additions and 9124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
edit/syntax.c
View File

@ -40,6 +40,7 @@
#include "../src/main.h" /* mc_home */
#include "../src/wtools.h" /* message() */
#include "../src/strutil.h" /* utf string functions */
#include "../src/search/search.h" /* search engine */
/* bytes */
#define SYNTAX_MARKER_DENSITY 512
@ -1012,8 +1013,6 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file,
{
#define NENTRIES 30
FILE *f, *g = NULL;
regex_t r;
regmatch_t pmatch[1];
char *args[1024], *l = 0;
int line = 0;
int result = 0;
@ -1085,23 +1084,11 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file,
/* 3: auto-detect rule set from regular expressions */
int q;
if (regcomp (&r, args[1], REG_EXTENDED)) {
result = line;
break;
}
q = mc_search(args[1], editor_file, MC_SEARCH_T_REGEX);
/* does filename match arg 1 ? */
q = !regexec (&r, editor_file, 1, pmatch, 0);
regfree (&r);
if (!q && args[3]) {
if (regcomp (&r, args[3], REG_EXTENDED)) {
result = line;
break;
}
/* does first line match arg 3 ? */
q = !regexec (&r, first_line, 1, pmatch, 0);
regfree (&r);
q = mc_search(args[3], first_line, MC_SEARCH_T_REGEX);
}
if (q) {
int line_error;

4
src/Makefile.am
View File

@ -45,7 +45,7 @@ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h \
command.c command.h complete.c cons.handler.c \
cons.saver.h dialog.c dialog.h dir.c dir.h \
eregex.h execute.c execute.h ext.c ext.h file.c filegui.c \
execute.c execute.h ext.c ext.h file.c filegui.c \
filegui.h file.h filenot.c fileopctx.c fileopctx.h find.c \
find.h findme.c findme.h fs.h \
glibcompat.c glibcompat.h global.h help.c help.h hotlist.c \
@ -56,7 +56,7 @@ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h \
option.c option.h panel.h panelize.c panelize.h poptalloca.h \
popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c \
profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h \
profile.c profile.h rxvt.c screen.c setup.c setup.h \
slint.c subshell.c subshell.h textconf.c textconf.h \
tree.c tree.h treestore.c treestore.h timefmt.h tty.c tty.h user.c \
user.h util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \

11
src/cmd.c
View File

@ -63,6 +63,7 @@
#include "execute.h" /* toggle_panels() */
#include "history.h"
#include "strutil.h"
#include "../src/search/search.h"
#ifndef MAP_FILE
@ -521,13 +522,9 @@ select_unselect_cmd (const char *title, const char *history_name, int cmd)
if (dirflag)
continue;
}
c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
match_file);
if (c == -1) {
message (D_ERROR, MSG_ERROR, _(" Malformed regular expression "));
g_free (reg_exp);
return;
}
if (!mc_search(reg_exp_t, current_panel->dir.list[i].fname, MC_SEARCH_T_GLOB))
return;
if (c) {
do_file_mark (current_panel, i, cmd);
}

5
src/dir.c
View File

@ -30,6 +30,7 @@
#include "wtools.h"
#include "treestore.h"
#include "strutil.h"
#include "../src/search/search.h"
/* If true show files starting with a dot */
int show_dot_files = 1;
@ -312,8 +313,8 @@ handle_dirent (dir_list *list, const char *filter, struct dirent *dp,
*stale_link = 1;
}
if (!(S_ISDIR (buf1->st_mode) || *link_to_dir) && filter
&& !regexp_match (filter, dp->d_name, match_file))
return 0;
&& !mc_search(filter, dp->d_name, MC_SEARCH_T_GLOB) )
return 0;
/* Need to grow the *list? */
if (next_free == list->size) {

570
src/eregex.h
View File

@ -1,570 +0,0 @@
/* Definitions for data structures and routines for the regular
expression library, version 0.12.
Copyright (C) 1985,1989-1993,1995-1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
#ifndef USE_INCLUDED_REGEX
#include <regex.h>
#else
#ifndef _REGEX_H
#define _REGEX_H 1
/* Allow the use in C++ code. */
#ifdef __cplusplus
extern "C" {
#endif
/* POSIX says that <sys/types.h> must be included (by the caller) before
<regex.h>. */
#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
should be there. */
# include <stddef.h>
#endif
/* The following two types have to be signed and unsigned integer type
wide enough to hold a value of a pointer. For most ANSI compilers
ptrdiff_t and size_t should be likely OK. Still size of these two
types is 2 for Microsoft C. Ugh... */
typedef long int s_reg_t;
typedef unsigned long int active_reg_t;
/* The following bits are used to determine the regexp syntax we
recognize. The set/not-set meanings are chosen so that Emacs syntax
remains the value 0. The bits are given in alphabetical order, and
the definitions shifted by one from the previous bit; thus, when we
add or remove a bit, only one other definition need change. */
typedef unsigned long int reg_syntax_t;
/* If this bit is not set, then \ inside a bracket expression is literal.
If set, then such a \ quotes the following character. */
#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
/* If this bit is not set, then + and ? are operators, and \+ and \? are
literals.
If set, then \+ and \? are operators and + and ? are literals. */
#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
/* If this bit is set, then character classes are supported. They are:
[:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:],
[:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
If not set, then character classes are not supported. */
#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
/* If this bit is set, then ^ and $ are always anchors (outside bracket
expressions, of course).
If this bit is not set, then it depends:
^ is an anchor if it is at the beginning of a regular
expression or after an open-group or an alternation operator;
$ is an anchor if it is at the end of a regular expression, or
before a close-group or an alternation operator.
This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
POSIX draft 11.2 says that * etc. in leading positions is undefined.
We already implemented a previous draft which made those constructs
invalid, though, so we haven't changed the code back. */
#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
/* If this bit is set, then special characters are always special
regardless of where they are in the pattern.
If this bit is not set, then special characters are special only in
some contexts; otherwise they are ordinary. Specifically,
* + ? and intervals are only special when not after the beginning,
open-group, or alternation operator. */
#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
/* If this bit is set, then *, +, ?, and { cannot be first in an re or
immediately after an alternation or begin-group operator. */
#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
/* If this bit is set, then . matches newline.
If not set, then it doesn't. */
#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
/* If this bit is set, then . doesn't match NUL.
If not set, then it does. */
#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
/* If this bit is set, nonmatching lists [^...] do not match newline.
If not set, they do. */
#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
/* If this bit is set, either \{...\} or {...} defines an
interval, depending on RE_NO_BK_BRACES.
If not set, \{, \}, {, and } are literals. */
#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
/* If this bit is set, +, ? and | aren't recognized as operators.
If not set, they are. */
#define RE_LIMITED_OPS (RE_INTERVALS << 1)
/* If this bit is set, newline is an alternation operator.
If not set, newline is literal. */
#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
/* If this bit is set, then `{...}' defines an interval, and \{ and \}
are literals.
If not set, then `\{...\}' defines an interval. */
#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
/* If this bit is set, (...) defines a group, and \( and \) are literals.
If not set, \(...\) defines a group, and ( and ) are literals. */
#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
/* If this bit is set, then \<digit> matches <digit>.
If not set, then \<digit> is a back-reference. */
#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
/* If this bit is set, then | is an alternation operator, and \| is literal.
If not set, then \| is an alternation operator, and | is literal. */
#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
/* If this bit is set, then an ending range point collating higher
than the starting range point, as in [z-a], is invalid.
If not set, then when ending range point collates higher than the
starting range point, the range is ignored. */
#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
/* If this bit is set, then an unmatched ) is ordinary.
If not set, then an unmatched ) is invalid. */
#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
/* If this bit is set, succeed as soon as we match the whole pattern,
without further backtracking. */
#define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
/* If this bit is set, do not process the GNU regex operators.
If not set, then the GNU regex operators are recognized. */
#define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
/* If this bit is set, turn on internal regex debugging.
If not set, and debugging was on, turn it off.
This only works if regex.c is compiled -DDEBUG.
We define this bit always, so that all that's needed to turn on
debugging is to recompile regex.c; the calling code can always have
this bit set, and it won't affect anything in the normal case. */
#define RE_DEBUG (RE_NO_GNU_OPS << 1)
/* If this bit is set, a syntactically invalid interval is treated as
a string of ordinary characters. For example, the ERE 'a{1' is
treated as 'a\{1'. */
#define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
/* This global variable defines the particular regexp syntax to use (for
some interfaces). When a regexp is compiled, the syntax used is
stored in the pattern buffer, so changing this does not affect
already-compiled regexps. */
extern reg_syntax_t re_syntax_options;
/* Define combinations of the above bits for the standard possibilities.
(The [[[ comments delimit what gets put into the Texinfo file, so
don't delete them!) */
/* [[[begin syntaxes]]] */
#define RE_SYNTAX_EMACS 0
#define RE_SYNTAX_AWK \
(RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
| RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \
| RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \
| RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
#define RE_SYNTAX_GNU_AWK \
((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \
& ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
#define RE_SYNTAX_POSIX_AWK \
(RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
| RE_INTERVALS | RE_NO_GNU_OPS)
#define RE_SYNTAX_GREP \
(RE_BK_PLUS_QM | RE_CHAR_CLASSES \
| RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \
| RE_NEWLINE_ALT)
#define RE_SYNTAX_EGREP \
(RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \
| RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \
| RE_NEWLINE_ALT | RE_NO_BK_PARENS \
| RE_NO_BK_VBAR)
#define RE_SYNTAX_POSIX_EGREP \
(RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES \
| RE_INVALID_INTERVAL_ORD)
/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */
#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
/* Syntax bits common to both basic and extended POSIX regex syntax. */
#define _RE_SYNTAX_POSIX_COMMON \
(RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \
| RE_INTERVALS | RE_NO_EMPTY_RANGES)
#define RE_SYNTAX_POSIX_BASIC \
(_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this
isn't minimal, since other operators, such as \`, aren't disabled. */
#define RE_SYNTAX_POSIX_MINIMAL_BASIC \
(_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
#define RE_SYNTAX_POSIX_EXTENDED \
(_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
| RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \
| RE_NO_BK_PARENS | RE_NO_BK_VBAR \
| RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
removed and RE_NO_BK_REFS is added. */
#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \
(_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
| RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
| RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD)
/* [[[end syntaxes]]] */
/* Maximum number of duplicates an interval can allow. Some systems
(erroneously) define this in other header files, but we want our
value, so remove any previous define. */
#ifdef RE_DUP_MAX
# undef RE_DUP_MAX
#endif
/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */
#define RE_DUP_MAX (0x7fff)
/* POSIX `cflags' bits (i.e., information for `regcomp'). */
/* If this bit is set, then use extended regular expression syntax.
If not set, then use basic regular expression syntax. */
#define REG_EXTENDED 1
/* If this bit is set, then ignore case when matching.
If not set, then case is significant. */
#define REG_ICASE (REG_EXTENDED << 1)
/* If this bit is set, then anchors do not match at newline
characters in the string.
If not set, then anchors do match at newlines. */
#define REG_NEWLINE (REG_ICASE << 1)
/* If this bit is set, then report only success or fail in regexec.
If not set, then returns differ between not matching and errors. */
#define REG_NOSUB (REG_NEWLINE << 1)
/* POSIX `eflags' bits (i.e., information for regexec). */
/* If this bit is set, then the beginning-of-line operator doesn't match
the beginning of the string (presumably because it's not the
beginning of a line).
If not set, then the beginning-of-line operator does match the
beginning of the string. */
#define REG_NOTBOL 1
/* Like REG_NOTBOL, except for the end-of-line. */
#define REG_NOTEOL (1 << 1)
/* If any error codes are removed, changed, or added, update the
`re_error_msg' table in regex.c. */
typedef enum
{
#ifdef _XOPEN_SOURCE
REG_ENOSYS = -1, /* This will never happen for this implementation. */
#endif
REG_NOERROR = 0, /* Success. */
REG_NOMATCH, /* Didn't find a match (for regexec). */
/* POSIX regcomp return error codes. (In the order listed in the
standard.) */
REG_BADPAT, /* Invalid pattern. */
REG_ECOLLATE, /* Not implemented. */
REG_ECTYPE, /* Invalid character class name. */
REG_EESCAPE, /* Trailing backslash. */
REG_ESUBREG, /* Invalid back reference. */
REG_EBRACK, /* Unmatched left bracket. */
REG_EPAREN, /* Parenthesis imbalance. */
REG_EBRACE, /* Unmatched \{. */
REG_BADBR, /* Invalid contents of \{\}. */
REG_ERANGE, /* Invalid range end. */
REG_ESPACE, /* Ran out of memory. */
REG_BADRPT, /* No preceding re for repetition op. */
/* Error codes we've added. */
REG_EEND, /* Premature end. */
REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */
REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */
} reg_errcode_t;
/* This data structure represents a compiled pattern. Before calling
the pattern compiler, the fields `buffer', `allocated', `fastmap',
`translate', and `no_sub' can be set. After the pattern has been
compiled, the `re_nsub' field is available. All other fields are
private to the regex routines. */
#ifndef RE_TRANSLATE_TYPE
# define RE_TRANSLATE_TYPE char *
#endif
struct re_pattern_buffer
{
/* [[[begin pattern_buffer]]] */
/* Space that holds the compiled pattern. It is declared as
`unsigned char *' because its elements are
sometimes used as array indexes. */
unsigned char *buffer;
/* Number of bytes to which `buffer' points. */
unsigned long int allocated;
/* Number of bytes actually used in `buffer'. */
unsigned long int used;
/* Syntax setting with which the pattern was compiled. */
reg_syntax_t syntax;
/* Pointer to a fastmap, if any, otherwise zero. re_search uses
the fastmap, if there is one, to skip over impossible
starting points for matches. */
char *fastmap;
/* Either a translate table to apply to all characters before
comparing them, or zero for no translation. The translation
is applied to a pattern when it is compiled and to a string
when it is matched. */
RE_TRANSLATE_TYPE translate;
/* Number of subexpressions found by the compiler. */
size_t re_nsub;
/* Zero if this pattern cannot match the empty string, one else.
Well, in truth it's used only in `re_search_2', to see
whether or not we should use the fastmap, so we don't set
this absolutely perfectly; see `re_compile_fastmap' (the
`duplicate' case). */
unsigned can_be_null : 1;
/* If REGS_UNALLOCATED, allocate space in the `regs' structure
for `max (RE_NREGS, re_nsub + 1)' groups.
If REGS_REALLOCATE, reallocate space if necessary.
If REGS_FIXED, use what's there. */
#define REGS_UNALLOCATED 0
#define REGS_REALLOCATE 1
#define REGS_FIXED 2
unsigned regs_allocated : 2;
/* Set to zero when `regex_compile' compiles a pattern; set to one
by `re_compile_fastmap' if it updates the fastmap. */
unsigned fastmap_accurate : 1;
/* If set, `re_match_2' does not return information about
subexpressions. */
unsigned no_sub : 1;
/* If set, a beginning-of-line anchor doesn't match at the
beginning of the string. */
unsigned not_bol : 1;
/* Similarly for an end-of-line anchor. */
unsigned not_eol : 1;
/* If true, an anchor at a newline matches. */
unsigned newline_anchor : 1;
/* [[[end pattern_buffer]]] */
};
typedef struct re_pattern_buffer regex_t;
/* Type for byte offsets within the string. POSIX mandates this. */
typedef int regoff_t;
/* This is the structure we store register match data in. See
regex.texinfo for a full description of what registers match. */
struct re_registers
{
unsigned num_regs;
regoff_t *start;
regoff_t *end;
};
/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
`re_match_2' returns information about at least this many registers
the first time a `regs' structure is passed. */
#ifndef RE_NREGS
# define RE_NREGS 30
#endif
/* POSIX specification for registers. Aside from the different names than
`re_registers', POSIX uses an array of structures, instead of a
structure of arrays. */
typedef struct
{
regoff_t rm_so; /* Byte offset from string's start to substring's start. */
regoff_t rm_eo; /* Byte offset from string's start to substring's end. */
} regmatch_t;
/* Declarations for routines. */
/* To avoid duplicating every routine declaration -- once with a
prototype (if we are ANSI), and once without (if we aren't) -- we
use the following macro to declare argument types. This
unfortunately clutters up the declarations a bit, but I think it's
worth it. */
#if __STDC__
# define _RE_ARGS(args) args
#else /* not __STDC__ */
# define _RE_ARGS(args) ()
#endif /* not __STDC__ */
/* Sets the current default syntax to SYNTAX, and return the old syntax.
You can also simply assign to the `re_syntax_options' variable. */
extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
/* Compile the regular expression PATTERN, with length LENGTH
and syntax given by the global `re_syntax_options', into the buffer
BUFFER. Return NULL if successful, and an error string if not. */
extern const char *re_compile_pattern
_RE_ARGS ((const char *pattern, size_t length,
struct re_pattern_buffer *buffer));
/* Compile a fastmap for the compiled pattern in BUFFER; used to
accelerate searches. Return 0 if successful and -2 if was an
internal error. */
extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
/* Search in the string STRING (with length LENGTH) for the pattern
compiled into BUFFER. Start searching at position START, for RANGE
characters. Return the starting position of the match, -1 for no
match, or -2 for an internal error. Also return register
information in REGS (if REGS and BUFFER->no_sub are nonzero). */
extern int re_search
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
int length, int start, int range, struct re_registers *regs));
/* Like `re_search', but search in the concatenation of STRING1 and
STRING2. Also, stop searching at index START + STOP. */
extern int re_search_2
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
int length1, const char *string2, int length2,
int start, int range, struct re_registers *regs, int stop));
/* Like `re_search', but return how many characters in STRING the regexp
in BUFFER matched, starting at position START. */
extern int re_match
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
int length, int start, struct re_registers *regs));
/* Relates to `re_match' as `re_search_2' relates to `re_search'. */
extern int re_match_2
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
int length1, const char *string2, int length2,
int start, struct re_registers *regs, int stop));
/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
ENDS. Subsequent matches using BUFFER and REGS will use this memory
for recording register information. STARTS and ENDS must be
allocated with malloc, and must each be at least `NUM_REGS * sizeof
(regoff_t)' bytes long.
If NUM_REGS == 0, then subsequent matches should allocate their own
register data.
Unless this function is called, the first search or match using
PATTERN_BUFFER will allocate its own register data, without
freeing the old data. */
extern void re_set_registers
_RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
unsigned num_regs, regoff_t *starts, regoff_t *ends));
#if defined _REGEX_RE_COMP || defined _LIBC
# ifndef _CRAY
/* 4.2 bsd compatibility. */
extern char *re_comp _RE_ARGS ((const char *));
extern int re_exec _RE_ARGS ((const char *));
# endif
#endif
/* GCC 2.95 and later have "__restrict"; C99 compilers have
"restrict", and "configure" may have defined "restrict". */
#ifndef __restrict
# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
# if defined restrict || 199901L <= __STDC_VERSION__
# define __restrict restrict
# else
# define __restrict
# endif
# endif
#endif
/* For now unconditionally define __restrict_arr to expand to nothing.
Ideally we would have a test for the compiler which allows defining
it to restrict. */
#undef __restrict_arr
#define __restrict_arr
/* POSIX compatibility. */
extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
const char *__restrict __pattern,
int __cflags));
extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
const char *__restrict __string, size_t __nmatch,
regmatch_t __pmatch[__restrict_arr],
int __eflags));
extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
char *__errbuf, size_t __errbuf_size));
extern void regfree _RE_ARGS ((regex_t *__preg));
#ifdef __cplusplus
}
#endif /* C++ */
#endif /* regex.h */
/*
Local variables:
make-backup-files: t
version-control: t
trim-versions-without-asking: nil
End:
*/
#endif

7
src/ext.c
View File

@ -38,6 +38,7 @@
#include "history.h"
#include "cons.saver.h"
#include "layout.h"
#include "../src/search/search.h"
/* If set, we execute the file command to check the file type */
int use_file_to_check_type = 1;
@ -397,7 +398,7 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
}
if (content_string[0]
&& regexp_match (ptr, content_string + content_shift, match_regex)) {
&& mc_search (ptr, content_string + content_shift, MC_SEARCH_T_REGEX)) {
found = 1;
}
@ -521,11 +522,11 @@ regex_command (const char *filename, const char *action, int *move_dir)
/* Do not transform shell patterns, you can use shell/ for
* that
*/
if (regexp_match (p, filename, match_regex))
if (mc_search (p, filename, MC_SEARCH_T_REGEX))
found = 1;
} else if (!strncmp (p, "directory/", 10)) {
if (S_ISDIR (mystat.st_mode)
&& regexp_match (p + 10, filename, match_regex))
&& mc_search (p + 10, filename, MC_SEARCH_T_REGEX))
found = 1;
} else if (!strncmp (p, "shell/", 6)) {
p += 6;

19
src/file.c
View File

@ -52,7 +52,6 @@
#include "global.h"
#include "tty.h"
#include "eregex.h"
#include "setup.h"
#include "color.h"
#include "win.h"
@ -65,6 +64,7 @@
#include "background.h" /* we_are_background */
/* #include "util.h" */
#include "strutil.h"
#include "../src/search/search.h"
/* Needed for current_panel, other_panel and WTree */
#include "dir.h"
@ -172,7 +172,7 @@ static FileProgressStatus transform_error = FILE_CONT;
static const char *
do_transform_source (FileOpContext *ctx, const char *source)
{
size_t j, len;
size_t j=0, len;
const char *fnsource = x_basename (source);
char *fnsource_fixed = g_strdup (fnsource);
int next_reg;
@ -187,13 +187,14 @@ do_transform_source (FileOpContext *ctx, const char *source)
str_fix_string (fnsource_fixed);
len = strlen (fnsource_fixed);
j = re_match (&ctx->rx, fnsource_fixed, len, 0, &ctx->regs);
if (j != len) {
if ( !( mc_search_run(ctx->search_handle, fnsource_fixed, 0, len, &j) && j == len) ){
transform_error = FILE_SKIP;
return NULL;
}
g_free (fnsource_fixed);
actual = fntarget;
remain = sizeof (fntarget);
dm = ctx->dest_mask;
@ -233,14 +234,14 @@ do_transform_source (FileOpContext *ctx, const char *source)
}
case '*':
if (next_reg < 0 || next_reg >= RE_NREGS
|| ctx->regs.start[next_reg] < 0) {
if (next_reg < 0 || next_reg >= MC_SEARCH__NUM_REPL_ARGS
|| mc_search_getstart_rezult_by_num(ctx->search_handle, next_reg) < 0) {
message (D_ERROR, MSG_ERROR, _(" Invalid target mask "));
transform_error = FILE_ABORT;
return NULL;
}
for (fn = fnsource + ctx->regs.start[next_reg];
fn < fnsource + ctx->regs.end[next_reg] && remain > 1; ) {
for (fn = fnsource + mc_search_getstart_rezult_by_num(ctx->search_handle, next_reg);
fn < fnsource + mc_search_getend_rezult_by_num(ctx->search_handle, next_reg) && remain > 1; ) {
if (str_is_valid_char (fn, -1) == 1) {
convert_case (fn, &case_conv, &actual, &remain);

35
src/filegui.c
View File

@ -66,6 +66,7 @@
#include "key.h" /* get_event */
#include "util.h" /* strip_password() */
#include "strutil.h"
#include "../src/search/search.h"
/* }}} */
@ -859,7 +860,6 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation, const char *text,
{
int source_easy_patterns = easy_patterns;
char *source_mask, *orig_mask, *dest_dir, *tmpdest;
const char *error;
char *def_text_secure;
struct stat buf;
int val;
@ -930,27 +930,28 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation, const char *text,
g_free (source_mask);
return dest_dir;
}
if (source_easy_patterns) {
source_easy_patterns = easy_patterns;
easy_patterns = 1;
source_mask = convert_pattern (source_mask, match_file, 1);
easy_patterns = source_easy_patterns;
error =
re_compile_pattern (source_mask, strlen (source_mask),
&ctx->rx);
g_free (source_mask);
} else
error =
re_compile_pattern (source_mask, strlen (source_mask),
&ctx->rx);
if (error) {
message (D_ERROR, MSG_ERROR, _("Invalid source pattern `%s' \n %s "),
orig_mask, error);
if (source_easy_patterns){
source_mask = g_strdup_printf("(%s)",orig_mask);
ctx->search_handle = mc_search_new(source_mask,-1);
g_free(source_mask);
}
else
ctx->search_handle = mc_search_new(source_mask,-1);
if (ctx->search_handle == NULL) {
message (D_ERROR, MSG_ERROR, _("Invalid source pattern `%s'"),
orig_mask);
g_free (orig_mask);
goto ask_file_mask;
}
g_free (orig_mask);
ctx->search_handle->is_case_sentitive = TRUE;
if (source_easy_patterns)
ctx->search_handle->search_type = MC_SEARCH_T_GLOB;
else
ctx->search_handle->search_type = MC_SEARCH_T_REGEX;
tmpdest = dest_dir;
dest_dir = tilde_expand(tmpdest);

3
src/fileopctx.c
View File

@ -27,6 +27,7 @@
#include "global.h"
#include "fileopctx.h"
#include "../src/search/search.h"
/**
@ -73,7 +74,7 @@ file_op_context_destroy (FileOpContext *ctx)
if (ctx->ui)
file_op_context_destroy_ui (ctx);
regfree (&ctx->rx);
mc_search_free(ctx->search_handle);
/* FIXME: do we need to free ctx->dest_mask? */

7
src/fileopctx.h
View File

@ -11,8 +11,8 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "eregex.h"
struct mc_search_struct;
typedef enum {
OP_COPY,
OP_MOVE,
@ -85,10 +85,7 @@ typedef struct FileOpContext {
/* The mask of files to actually operate on */
char *dest_mask;
/* Regex for the file mask */
struct re_pattern_buffer rx;
struct re_registers regs;
struct mc_search_struct *search_handle;
/* Whether to dive into subdirectories for recursive operations */
int dive_into_subdirs;

6
src/global.h
View File

@ -105,12 +105,6 @@ struct timeval {
#include <glib.h>
#include "glibcompat.h"
#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
#include <rx.h>
#else
#include "eregex.h"
#endif
#ifndef __GNUC__
# define __attribute__(x)
#endif

8375
src/regex.c
View File

File diff suppressed because it is too large Load Diff

3
src/search/glob.c
View File

@ -70,8 +70,6 @@ mc_search__glob_translate_to_regex (gchar * str, gsize * len)
case '\\':
case '+':
case '.':
case '(':
case ')':
case '|':
case '$':
case '^':
@ -118,5 +116,4 @@ GString *
mc_search_glob_prepare_replace_str (mc_search_t * mc_search, GString * replace_str)
{
return mc_search_regex_prepare_replace_str (mc_search, replace_str);
}

8
src/search/internal.h
View File

@ -80,4 +80,12 @@ gboolean mc_search__run_glob (mc_search_t *, const void *, gsize, gsize, gsize *
GString *mc_search_glob_prepare_replace_str (mc_search_t *, GString *);
/* search/hex.c : */
void mc_search__cond_struct_new_init_hex (const char *, mc_search_t *, mc_search_cond_t *);
gboolean mc_search__run_hex (mc_search_t *, const void *, gsize, gsize, gsize *);
GString *mc_search_hex_prepare_replace_str (mc_search_t *, GString *);
#endif

64
src/search/search.c
View File

@ -349,3 +349,67 @@ mc_search_is_fixed_search_str (mc_search_t * mc_search)
}
/* --------------------------------------------------------------------------------------------- */
gboolean
mc_search (const gchar *pattern, const gchar *str, mc_search_type_t type)
{
gboolean ret;
mc_search_t *search = mc_search_new(pattern, -1);
if (search == NULL)
return FALSE;
search->search_type = type;
search->is_case_sentitive = TRUE;
ret = mc_search_run(search,str,0,strlen(str),NULL);
mc_search_free(search);
return ret;
}
/* --------------------------------------------------------------------------------------------- */
int
mc_search_getstart_rezult_by_num(mc_search_t *mc_search, int index)
{
if (!mc_search)
return 0;
if (mc_search->search_type == MC_SEARCH_T_NORMAL)
return 0;
#if GLIB_CHECK_VERSION (2, 14, 0)
guint start_pos;
guint end_pos;
g_match_info_fetch_pos (mc_search->regex_match_info, index, &start_pos, &end_pos);
return (int) start_pos;
#else /* GLIB_CHECK_VERSION (2, 14, 0) */
#if HAVE_LIBPCRE
return mc_search->iovector[index*2];
#else /* HAVE_LIBPCRE */
return mc_search->regex_match_info[index].rm_so;
#endif /* HAVE_LIBPCRE */
#endif /* GLIB_CHECK_VERSION (2, 14, 0) */
}
/* --------------------------------------------------------------------------------------------- */
int
mc_search_getend_rezult_by_num(mc_search_t *mc_search, int index)
{
if (!mc_search)
return 0;
if (mc_search->search_type == MC_SEARCH_T_NORMAL)
return 0;
#if GLIB_CHECK_VERSION (2, 14, 0)
guint start_pos;
guint end_pos;
g_match_info_fetch_pos (mc_search->regex_match_info, index, &start_pos, &end_pos);
return (int) end_pos;
#else /* GLIB_CHECK_VERSION (2, 14, 0) */
#if HAVE_LIBPCRE
return mc_search->iovector[index*2+1];
#else /* HAVE_LIBPCRE */
return mc_search->regex_match_info[index].rm_eo;
#endif /* HAVE_LIBPCRE */
#endif /* GLIB_CHECK_VERSION (2, 14, 0) */
}
/* --------------------------------------------------------------------------------------------- */

5
src/search/search.h
View File

@ -132,4 +132,9 @@ gboolean mc_search_is_fixed_search_str (mc_search_t *);
gchar **mc_search_get_types_strings_array (void);
gboolean mc_search (const gchar *, const gchar *, mc_search_type_t);
int mc_search_getstart_rezult_by_num(mc_search_t *, int);
int mc_search_getend_rezult_by_num(mc_search_t *, int);
#endif

7
src/user.c
View File

@ -35,6 +35,7 @@
#include "setup.h"
#include "history.h"
#include "strutil.h"
#include "../src/search/search.h"
#include "../edit/edit.h" /* BLOCK_FILE */
#include "../edit/edit-widget.h" /* WEdit */
@ -421,18 +422,18 @@ static char *test_condition (WEdit *edit_widget, char *p, int *condition)
break;
case 'f': /* file name pattern */
p = extract_arg (p, arg, sizeof (arg));
*condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file);
*condition = panel && mc_search (arg, panel->dir.list [panel->selected].fname, MC_SEARCH_T_GLOB);
break;
case 'y': /* syntax pattern */
if (edit_widget && edit_widget->syntax_type) {
p = extract_arg (p, arg, sizeof (arg));
*condition = panel &&
regexp_match (arg, edit_widget->syntax_type, match_normal);
mc_search (arg, edit_widget->syntax_type, MC_SEARCH_T_NORMAL);
}
break;
case 'd':
p = extract_arg (p, arg, sizeof (arg));
*condition = panel && regexp_match (arg, panel->cwd, match_file);
*condition = panel && mc_search (arg, panel->cwd, MC_SEARCH_T_GLOB);
break;
case 't':
p = extract_arg (p, arg, sizeof (arg));

104
src/util.c
View File

@ -42,6 +42,7 @@
#include "win.h" /* xterm_flag */
#include "timefmt.h"
#include "strutil.h"
#include "../src/search/search.h"
#ifdef HAVE_CHARSET
#include "charsets.h"
@ -485,109 +486,6 @@ strip_home_and_password(const char *dir)
return newdir;
}
static char *
maybe_start_group (char *d, int do_group, int *was_wildcard)
{
if (!do_group)
return d;
if (*was_wildcard)
return d;
*was_wildcard = 1;
*d++ = '\\';
*d++ = '(';
return d;
}
static char *
maybe_end_group (char *d, int do_group, int *was_wildcard)
{
if (!do_group)
return d;
if (!*was_wildcard)
return d;
*was_wildcard = 0;
*d++ = '\\';
*d++ = ')';
return d;
}
/* If shell patterns are on converts a shell pattern to a regular
expression. Called by regexp_match and mask_rename. */
/* Shouldn't we support [a-fw] type wildcards as well ?? */
char *
convert_pattern (const char *pattern, int match_type, int do_group)
{
char *d;
char *new_pattern;
int was_wildcard = 0;
const char *s;
if ((match_type != match_regex) && easy_patterns){
new_pattern = g_malloc (MC_MAXPATHLEN);
d = new_pattern;
if (match_type == match_file)
*d++ = '^';
for (s = pattern; *s; s++, d++){
switch (*s){
case '*':
d = maybe_start_group (d, do_group, &was_wildcard);
*d++ = '.';
*d = '*';
break;
case '?':
d = maybe_start_group (d, do_group, &was_wildcard);
*d = '.';
break;
case '.':
d = maybe_end_group (d, do_group, &was_wildcard);
*d++ = '\\';
*d = '.';
break;
default:
d = maybe_end_group (d, do_group, &was_wildcard);
*d = *s;
break;
}
}
d = maybe_end_group (d, do_group, &was_wildcard);
if (match_type == match_file)
*d++ = '$';
*d = 0;
return new_pattern;
} else
return g_strdup (pattern);
}
int
regexp_match (const char *pattern, const char *string, int match_type)
{
static regex_t r;
static char *old_pattern = NULL;
static int old_type;
int rval;
char *my_pattern;
if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type != match_type){
if (old_pattern){
regfree (&r);
g_free (old_pattern);
old_pattern = NULL;
}
my_pattern = convert_pattern (pattern, match_type, 0);
if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS)) {
g_free (my_pattern);
return -1;
}
old_pattern = my_pattern;
old_type = match_type;
}
rval = !regexec (&r, string, 0, NULL, 0);
return rval;
}
const char *
extension (const char *filename)
{

2
src/util.h
View File

@ -127,8 +127,6 @@ enum {
};
extern int easy_patterns;
char *convert_pattern (const char *pattern, int match_type, int do_group);
int regexp_match (const char *pattern, const char *string, int match_type);
/* Error pipes */
void open_error_pipe (void);