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

Merge pull request #414 from dmarion/osx

Browse source 
tvheadend_webroot can be NULL
This commit is contained in:
perexg 2014-06-02 16:26:40 +02:00
commit 5c170675da
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/avahi.c
View file

@ -148,8 +148,12 @@ create_services(AvahiClient *c)
goto fail;
}
path = malloc(strlen(tvheadend_webroot) + 6);
sprintf(path, "path=%s", tvheadend_webroot);
if (tvheadend_webroot) {
path = malloc(strlen(tvheadend_webroot) + 6);
sprintf(path, "path=%s", tvheadend_webroot);
} else {
path = "/";
}
/* Add the service for HTTP */
if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC,
@ -158,7 +162,8 @@ create_services(AvahiClient *c)
path,
NULL)) < 0) {
free(path);
if (tvheadend_webroot)
free(path);
if (ret == AVAHI_ERR_COLLISION)
goto collision;

2
src/bonjour.c
View file

@ -104,7 +104,7 @@ void
bonjour_init(void)
{
txt_rec_t txt_rec_http[] = {
{ "path", tvheadend_webroot },
{ "path", tvheadend_webroot ? tvheadend_webroot : "/" },
{ .key = NULL }
};