[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 612de9762e3a7e00597ce48499746b77e96b433a

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  612de9762e3a7e00597ce48499746b77e96b433a (commit)
       via  0ebdaee747a0b15477d62c4b4a4ecf55ad3710b9 (commit)
      from  4571dcb2a50497162e464d6928e86fc7571a1f2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 612de9762e3a7e00597ce48499746b77e96b433a
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Jan 11 14:53:35 2021 -0600

    Fix intialization of rx_range_list
    https://github.com/Hamlib/Hamlib/issues/504

diff --git a/src/rig.c b/src/rig.c
index b740af56..06b29be1 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -426,15 +426,16 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model)
            sizeof(struct freq_range_list)*FRQRANGESIZ);
 
     // if we don't have list1 we'll try list2
-    if (RIG_IS_FRNG_END(rs->rx_range_list[0]))
+    if (rs->rx_range_list == NULL)
     {
+        rig_debug(RIG_DEBUG_TRACE, "%s: rx_range_list1 is empty, using rx_range_list2\n", __func__);
         memcpy(rs->tx_range_list, caps->rx_range_list2,
                sizeof(struct freq_range_list)*FRQRANGESIZ);
         memcpy(rs->rx_range_list, caps->tx_range_list2,
                sizeof(struct freq_range_list)*FRQRANGESIZ);
     }
 
-    if (RIG_IS_FRNG_END(rs->rx_range_list[0]))
+    if (rs->tx_range_list == NULL)
     {
         rig_debug(RIG_DEBUG_ERR, "%s: rig does not have rx_range!!\n", __func__);
         return NULL;

commit 0ebdaee747a0b15477d62c4b4a4ecf55ad3710b9
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Jan 11 14:43:08 2021 -0600

    Change rig_init logic to allow first char of '/' to mean a pathname and not a hostname
    https://github.com/Hamlib/Hamlib/issues/492

diff --git a/src/misc.c b/src/misc.c
index 205f47ca..bfe5d2ad 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1636,6 +1636,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
 
     // Handle device names 1st
     if (strstr(hoststr, "/dev")) { return -1; }
+    if (strstr(hoststr, "/")) { return -1; } // posible path -- no hostname starts with /
 
     if (strncasecmp(hoststr, "com", 3) == 0) { return -1; }
 

-----------------------------------------------------------------------

Summary of changes:
 src/misc.c | 1 +
 src/rig.c  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries