From 295fa956f899af37acb6bda9c76ad77748eb9a4a Mon Sep 17 00:00:00 2001
From: Ervin Hegedus <airween@gmail.com>
Date: Sat, 5 Jun 2021 09:23:06 +0200
Subject: [PATCH] Quick fix for changing of Hamlib's FILPATHLEN macro

This patch was prepared for Guix by Jack Hill <jackhill@jackhill.us> by
squashing together the changes from upstream #268
<https://github.com/Tlf/tlf/pull/268>.

It allows the released version of Tlf to build against the version 4.2 of
hamlib in Guix.

---
 src/sendqrg.c |  6 +++---
 src/sendqrg.h | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/sendqrg.c b/src/sendqrg.c
index ceeb356..5d4420e 100644
--- a/src/sendqrg.c
+++ b/src/sendqrg.c
@@ -87,7 +87,7 @@ int init_tlf_rig(void) {
 
     rigportname[strlen(rigportname) - 1] = '\0';	// remove '\n'
     strncpy(my_rig->state.rigport.pathname, rigportname,
-	    FILPATHLEN - 1);
+	    TLFFILPATHLEN - 1);
 
     caps = my_rig->caps;
 
@@ -104,9 +104,9 @@ int init_tlf_rig(void) {
     if (dcd_type != RIG_DCD_NONE)
 	my_rig->state.dcdport.type.dcd = dcd_type;
     if (ptt_file)
-	strncpy(my_rig->state.pttport.pathname, ptt_file, FILPATHLEN);
+	strncpy(my_rig->state.pttport.pathname, ptt_file, TLFFILPATHLEN);
     if (dcd_file)
-	strncpy(my_rig->state.dcdport.pathname, dcd_file, FILPATHLEN);
+	strncpy(my_rig->state.dcdport.pathname, dcd_file, TLFFILPATHLEN);
 
     my_rig->state.rigport.parm.serial.rate = serial_rate;
 
diff --git a/src/sendqrg.h b/src/sendqrg.h
index 8c53f2e..1ef85a6 100644
--- a/src/sendqrg.h
+++ b/src/sendqrg.h
@@ -23,6 +23,16 @@
 
 #include <hamlib/rig.h>
 
+#ifdef HAMLIB_FILPATHLEN
+  #define TLFFILPATHLEN HAMLIB_FILPATHLEN
+#else
+  #ifdef FILPATHLEN
+  #define TLFFILPATHLEN FILPATHLEN
+  #else
+  #error "(HAMLIB_)FILPATHLEN macro not found"
+  #endif
+#endif
+
 int init_tlf_rig(void);
 void close_tlf_rig(RIG *my_rig);
 
-- 
2.32.0

uthor</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=184598a43c0e3fd196f6015b220148db308ee83a&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=184598a43c0e3fd196f6015b220148db308ee83a&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/services?id=184598a43c0e3fd196f6015b220148db308ee83a&amp;showmsg=1'>services</a>/<a href='/guix/log/gnu/services/herd.scm?id=184598a43c0e3fd196f6015b220148db308ee83a&amp;showmsg=1'>herd.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/herd.scm?id=184598a43c0e3fd196f6015b220148db308ee83a'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2020-03-03 15:00:32 +0100'>2020-03-03</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/herd.scm?id=8f5a0a97b1d04e8ade8c16694dcb72aed176c595'>services: herd: Add restart-service.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/herd.scm (restart-service): New exported procedure.


</td></tr>
<tr class='logheader'><td><span title='2019-10-18 23:22:25 +0200'>2019-10-18</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/herd.scm?id=6aeae5b90b9513d316141c0131fd43c76a200f63'>herd: Define 'shepherd-message-port'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/herd.scm (shepherd-message-port): New variable.
(display-message): Use it instead of 'current-error-port'.


</td></tr>
<tr class='logheader'><td><span title='2019-07-26 19:19:49 +0200'>2019-07-26</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/herd.scm?id=5c793753b31b1dcd9a554bce953124f7ae88ca9a'>guix system: Add 'reconfigure' module.</a></td><td>Jakob L. Kreuze</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/system/reconfigure.scm: New file.
* Makefile.am (MODULES): Add it.
* guix/scripts/system.scm (bootloader-installer-script): Export variable.
* gnu/machine/ssh.scm (switch-to-system, upgrade-shepherd-services)
(install-bootloader): Delete variable.
* gnu/machine/ssh.scm (deploy-managed-host): Rewrite procedure.
* gnu/services/herd.scm (live-service): Export variable.
* gnu/services/herd.scm (live-service-canonical-name): New variable.
* tests/services.scm (live-service): Delete variable.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2019-06-02 01:38:36 +0200'>2019-06-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/herd.scm?id=bb64b2e7c0ab14cf899c1d81892b59fa877d4d9c'>herd: Use the Guile 2.2 'setvbuf' API.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/herd.scm (open-connection): Use 'block for 'setvbuf'.


</td></tr>