8da5cfd6ba
- unused variables removed
- unused functions removed
- uninitialized variables checked
- missing return statements added
- missing function return types added
- added parentheses around assignment and
&& in || when suggested by gcc
* src/mh.c
* src/folder.c
replaced direct calls to folder->scan_tree
with folder_scan_tree and restore folder
prefs in this function. The folder should
not have to deal with them.
( Should now work for all folder types )
81 lines
2 KiB
C
81 lines
2 KiB
C
/*
|
|
* Sylpheed -- regexp pattern matching utilities
|
|
* Copyright (C) 2001 Thomas Link, Hiroyuki Yamamoto
|
|
* Modified by Melvin Hadasht.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include "intl.h"
|
|
#include "string_match.h"
|
|
|
|
int string_match_precompile (gchar *rexp, regex_t *preg, int cflags)
|
|
{
|
|
int problem = 0;
|
|
|
|
g_return_val_if_fail(rexp, -1);
|
|
g_return_val_if_fail(*rexp, -1);
|
|
|
|
problem = regcomp(preg, rexp, cflags);
|
|
|
|
return problem;
|
|
}
|
|
|
|
|
|
gchar *string_remove_match(gchar *buf, gint buflen, gchar * txt, regex_t *preg)
|
|
{
|
|
regmatch_t match;
|
|
int notfound;
|
|
gint i, j ,k;
|
|
|
|
if (!preg)
|
|
return txt;
|
|
if (*txt != 0x00) {
|
|
i = 0;
|
|
j = 0;
|
|
do {
|
|
notfound = regexec(preg, txt+j, 1, &match, (j ? REG_NOTBOL : 0));
|
|
if (notfound) {
|
|
while (txt[j] && i < buflen -1)
|
|
buf[i++] = txt[j++];
|
|
} else {
|
|
if ( match.rm_so == match.rm_eo)
|
|
buf[i++] = txt[j++];
|
|
else {
|
|
k = j;
|
|
while (txt[j] && j != k + match.rm_so)
|
|
buf[i++] = txt[j++];
|
|
if (txt[j])
|
|
j = k + match.rm_eo;
|
|
}
|
|
}
|
|
} while (txt[j] && i < buflen - 1);
|
|
buf[i] = 0x00;
|
|
if (buf[0] == 0x00) {
|
|
strncpy(buf, _("(Subject cleared by RegExp)"),
|
|
buflen - 1);
|
|
buf[buflen - 1] = 0x00;
|
|
}
|
|
return buf;
|
|
}
|
|
return txt;
|
|
}
|
|
|