char *complete_uri = uri_merge (base, link_uri);
DEBUGP (("%s: merge(%s, %s) -> %s\n",
- quotearg_n_style (0, locale_quoting_style, ctx->document_file),
+ quotearg_n_style (0, escape_quoting_style, ctx->document_file),
quote_n (1, base),
quote_n (2, link_uri),
- quotearg_n_style (3, locale_quoting_style, complete_uri)));
+ quotearg_n_style (3, escape_quoting_style, complete_uri)));
url = url_parse (complete_uri, NULL, NULL, false);
if (!url)
{
while (*content)
{
- /* Find the next occurrence of ',' or the end of
- the string. */
- char *end = strchr (content, ',');
- if (end)
- ++end;
- else
- end = content + strlen (content);
+ char *end;
+ /* Skip any initial whitespace. */
+ content += strspn (content, " \f\n\r\t\v");
+ /* Find the next occurrence of ',' or whitespace,
+ * or the end of the string. */
+ end = content + strcspn (content, ", \f\n\r\t\v");
if (!strncasecmp (content, "nofollow", end - content))
ctx->nofollow = true;
+ /* Skip past the next comma, if any. */
+ if (*end == ',')
+ ++end;
+ else
+ {
+ end = strchr (end, ',');
+ if (end)
+ ++end;
+ else
+ end = content + strlen (content);
+ }
content = end;
}
}