Wrap wide columns with the list of commands

dforsi · dforsi · commit b1a673326b15 · 2025-09-22T23:53:33.000+02:00
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
@@ -1963,6 +1963,7 @@ void usage_rig(FILE *fout)
 {
     int i;
     int column = 1;
+    int wrapped = 0;
 
     fprintf(fout, "Commands (some may not be available for this rig):\n");
 
@@ -1990,9 +1991,10 @@ void usage_rig(FILE *fout)
             nbspaces -= fprintf(fout, ",%s", test_list[i].arg3);
         }
 
-        if ((nbspaces < 1) || (column == 2))
+        if ((nbspaces < 1) || (column == 2) || wrapped)
         {
             fprintf(fout, ")\n");
+            wrapped = (nbspaces < 1) && (column == 1);
             column = 1;
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -1963,6 +1963,7 @@ void usage_rig(FILE *fout)`
`1963`	`1963`	`{`
`1964`	`1964`	`int i;`
`1965`	`1965`	`int column = 1;`
	`1966`	`+ int wrapped = 0;`
`1966`	`1967`
`1967`	`1968`	`fprintf(fout, "Commands (some may not be available for this rig):\n");`
`1968`	`1969`
`@@ -1990,9 +1991,10 @@ void usage_rig(FILE *fout)`
`1990`	`1991`	`nbspaces -= fprintf(fout, ",%s", test_list[i].arg3);`
`1991`	`1992`	`}`
`1992`	`1993`
`1993`		`- if ((nbspaces < 1) \|\| (column == 2))`
	`1994`	`+ if ((nbspaces < 1) \|\| (column == 2) \|\| wrapped)`
`1994`	`1995`	`{`
`1995`	`1996`	`fprintf(fout, ")\n");`
	`1997`	`+ wrapped = (nbspaces < 1) && (column == 1);`
`1996`	`1998`	`column = 1;`
`1997`	`1999`	`}`
`1998`	`2000`	`else`