Revert "Fix issue where tab completion on 'OPTIONAL_FLAG' items only matched name, not user supplied completor/validators"

This reverts commit 6925262.

Author: Rob Sanders

clitest.c

@@ -307,32 +307,8 @@ int side_length_validator(struct cli_def *cli, const char *name, const char *val
   return rc;
 }
 
-const char *TransparentColors[] = {
-    "clear",
-    "transparent",
-    "see-through",
-};
-
-int transparent_completor(struct cli_def *cli, const char *name, const char *word, struct cli_comphelp *comphelp) {
-  // Attempt to show matches against the following color strings
-  const char **color;
-  int rc = CLI_OK;
-  printf("transparent_completor called with <%s>\n", word);
-  for (color = TransparentColors; *color && (rc == CLI_OK); color++) {
-    if (!word || !strncmp(*color, word, strlen(word))) {
-      rc = cli_add_comphelp_entry(comphelp, *color);
-    }
-  }
-  return rc;
-}
 int transparent_validator(struct cli_def *cli, const char *name, const char *value) {
-  const char **color;
-  int rc = CLI_ERROR;
-  printf("color_validator called for %s\n", name);
-  for (color = TransparentColors; *color; color++) {
-    if (!strcmp(value, *color)) return CLI_OK;
-  }
-  return rc;
+  return strcasecmp("transparent", value) ? CLI_ERROR : CLI_OK;
 }
 
 int check1_validator(struct cli_def *cli, UNUSED(const char *name), UNUSED(const char *value)) {
@@ -443,7 +419,7 @@ void run_child(int x) {
       "Calculate perimeter of polygon\nhas embedded "
       "newline\nand_a_really_long_line_that_is_much_longer_than_80_columns_to_show_that_wrap_case");
   o = cli_register_optarg(c, "transparent", CLI_CMD_OPTIONAL_FLAG, PRIVILEGE_UNPRIVILEGED, MODE_EXEC,
-                          "Set transparent flag", transparent_completor, transparent_validator, NULL);
+                          "Set transparent flag", NULL, NULL, NULL);
   cli_optarg_addhelp(o, "transparent", "(any case)set to transparent");
 
   cli_register_optarg(

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;
@@ -3213,6 +3213,7 @@ static void cli_get_optarg_comphelp(struct cli_def *cli, struct cli_optarg *opta
     if (!(anchor_word && !strncmp(anchor_word, optarg->name, strlen(anchor_word)))) {
       delim_start = DELIM_OPT_START;
       delim_end = DELIM_OPT_END;
+      get_completions = NULL;  // No point, completor of field is the name itself
     }
   } else if (optarg->flags & CLI_CMD_HYPHENATED_OPTION) {
     delim_start = DELIM_OPT_START;