Pass typed arguments out of the parser into the arguments list and let

it convert them into strings.
This commit is contained in:
nicm
2021-08-21 18:39:07 +00:00
parent 63b6eec278
commit 326d2ef234
4 changed files with 148 additions and 51 deletions

20
tmux.h
View File

@ -1355,9 +1355,20 @@ struct message_entry {
};
TAILQ_HEAD(message_list, message_entry);
/* Argument type. */
enum args_type {
ARGS_NONE,
ARGS_STRING,
ARGS_COMMANDS
};
/* Argument value. */
struct args_value {
char *string;
enum args_type type;
union {
char *string;
struct cmd_list *cmdlist;
};
TAILQ_ENTRY(args_value) entry;
};
@ -2187,8 +2198,10 @@ int tty_keys_next(struct tty *);
/* arguments.c */
void args_set(struct args *, u_char, const char *);
struct args *args_create(void);
struct args *args_parse(const struct args_parse *, int, char **);
struct args *args_parse(const struct args_parse *, struct args_value *,
u_int);
void args_vector(struct args *, int *, char ***);
void args_free_value(struct args_value *);
void args_free(struct args *);
char *args_print(struct args *);
char *args_escape(const char *);
@ -2250,7 +2263,8 @@ const struct cmd_entry *cmd_get_entry(struct cmd *);
struct args *cmd_get_args(struct cmd *);
u_int cmd_get_group(struct cmd *);
void cmd_get_source(struct cmd *, const char **, u_int *);
struct cmd *cmd_parse(int, char **, const char *, u_int, char **);
struct cmd *cmd_parse(struct args_value *, u_int, const char *, u_int,
char **);
void cmd_free(struct cmd *);
char *cmd_print(struct cmd *);
struct cmd_list *cmd_list_new(void);