From a7d24a99dbe9b63f813aa568dd35ffd8eb217227 Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Sat, 20 May 2023 16:43:42 -0400 Subject: [PATCH 1/3] Fix typos (missing '('s ) in man pages. --- doc/man1/rigctl.1 | 6 +++--- doc/man1/rigctld.1 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1 index cf3aa0821..c7b497246 100644 --- a/doc/man1/rigctl.1 +++ b/doc/man1/rigctl.1 @@ -876,9 +876,9 @@ Level is a token: \(oqPREAMP\(cq, \(oqATT\(cq, \(oqVOXDELAY\(cq, \(oqAF\(cq, \(oqBAL\(cq, \(oqMETER\(cq, \(oqVOXGAIN\(cq, \(oqANTIVOX\(cq, \(oqSLOPE_LOW\(cq, \(oqSLOPE_HIGH\(cq, \(oqBKIN_DLYMS\(cq, \(oqRAWSTR\(cq, \(oqSWR\(cq, \(oqALC\(cq, \(oqSTRENGTH\(cq, \(oqRFPOWER_METER\(cq, \(oqCOMPMETER\(cq, \(oqVD_METER\(cq, \(oqID_METER\(cq, -\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\cq, \(oqSPECTRUM_MODE\(cq, -\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\cq, -\(oqSPECTRUM_REF\(cq, (oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\cq, \(oqTEMP_METER\cq, \(oqBAND_SELECT\(cq, +\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\(cq, \(oqSPECTRUM_MODE\(cq, +\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\(cq, +\(oqSPECTRUM_REF\(cq, \(oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\(cq, \(oqTEMP_METER\(cq, \(oqBAND_SELECT\(cq, \(oqUSB_AF\(cq. .IP The Level Value can be a float or an integer value. For the AGC token the diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1 index 6b55bf59c..d701673a4 100644 --- a/doc/man1/rigctld.1 +++ b/doc/man1/rigctld.1 @@ -868,9 +868,9 @@ evel is a token: \(oqPREAMP\(cq, \(oqATT\(cq, \(oqVOXDELAY\(cq, \(oqAF\(cq, \(oqBAL\(cq, \(oqMETER\(cq, \(oqVOXGAIN\(cq, \(oqANTIVOX\(cq, \(oqSLOPE_LOW\(cq, \(oqSLOPE_HIGH\(cq, \(oqBKIN_DLYMS\(cq, \(oqRAWSTR\(cq, \(oqSWR\(cq, \(oqALC\(cq, \(oqSTRENGTH\(cq, \(oqRFPOWER_METER\(cq, \(oqCOMPMETER\(cq, \(oqVD_METER\(cq, \(oqID_METER\(cq, -\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\cq, \(oqSPECTRUM_MODE\(cq, -\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\cq, -\(oqSPECTRUM_REF\(cq, (oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\cq, \(oqTEMP_METER\cq, \(oqBAND_SELECT\(cq, +\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\(cq, \(oqSPECTRUM_MODE\(cq, +\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\(cq, +\(oqSPECTRUM_REF\(cq, \(oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\(cq, \(oqTEMP_METER\(cq, \(oqBAND_SELECT\(cq, \(oqUSB_AF\(cq. .IP The Level Value can be a float or an integer value. For the AGC token the From ae14af4bc1a1cf67ce25b8ee5ef3567a54c63c70 Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Sun, 21 May 2023 05:50:42 -0400 Subject: [PATCH 2/3] Add missing commands to man pages --- doc/man1/rigctl.1 | 5 +++++ doc/man1/rigctld.1 | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1 index c7b497246..7627ada63 100644 --- a/doc/man1/rigctl.1 +++ b/doc/man1/rigctl.1 @@ -734,6 +734,11 @@ Stop sending the current morse code. Wait for morse to finish -- only works on full break-in . .TP +.BR 0x94 ", " send_voice_mem " \(aq" \fIMsgnum\fP \(aq +Have rig transmit internal message +.RI \(aq Msgnum \(aq +. +.TP .BR 0x8b ", " get_dcd Get .RI \(aq DCD \(aq diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1 index d701673a4..af3b6b4e0 100644 --- a/doc/man1/rigctld.1 +++ b/doc/man1/rigctld.1 @@ -726,6 +726,19 @@ Send symbols. . .TP +.BR 0xbb ", " stop_morse " +Stop sending the current morse code. +. +.TP +.BR 0xbc ", " wait_morse " +Wait for morse to finish -- only works on full break-in +. +.TP +.BR 0x94 ", " send_voice_mem " \(aq" \fIMsgnum\fP \(aq +Have rig transmit internal message +.RI \(aq Msgnum \(aq +. +.TP .BR 0x8b ", " get_dcd Get .RI \(aq DCD \(aq From b6fe91504f06534fa601320fbd7645e619d3a3b3 Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Tue, 23 May 2023 13:14:28 -0400 Subject: [PATCH 3/3] Avoid NULL dereference in debug statement. --- rigs/kenwood/kenwood.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 496494557..7e151db8b 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -246,7 +246,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data, struct kenwood_priv_caps *caps = kenwood_caps(rig); struct rig_state *rs; - if (datasize > 0 && datasize < strlen(cmdstr)) { + if (datasize > 0 && datasize < (cmdstr ? strlen(cmdstr) : 0)) { rig_debug(RIG_DEBUG_WARN, "%s called cmd=%s datasize=%d, datasize < cmd length?\n", __func__, cmdstr ? cmdstr : "(NULL)", (int)datasize);