[apparmor] [PATCH] remove pcre support
John Johansen
john.johansen at canonical.com
Sat Jul 31 23:46:36 BST 2010
On 07/31/2010 10:36 AM, Steve Beattie wrote:
> On Fri, Jul 30, 2010 at 09:56:43PM -0700, John Johansen wrote:
>> This patch drops the PCRE regex engine and all support for it. The only code
>> referencing pcre is now in the aare to pcre conversion routine which will
>> disappear soon.
>
>> === modified file 'parser/parser_regex.c'
>> --- parser/parser_regex.c 2010-07-23 11:29:35 +0000
>> +++ parser/parser_regex.c 2010-07-31 04:46:51 +0000
>> @@ -777,7 +683,7 @@
>>
>> test_string = strdup("///foo//////f//oo////////////////");
>> filter_slashes(test_string);
>> - MY_TEST(strcmp(test_string, "/foo/f/oo") == 0, "simple tests");
>> + MY_TEST(strcmp(test_string, "/foo/f/oo/") == 0, "simple tests");
>>
>> test_string = strdup("/foo/f/oo");
>> filter_slashes(test_string);
>> @@ -809,13 +715,11 @@
>>
>> test_string = strdup("/a/");
>> filter_slashes(test_string);
>> - MY_TEST(strcmp(test_string, "/a") == 0, "simple test for /a/");
>> + MY_TEST(strcmp(test_string, "/a/") == 0, "simple test for /a/");
>>
>> return rc;
>> }
>
> ACK from me, though the above two changes seem to be unrelated.
>
actually they are, filter_slashes used to be doing the tests
with PCRE defined as the regex type, which caused it to remove
all trailing slashes as PCRE was before we started differentiating
between files and directories.
This brings the tests up to date, I actually was splitting
these out into a separate patch but it was too much of a pain to
undo as I forgot to add the file to quilt, so I just ended up
dumping the bzr diff. /me is really missing guilt
More information about the AppArmor
mailing list