diff --git a/src/extract-uri.cpp b/src/extract-uri.cpp
index b3923ed1e4dd64df75961b57e8c6b6affff7b627..8580270108bfafcf9322ff5964ede83cd93206d2 100644 (file)
--- a/src/extract-uri.cpp
+++ b/src/extract-uri.cpp
// Functions as per 4.3.4 of CSS 2.1
// http://www.w3.org/TR/CSS21/syndata.html#uri
-gchar *extract_uri(gchar const *s)
+gchar *extract_uri( gchar const *s, gchar const** endptr )
{
if (!s)
return NULL;
sb += 3;
+ if ( endptr ) {
+ *endptr = 0;
+ }
+
// This first whitespace technically is not allowed.
// Just left in for now for legacy behavior.
while ( ( *sb == ' ' ) ||
// we found the delimiter
if ( *se ) {
if ( delim == ')' ) {
+ if ( endptr ) {
+ *endptr = se + 1;
+ }
+
// back up for any trailing whitespace
se--;
while ( ( se[-1] == ' ' ) ||
{
se--;
}
+
result = g_strndup(sb, se - sb + 1);
} else {
gchar const* tail = se + 1;
tail++;
}
if ( *tail == ')' ) {
+ if ( endptr ) {
+ *endptr = tail + 1;
+ }
result = g_strndup(sb, se - sb);
}
}