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

epggrab: xmltv - do not use any arguments by default

Browse source
This commit is contained in:
Jaroslav Kysela 2014-12-02 19:58:01 +01:00
parent 638b870a19
commit 7db9f44a30
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/epggrab/module.c
View file

@ -284,7 +284,6 @@ char *epggrab_module_grab_spawn ( void *m )
char *outbuf;
epggrab_module_int_t *mod = m;
char **argv = NULL;
char *dargv[] = { (char *)mod->path, (char *)"--quiet", NULL };
/* Debug */
tvhlog(LOG_INFO, mod->id, "grab %s", mod->path);
@ -295,17 +294,6 @@ char *epggrab_module_grab_spawn ( void *m )
return NULL;
}
if (argv && argv[1] == NULL) {
spawn_free_args(argv);
argv = dargv;
} else {
/* -- means no arguments */
if (argv && !strcmp(argv[1], "--") && argv[2] == NULL) {
free(argv[1]);
argv[1] = NULL;
}
}
/* Grab */
outlen = spawn_and_give_stdout(argv[0], (char **)argv, NULL, &rd, NULL, 1);
@ -318,14 +306,10 @@ char *epggrab_module_grab_spawn ( void *m )
close(rd);
if (argv != dargv)
spawn_free_args(argv);
return outbuf;
error:
if (argv && argv != dargv)
spawn_free_args(argv);
spawn_free_args(argv);
if (rd >= 0)
close(rd);
tvhlog(LOG_ERR, mod->id, "no output detected");