Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
epggrab: xmltv - do not use any arguments by default
  • Loading branch information
perexg committed Dec 2, 2014
1 parent 638b870 commit 7db9f44
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions src/epggrab/module.c
Expand Up @@ -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);
Expand All @@ -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);

Expand All @@ -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");
Expand Down

3 comments on commit 7db9f44

@cleanrock
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You say ".. by default".
I don't see how i can add "--quiet" to my internal xmltv grabber now.

@perexg
Copy link
Contributor Author

@perexg perexg commented on 7db9f44 Nov 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try v4.1-903-gf0c456d - f0c456d .

@perexg
Copy link
Contributor Author

@perexg perexg commented on 7db9f44 Nov 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And .. 4085ac2

Please sign in to comment.