Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
linuxdvb: accept '-a -1' parameter to completely disable linuxdvb input
  • Loading branch information
perexg committed Oct 9, 2015
1 parent bc452b7 commit 81b887e
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions src/main.c
Expand Up @@ -680,7 +680,7 @@ main(int argc, char **argv)
OPT_BOOL, &opt_dbus_session },
#endif
#if ENABLE_LINUXDVB
{ 'a', "adapters", N_("Only use specified DVB adapters (comma separated)"),
{ 'a', "adapters", N_("Only use specified DVB adapters (comma separated, -1 = none)"),
OPT_STR, &opt_dvb_adapters },
#endif
#if ENABLE_SATIP_SERVER
Expand Down Expand Up @@ -800,19 +800,24 @@ main(int argc, char **argv)
char *r = NULL;
char *dvb_adapters = strdup(opt_dvb_adapters);
adapter_mask = 0x0;
i = 0;
p = strtok_r(dvb_adapters, ",", &r);
while (p) {
int a = strtol(p, &e, 10);
if (*e != 0 || a < 0 || a > 31) {
if (*e != 0 || a > 31) {
fprintf(stderr, _("Invalid adapter number '%s'\n"), p);
free(dvb_adapters);
return 1;
}
adapter_mask |= (1 << a);
i = 1;
if (a < 0)
adapter_mask = 0;
else
adapter_mask |= (1 << a);
p = strtok_r(NULL, ",", &r);
}
free(dvb_adapters);
if (!adapter_mask) {
if (!i) {
fprintf(stderr, "%s", _("No adapters specified!\n"));
return 1;
}
Expand Down

0 comments on commit 81b887e

Please sign in to comment.