kopia lustrzana https://github.com/Hamlib/Hamlib
Merge remote-tracking branch 'Hamlib/master'
commit
5b6dfdb7b2
|
@ -72,7 +72,7 @@ extern int errno;
|
|||
#endif
|
||||
struct termios_list
|
||||
{
|
||||
char filename[80];
|
||||
char filename[512];
|
||||
int my_errno;
|
||||
int interrupt;
|
||||
int event_flag;
|
||||
|
@ -1392,8 +1392,8 @@ serial_open()
|
|||
int win32_serial_open(const char *filename, int flags, ...)
|
||||
{
|
||||
struct termios_list *index;
|
||||
char message[160];
|
||||
char fullfilename[80];
|
||||
char message[756];
|
||||
char fullfilename[256];
|
||||
|
||||
ENTER("serial_open");
|
||||
|
||||
|
@ -1407,7 +1407,7 @@ int win32_serial_open(const char *filename, int flags, ...)
|
|||
}
|
||||
else
|
||||
{
|
||||
strncpy(fullfilename, filename, sizeof(fullfilename) - 1);
|
||||
strncpy(fullfilename, filename, sizeof(fullfilename)-1);
|
||||
}
|
||||
|
||||
if (port_opened(fullfilename))
|
||||
|
|
|
@ -508,7 +508,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
|
|||
{
|
||||
int retcode; /* generic return code from functions */
|
||||
unsigned char cmd;
|
||||
struct test_table *cmd_entry;
|
||||
struct test_table *cmd_entry = NULL;
|
||||
int ext_resp = 0;
|
||||
char resp_sep = '\n';
|
||||
|
||||
|
@ -1448,7 +1448,9 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
|
|||
}
|
||||
else
|
||||
{
|
||||
fprintf(fout, "%s: error = %s\n", cmd_entry->name, rigerror(retcode));
|
||||
if (cmd_entry != NULL && cmd_entry->name != NULL) {
|
||||
fprintf(fout, "%s: error = %s\n", cmd_entry->name, rigerror(retcode));
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
#define G313_MODES (RIG_MODE_NONE)
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#ifdef HAVE_WINDOWS_H
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
@ -713,3 +715,5 @@ int g313_get_conf(RIG *rig, token_t token, char *val)
|
|||
|
||||
return RIG_OK;
|
||||
}
|
||||
|
||||
#endif /* _WIN32 */
|
||||
|
|
Ładowanie…
Reference in New Issue