mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix segfault when run as rigctl --ptt-file=/dev/ttyUSB2 --ptt-type=RTS

pull/1570/head
Mike Black W9MDB 2024-06-15 22:17:06 -05:00
rodzic a462bc19ae
commit 0212db94eb
1 zmienionych plików z 10 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
tests/rigctl.c
Wyświetl plik

@ -323,40 +323,40 @@ int main(int argc, char *argv[])
if (!strcmp(optarg, "RIG")) if (!strcmp(optarg, "RIG"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_RIG; ptt_type = RIG_PTT_RIG;
} }
else if (!strcmp(optarg, "DTR")) else if (!strcmp(optarg, "DTR"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_SERIAL_DTR; ptt_type = RIG_PTT_SERIAL_DTR;
} }
else if (!strcmp(optarg, "RTS")) else if (!strcmp(optarg, "RTS"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_SERIAL_RTS; ptt_type = RIG_PTT_SERIAL_RTS;
} }
else if (!strcmp(optarg, "PARALLEL")) else if (!strcmp(optarg, "PARALLEL"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_PARALLEL; ptt_type = RIG_PTT_PARALLEL;
} }
else if (!strcmp(optarg, "CM108")) else if (!strcmp(optarg, "CM108"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_CM108; ptt_type = RIG_PTT_CM108;
} }
else if (!strcmp(optarg, "GPIO")) else if (!strcmp(optarg, "GPIO"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_GPIO; ptt_type = RIG_PTT_GPIO;
} }
else if (!strcmp(optarg, "GPION")) else if (!strcmp(optarg, "GPION"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_GPION; ptt_type = RIG_PTT_GPION;
} }
else if (!strcmp(optarg, "NONE")) else if (!strcmp(optarg, "NONE"))
{ {
my_rig->caps->ptt_type = ptt_type = RIG_PTT_NONE; ptt_type = RIG_PTT_NONE;
} }
else else
{ {
puts("Unrecognised PTT type, using NONE"); puts("Unrecognised PTT type, using NONE");
my_rig->caps->ptt_type = ptt_type = RIG_PTT_NONE; ptt_type = RIG_PTT_NONE;
} }
break; break;
@ -563,6 +563,7 @@ int main(int argc, char *argv[])
exit(2); exit(2);
} }
my_rig->caps->ptt_type = ptt_type;
char *token = strtok(conf_parms, ","); char *token = strtok(conf_parms, ",");
struct rig_state *rs = STATE(my_rig); struct rig_state *rs = STATE(my_rig);