#include "cmdline_parse.h"
#include "cmdline_parse_string.h"
-struct cmdline_token_ops cmdline_token_string_ops = {
- .parse = cmdline_parse_string,
- .complete_get_nb = cmdline_complete_get_nb_string,
- .complete_get_elt = cmdline_complete_get_elt_string,
- .get_help = cmdline_get_help_string,
-};
-
#define MULTISTRING_HELP "Mul-choice STRING"
#define ANYSTRING_HELP "Any STRING"
#define FIXEDSTRING_HELP "Fixed STRING"
return NULL;
}
-static int parse_fixed_string(struct cmdline_token_string_data *sd,
- const char *buf, unsigned token_len)
+static int
+parse_fixed_string(struct cmdline_token_string_data *sd,
+ const char *buf, unsigned token_len)
{
unsigned int conf_token_len;
const char *str;
return -1;
}
-int
+static int
cmdline_parse_string(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
unsigned ressize)
{
if (res)
strcpy(res, buf);
- return token_len;
+ return 0;
}
-int cmdline_complete_get_nb_string(cmdline_parse_token_hdr_t *tk)
+static int
+cmdline_complete_string_start(cmdline_parse_token_hdr_t *tk,
+ __attribute__((unused)) const char *tokstr,
+ void **opaque)
{
struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk;
struct cmdline_token_string_data *sd = &tk2->string_data;;
- int ret=1;
const char *str;
- if (!sd->str)
- return 0;
-
str = sd->str;
- while( (str = get_next_token(str)) != NULL ) {
- ret++;
- }
- return ret;
+ *opaque = (void *)str;
+ if (str == NULL)
+ return -1; /* no completion */
+ return 0;
}
-int cmdline_complete_get_elt_string(cmdline_parse_token_hdr_t *tk, int idx,
- char *dstbuf, unsigned int size)
+static int
+cmdline_complete_string_iterate(cmdline_parse_token_hdr_t *tk, void **opaque,
+ char *dstbuf, unsigned int size)
{
- struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk;
- struct cmdline_token_string_data *sd = &tk2->string_data;;
const char *s;
unsigned int len;
- s = sd->str;
-
- while (idx-- && s)
- s = get_next_token(s);
-
- if (!s)
+ s = *opaque;
+ if (s == NULL)
return -1;
+ *opaque = (void *)get_next_token(s);
len = get_token_len(s);
if (len > size - 1)
return 0;
}
-
-int cmdline_get_help_string(cmdline_parse_token_hdr_t *tk, char *dstbuf,
- unsigned int size)
+static int
+cmdline_help_string(cmdline_parse_token_hdr_t *tk, char *dstbuf,
+ unsigned int size)
{
struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk;
struct cmdline_token_string_data *sd = &tk2->string_data;;
s = sd->str;
- if (s) {
- if (get_next_token(s)) {
+ if (s != NULL) {
+ if (get_next_token(s))
strncpy(dstbuf, MULTISTRING_HELP, size);
- }
- else {
+ else
strncpy(dstbuf, FIXEDSTRING_HELP, size);
- }
}
else {
strncpy(dstbuf, ANYSTRING_HELP, size);
return 0;
}
+
+struct cmdline_token_ops cmdline_token_string_ops = {
+ .parse = cmdline_parse_string,
+ .complete_start = cmdline_complete_string_start,
+ .complete_iterate = cmdline_complete_string_iterate,
+ .complete_end = NULL,
+ .help = cmdline_help_string,
+};