X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a59c5565745b21ab13ba016612b9bbbc95ffc8ed..e00dc84d4ef84f1b939c8090d49729b41377421d:/sbr/read_switch_multiword_via_readline.c?ds=sidebyside diff --git a/sbr/read_switch_multiword_via_readline.c b/sbr/read_switch_multiword_via_readline.c index cd43c579..67d405c5 100644 --- a/sbr/read_switch_multiword_via_readline.c +++ b/sbr/read_switch_multiword_via_readline.c @@ -6,6 +6,8 @@ */ #include "h/mh.h" +#include "read_switch_multiword_via_readline.h" +#include "smatch.h" #include "brkstring.h" #include "ambigsw.h" #include "print_sw.h" @@ -35,7 +37,7 @@ read_switch_multiword_via_readline(char *prompt, struct swit *ansp) rl_cmds = ansp; for (;;) { - ans = readline(prompt); + ans = readline(prompt); /* * If we get an EOF, return */ @@ -57,10 +59,10 @@ read_switch_multiword_via_readline(char *prompt, struct swit *ansp) cpp = brkstring(ansbuf, " ", NULL); switch (smatch(*cpp, ansp)) { case AMBIGSW: - ambigsw(*cpp, ansp); + ambigsw(*cpp, ansp); continue; case UNKWNSW: - printf(" -%s unknown. Hit for help.\n", *cpp); + printf(" -%s unknown. Hit for help.\n", *cpp); continue; default: return cpp; @@ -81,7 +83,7 @@ nmh_completion(const char *text, int start, int end) NMH_UNUSED (end); if (start == 0) - return rl_completion_matches(text, nmh_command_generator); + return rl_completion_matches(text, nmh_command_generator); return NULL; } @@ -94,12 +96,12 @@ nmh_command_generator(const char *text, int state) char buf[256]; if (!state) { - list_index = 0; + list_index = 0; len = strlen(text); } while ((name = rl_cmds[list_index].sw)) { - list_index++; + list_index++; strncpy(buf, name, sizeof(buf)); buf[sizeof(buf) - 1] = '\0'; p = *brkstring(buf, " ", NULL);