stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

URL parser fixes

Browse source
This commit is contained in:
Jaroslav Kysela 2014-04-09 19:47:24 +02:00
parent 1fb89b9487
commit 4830879ab2
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main.c
View file

@ -859,6 +859,7 @@ main(int argc, char **argv)
tvhftrace("main", hts_settings_done);
tvhftrace("main", dvb_done);
tvhftrace("main", lang_str_done);
tvhftrace("main", urlparse_done);
tvhlog(LOG_NOTICE, "STOP", "Exiting HTS Tvheadend");
tvhlog_end();

24
src/url.c
View file

@ -90,6 +90,11 @@ urlparse ( const char *str, url_t *url )
return 0;
}
void
urlparse_free( void )
{
}
/* Fallback to limited support */
#else /* ENABLE_URIPARSER */
@ -100,25 +105,25 @@ urlparse ( const char *str, url_t *url )
#define HC "[a-z0-9\\-\\.]"
#define URL_RE "^([A-Za-z]+)://(("UC"+)(:("PC"+))?@)?("HC"+)(:([0-9]+))?(/[^\\?]*)?(.([^#]*))?(#(.*))?"
static regex_t *urlparse_exp = NULL;
int
urlparse ( const char *str, url_t *url )
{
static regex_t *exp = NULL;
regmatch_t m[16];
char buf[16];
/* Create regexp */
if (!exp) {
exp = calloc(1, sizeof(regex_t));
if (regcomp(exp, URL_RE, REG_ICASE | REG_EXTENDED)) {
if (!urlparse_exp) {
urlparse_exp = calloc(1, sizeof(regex_t));
if (regcomp(urlparse_exp, URL_RE, REG_ICASE | REG_EXTENDED)) {
tvherror("url", "failed to compile regexp");
exit(1);
}
}
/* Execute */
if (regexec(exp, str, ARRAY_SIZE(m), m, 0))
if (regexec(urlparse_exp, str, ARRAY_SIZE(m), m, 0))
return 1;
/* Extract data */
@ -145,4 +150,13 @@ urlparse ( const char *str, url_t *url )
return 0;
}
void
urlparse_done( void )
{
if (urlparse_exp) {
regfree(urlparse_exp);
free(urlparse_exp);
}
}
#endif /* ENABLE_URIPARSER */

1
src/url.h
View file

@ -40,5 +40,6 @@ typedef struct url
} url_t;
int urlparse ( const char *str, url_t *url );
void urlparse_done ( void );
#endif