Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2013-05-31 21:44:42 +01:00
6 changed files with 240 additions and 214 deletions

19
tmux.h
View File

@ -1357,13 +1357,18 @@ struct client {
};
ARRAY_DECL(clients, struct client *);
/* Parsed arguments. */
struct args {
bitstr_t *flags;
char *values[SCHAR_MAX]; /* XXX This is awfully big. */
/* Parsed arguments structures. */
struct args_entry {
u_char flag;
char *value;
RB_ENTRY(args_entry) entry;
};
RB_HEAD(args_tree, args_entry);
int argc;
char **argv;
struct args {
struct args_tree tree;
int argc;
char **argv;
};
/* Command and list of commands. */
@ -1720,6 +1725,8 @@ extern const char clock_table[14][5][5];
void clock_draw(struct screen_write_ctx *, int, int);
/* arguments.c */
int args_cmp(struct args_entry *, struct args_entry *);
RB_PROTOTYPE(args_tree, args_entry, entry, args_cmp);
struct args *args_create(int, ...);
struct args *args_parse(const char *, int, char **);
void args_free(struct args *);