mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 13:11:28 +00:00
Nmap 3.999 truly just about ready now
This commit is contained in:
@@ -1354,7 +1354,7 @@ for (;;)
|
||||
{
|
||||
int chartype, rqdtype;
|
||||
int othercase;
|
||||
int category = ucp_findchar(c, &chartype, &othercase);
|
||||
int category = _pcre_ucp_findchar(c, &chartype, &othercase);
|
||||
|
||||
rqdtype = *(++ecode);
|
||||
ecode++;
|
||||
@@ -1381,7 +1381,7 @@ for (;;)
|
||||
{
|
||||
int chartype;
|
||||
int othercase;
|
||||
int category = ucp_findchar(c, &chartype, &othercase);
|
||||
int category = _pcre_ucp_findchar(c, &chartype, &othercase);
|
||||
if (category == ucp_M) RRETURN(MATCH_NOMATCH);
|
||||
while (eptr < md->end_subject)
|
||||
{
|
||||
@@ -1390,7 +1390,7 @@ for (;;)
|
||||
{
|
||||
GETCHARLEN(c, eptr, len);
|
||||
}
|
||||
category = ucp_findchar(c, &chartype, &othercase);
|
||||
category = _pcre_ucp_findchar(c, &chartype, &othercase);
|
||||
if (category != ucp_M) break;
|
||||
eptr += len;
|
||||
}
|
||||
@@ -1841,7 +1841,7 @@ for (;;)
|
||||
ecode += length;
|
||||
|
||||
/* If we have Unicode property support, we can use it to test the other
|
||||
case of the character, if there is one. The result of ucp_findchar() is
|
||||
case of the character, if there is one. The result of _pcre_ucp_findchar() is
|
||||
< 0 if the char isn't found, and othercase is returned as zero if there
|
||||
isn't one. */
|
||||
|
||||
@@ -1850,7 +1850,7 @@ for (;;)
|
||||
#ifdef SUPPORT_UCP
|
||||
int chartype;
|
||||
int othercase;
|
||||
if (ucp_findchar(fc, &chartype, &othercase) < 0 || dc != othercase)
|
||||
if (_pcre_ucp_findchar(fc, &chartype, &othercase) < 0 || dc != othercase)
|
||||
#endif
|
||||
RRETURN(MATCH_NOMATCH);
|
||||
}
|
||||
@@ -1920,7 +1920,7 @@ for (;;)
|
||||
int othercase;
|
||||
int chartype;
|
||||
if ((ims & PCRE_CASELESS) != 0 &&
|
||||
ucp_findchar(fc, &chartype, &othercase) >= 0 &&
|
||||
_pcre_ucp_findchar(fc, &chartype, &othercase) >= 0 &&
|
||||
othercase > 0)
|
||||
oclength = _pcre_ord2utf8(othercase, occhars);
|
||||
#endif /* SUPPORT_UCP */
|
||||
@@ -2439,7 +2439,7 @@ for (;;)
|
||||
for (i = 1; i <= min; i++)
|
||||
{
|
||||
GETCHARINC(c, eptr);
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if ((*prop_test_variable == prop_test_against) == prop_fail_result)
|
||||
RRETURN(MATCH_NOMATCH);
|
||||
}
|
||||
@@ -2453,7 +2453,7 @@ for (;;)
|
||||
for (i = 1; i <= min; i++)
|
||||
{
|
||||
GETCHARINCTEST(c, eptr);
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
|
||||
while (eptr < md->end_subject)
|
||||
{
|
||||
@@ -2462,7 +2462,7 @@ for (;;)
|
||||
{
|
||||
GETCHARLEN(c, eptr, len);
|
||||
}
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category != ucp_M) break;
|
||||
eptr += len;
|
||||
}
|
||||
@@ -2632,7 +2632,7 @@ for (;;)
|
||||
if (rrc != MATCH_NOMATCH) RRETURN(rrc);
|
||||
if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
|
||||
GETCHARINC(c, eptr);
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if ((*prop_test_variable == prop_test_against) == prop_fail_result)
|
||||
RRETURN(MATCH_NOMATCH);
|
||||
}
|
||||
@@ -2649,7 +2649,7 @@ for (;;)
|
||||
if (rrc != MATCH_NOMATCH) RRETURN(rrc);
|
||||
if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
|
||||
GETCHARINCTEST(c, eptr);
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
|
||||
while (eptr < md->end_subject)
|
||||
{
|
||||
@@ -2658,7 +2658,7 @@ for (;;)
|
||||
{
|
||||
GETCHARLEN(c, eptr, len);
|
||||
}
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category != ucp_M) break;
|
||||
eptr += len;
|
||||
}
|
||||
@@ -2790,7 +2790,7 @@ for (;;)
|
||||
int len = 1;
|
||||
if (eptr >= md->end_subject) break;
|
||||
GETCHARLEN(c, eptr, len);
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if ((*prop_test_variable == prop_test_against) == prop_fail_result)
|
||||
break;
|
||||
eptr+= len;
|
||||
@@ -2816,7 +2816,7 @@ for (;;)
|
||||
{
|
||||
if (eptr >= md->end_subject) break;
|
||||
GETCHARINCTEST(c, eptr);
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category == ucp_M) break;
|
||||
while (eptr < md->end_subject)
|
||||
{
|
||||
@@ -2825,7 +2825,7 @@ for (;;)
|
||||
{
|
||||
GETCHARLEN(c, eptr, len);
|
||||
}
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category != ucp_M) break;
|
||||
eptr += len;
|
||||
}
|
||||
@@ -2846,7 +2846,7 @@ for (;;)
|
||||
{
|
||||
GETCHARLEN(c, eptr, len);
|
||||
}
|
||||
prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
|
||||
if (prop_category != ucp_M) break;
|
||||
eptr--;
|
||||
}
|
||||
@@ -3200,7 +3200,7 @@ Returns: > 0 => success; value is the number of elements filled in
|
||||
< -1 => some kind of unexpected problem
|
||||
*/
|
||||
|
||||
EXPORT int
|
||||
PCRE_EXPORT int
|
||||
pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
|
||||
const char *subject, int length, int start_offset, int options, int *offsets,
|
||||
int offsetcount)
|
||||
|
||||
Reference in New Issue
Block a user