Fix rigctl argument prompt for non-readline capable system

https://github.com/Hamlib/Hamlib/issues/339
pull/345/head
Michael Black W9MDB 2020-07-06 10:15:57 -05:00
rodzic 281febec62
commit 0db3eafe66
1 zmienionych plików z 9 dodań i 2 usunięć

Wyświetl plik

@ -736,6 +736,8 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
break; break;
} }
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd==0x%02x\n", __func__, cmd);
if (cmd == 0x0a || cmd == 0x0d) if (cmd == 0x0a || cmd == 0x0d)
{ {
if (last_was_ret) if (last_was_ret)
@ -935,12 +937,17 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (interactive) if (interactive)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: debug4\n", __func__); int c = fgetc(fin);
rig_debug(RIG_DEBUG_TRACE, "%s: debug4 c=%02x\n", __func__, c);
if (prompt) if (prompt && c == 0x0a)
{ {
fprintf_flush(fout, "%s: ", cmd_entry->arg1); fprintf_flush(fout, "%s: ", cmd_entry->arg1);
} }
else
{
ungetc(c, fin);
}
if (scanfc(fin, "%s", arg1) < 1) if (scanfc(fin, "%s", arg1) < 1)
{ {