Merge pull request #88 from dparrish/fix_optional_flag_completion_issue

Fix optional flag completion issue

Author: RobSanders

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

@@ -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;

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