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

Fix newcat_set_cmd_validate read_string check 

https://github.com/Hamlib/Hamlib/issues/505
pull/518/head
Michael Black W9MDB 2021-01-15 10:58:47 -06:00
rodzic ea9a706743
commit ad2c20f611
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
rigs/yaesu/newcat.c
Wyświetl plik

@ -9426,14 +9426,15 @@ int newcat_set_cmd_validate(RIG *rig)
} }
while (rc != RIG_OK && retry++ < retries) while (rc != RIG_OK && retry++ < retries)
{ {
int bytes;
rig_flush(&state->rigport); /* discard any unsolicited data */ rig_flush(&state->rigport); /* discard any unsolicited data */
rc = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str)); rc = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str));
if (rc != RIG_OK) return -RIG_EIO; if (rc != RIG_OK) return -RIG_EIO;
rc = write_block(&state->rigport, valcmd, strlen(valcmd)); rc = write_block(&state->rigport, valcmd, strlen(valcmd));
if (rc != RIG_OK) return -RIG_EIO; if (rc != RIG_OK) return -RIG_EIO;
rc = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data), bytes = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data),
&cat_term, sizeof(cat_term)); &cat_term, sizeof(cat_term));
if (rc == RIG_OK) if (bytes > 0)
{ {
// if they match we are validated // if they match we are validated
if (strcmp(priv->cmd_str, priv->ret_data)==0) return RIG_OK; if (strcmp(priv->cmd_str, priv->ret_data)==0) return RIG_OK;