From 902be172c1613d97bcba8f90e9199100c0578b0b Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Wed, 4 Jan 2023 17:22:56 -0600
Subject: [PATCH] Allow rigctld to start with autopower_on=0 and avoid timeouts
 at startup

---
 tests/rigctld.c | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/tests/rigctld.c b/tests/rigctld.c
index 9bc906b27..e52f57f1b 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -156,6 +156,7 @@ extern int lock_mode;
 extern powerstat_t rig_powerstat;
 static int rigctld_idle =
     0; // if true then rig will close when no clients are connected
+static int skip_open = 0;
 
 #define MAXCONFLEN 1024
 
@@ -509,19 +510,29 @@ int main(int argc, char *argv[])
                 exit(1);
             }
 
-            if (*conf_parms != '\0')
+            if (strcmp(optarg, "autopower_on=0") == 0)
             {
-                strcat(conf_parms, ",");
+                rig_debug(RIG_DEBUG_ERR, "%s: skipping rig_open\n", __func__);
+                skip_open = 1;
+            }
+            else
+            {
+
+                if (*conf_parms != '\0')
+                {
+                    strcat(conf_parms, ",");
+                }
+
+                if (strlen(conf_parms) + strlen(optarg) > MAXCONFLEN - 24)
+                {
+                    printf("Length of conf_parms exceeds internal maximum of %d\n",
+                           MAXCONFLEN - 24);
+                    return 1;
+                }
+
+                strncat(conf_parms, optarg, MAXCONFLEN - strlen(conf_parms));
             }
 
-            if (strlen(conf_parms) + strlen(optarg) > MAXCONFLEN - 24)
-            {
-                printf("Length of conf_parms exceeds internal maximum of %d\n",
-                       MAXCONFLEN - 24);
-                return 1;
-            }
-
-            strncat(conf_parms, optarg, MAXCONFLEN - strlen(conf_parms));
             break;
 
         case 't':
@@ -758,8 +769,15 @@ int main(int argc, char *argv[])
     }
 
     /* attempt to open rig to check early for issues */
-    retcode = rig_open(my_rig);
-    rig_opened = retcode == RIG_OK ? 1 : 0;
+    if (skip_open)
+    {
+        rig_opened = 0;
+    }
+    else
+    {
+        retcode = rig_open(my_rig);
+        rig_opened = retcode == RIG_OK ? 1 : 0;
+    }
 
     if (retcode != RIG_OK)
     {