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

Fix multi-command rigctl capability for readline capable build 

https://github.com/Hamlib/Hamlib/issues/711
pull/712/head
Mike Black W9MDB 2021-05-24 10:51:08 -05:00
rodzic 238265f2ac
commit 2acbd22173
1 zmienionych plików z 5 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
tests/rigctl_parse.c
Wyświetl plik

@ -671,7 +671,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
RETURNFUNC(RIGCTL_PARSE_ERROR); RETURNFUNC(RIGCTL_PARSE_ERROR);
} }
if (cmd != 0xa) if (cmd != 0xa && cmd !=0xd)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: cmd=%c(%02x)\n", __func__, rig_debug(RIG_DEBUG_TRACE, "%s: cmd=%c(%02x)\n", __func__,
isprint(cmd) ? cmd : ' ', cmd); isprint(cmd) ? cmd : ' ', cmd);
@ -1143,7 +1143,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
* argument is given, it will be parsed out later. * argument is given, it will be parsed out later.
*/ */
result = strtok(input_line, " "); result = strtok(input_line, " ");
readline_repeat:
/* parsed_input stores pointers into input_line where the token strings /* parsed_input stores pointers into input_line where the token strings
* start. * start.
*/ */
@ -1737,6 +1737,9 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
fflush(fout); fflush(fout);
rig_debug(RIG_DEBUG_TRACE, "%s: retcode=%d\n", __func__, retcode); rig_debug(RIG_DEBUG_TRACE, "%s: retcode=%d\n", __func__, retcode);
#ifdef HAVE_LIBREADLINE
if ((result = strtok(NULL, " "))) goto readline_repeat;
#endif
if (sync_cb) { sync_cb(0); } /* unlock if necessary */ if (sync_cb) { sync_cb(0); } /* unlock if necessary */