From 295fa956f899af37acb6bda9c76ad77748eb9a4a Mon Sep 17 00:00:00 2001 From: Ervin Hegedus 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 by squashing together the changes from upstream #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 +#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
AgeCommit message (Expand)Author
2022-11-02installer: Add core dump support....Fixes: <https://issues.guix.gnu.org/58733> * gnu/installer.scm (installer-program): Enable core dump generation. * gnu/installer/dump.scm (%core-dump): New variable. (prepare-dump): Copy the core dump file. * gnu/installer/newt/welcome.scm (run-welcome-page): Propose to report an installation that previously generated a core dump. Mathieu Othacehe
2022-02-02installer: Make dump archive creation optional and selective....* gnu/installer.scm (installer-program): Let the installer customize the dump archive. * gnu/installer/dump.scm (prepare-dump, make-dump): Split make-dump in prepare-dump, which copies the files necessary for the dump, and make-dump which creates the archive. * gnu/installer/record.scm (installer): Add report-page field. Change documented return value of exit-error. * gnu/installer/newt.scm (exit-error): Change arguments to be a string containing the error. Let the user choose between exiting and initiating a dump. (report-page): Add new variable. * gnu/installer/newt/page.scm (run-dump-page): New variable. * gnu/installer/newt/dump.scm: Delete it. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Josselin Poiret
2022-02-02installer: Add crash dump upload support....Suggested-by: Josselin Poiret <dev@jpoiret.xyz> * gnu/installer/dump.scm: New file. * gnu/installer/newt/dump.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add them. * gnu/installer/record.scm (<installer>)[dump-page]: New field. * gnu/installer/steps.scm (%current-result): New variable. (run-installer-steps): Update it. * gnu/installer.scm (installer-program): Add tar and gip to the installer path. Add guile-webutils and gnutls to the Guile extensions. Generate and send the crash dump report. * gnu/installer/newt.scm (exit-error): Add a report argument. Display the report id. (dump-page): New procedure. (newt-installer): Update it. Mathieu Othacehe