Revert fixes from PR82 for tab completion - needs more work

Author: Rob Sanders

libcli.c

@@ -3127,17 +3127,17 @@ int cli_int_execute_pipeline(struct cli_def *cli, struct cli_pipeline *pipeline)
  *  Attempt quick dirty wrapping of helptext taking into account the offset from name, embedded
  *  cr/lf in helptext, and trying to split on last white-text before the right margin.  If there is
  *  no identifiable whitespace to split on, then the split will be done on the last character to fit
- *  that line (currently max line with is 80 characters).  
- *  The firstcolumn width will be a greater of 22 characters or the width of nameptr, which ever is 
+ *  that line (currently max line with is 80 characters).
+ *  The firstcolumn width will be a greater of 22 characters or the width of nameptr, which ever is
  *  greater, and will be offset from the rest of the line by one space.  However, if nameptr is
  *  greater than 22 characters it will be put on a line by itself.  The first column will be formatted
  *  as spaces (22 of em) for all subsequent lines.
 .
  *  This routine assumes any 'indenting' of the nameptr field has already been done, and is solely
- *  concerned about wrapping the combination of nameptr and helpptr to look 'nice'.  
+ *  concerned about wrapping the combination of nameptr and helpptr to look 'nice'.
  */
- 
-#define MAX(a,b) ((a) >(b) ? (a) : (b))
+
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MAXWIDTHCOL1 22
 
 void cli_int_wrap_help_line(char *nameptr, char *helpptr, struct cli_comphelp *comphelp) {
@@ -3164,8 +3164,8 @@ void cli_int_wrap_help_line(char *nameptr, char *helpptr, struct cli_comphelp *c
       nameptr = emptystring;
       namewidth = MAXWIDTHCOL1;
     }
-    namewidth = MAX(MAXWIDTHCOL1,strlen(nameptr));
-    availwidth = maxwidth - namewidth -1; // subtract 1 for space separating col1 from rest of line
+    namewidth = MAX(MAXWIDTHCOL1, strlen(nameptr));
+    availwidth = maxwidth - namewidth - 1;  // subtract 1 for space separating col1 from rest of line
     toprint = strlen(helpptr);
     if (toprint > availwidth) {
       toprint = availwidth;

libcli.spec

@@ -75,9 +75,6 @@ rm -rf $RPM_BUILD_ROOT
 - applied fixes for misspellings on LIBCLI version #defines (issue #75) - fix provided on github by belge-sel on 19Sep2021 
 - Fix for printing (issue #79) where text left in buffer (from call to cli_bufprint for example) is discarded instead of preserved.  Code provided on github by JereLeppanen on 27Apr2021
 
-* Tue Nov 29 2022 Rob Sanders <rsanders@forcepointgov.com> 1.10.8 
-- Fix for issue #82 (OPTIONAL_FLAG tab completion not honoring user provided callback)
-
 * Wed Nov 16 2022 Rob Sanders <rsanders@forcepointgov.com> 1.10.8
 - Doxygen headers for libli.c routines - code provided on github by mpzanoosi on 14May2021
 
@@ -255,7 +252,7 @@ rm -rf $RPM_BUILD_ROOT
 - Disable TAB completion during username entry
 
 * Fri May  2 2008 David Parrish <david@dparrish.com> 1.9.2-1
-- Add configurable timeout for cl7i_regular() - defaults to 1 second
+- Add configurable timeout for cli_regular() - defaults to 1 second
 - Add idle timeout support
 
 * Thu Jul  5 2007 Brendan O'Dea <bod@optus.net> 1.9.1-1