debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace leading * or ? in adblock lines with .* or \? respectively

Browse source
This commit is contained in:
Christian Dywan 2009-07-16 14:36:35 +02:00
parent c269bfc466
commit cac8646b7e
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extensions/adblock.c
View file

@ -266,6 +266,8 @@ adblock_session_add_filter (SoupSession* session,
while (fgets (line, 255, file)) while (fgets (line, 255, file))
{ {
gchar* temp;
error = NULL; error = NULL;
/* Ignore comments and new lines */ /* Ignore comments and new lines */
if (line[0] == '!') if (line[0] == '!')
@ -281,18 +283,26 @@ adblock_session_add_filter (SoupSession* session,
if (line[0] == '[') if (line[0] == '[')
continue; continue;
g_strchomp (line); g_strchomp (line);
/* TODO: Replace '*' with '.*', '?' with '\?' */ /* TODO: Replace trailing '*' with '.*' */
regex = g_regex_new (line, G_REGEX_OPTIMIZE, if (line[0] == '*')
temp = g_strconcat (".", line, NULL);
else if (line[0] == '?')
temp = g_strconcat ("\\", line, NULL);
else
temp = g_strdup (line);
regex = g_regex_new (temp, G_REGEX_OPTIMIZE,
G_REGEX_MATCH_NOTEMPTY, &error); G_REGEX_MATCH_NOTEMPTY, &error);
if (error) if (error)
{ {
g_warning ("%s: %s", G_STRFUNC, error->message); g_warning ("%s: %s", G_STRFUNC, error->message);
g_error_free (error); g_error_free (error);
g_free (temp);
} }
else else
{ {
havepattern = TRUE; havepattern = TRUE;
g_hash_table_insert (pattern, g_strdup (line), regex); g_hash_table_insert (pattern, temp, regex);
} }
} }
fclose (file); fclose (file);