=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.409 retrieving revision 1.410 diff -c -r1.409 -r1.410 *** src/usr.bin/tmux/tmux.h 2013/04/24 10:01:32 1.409 --- src/usr.bin/tmux/tmux.h 2013/05/31 12:19:34 1.410 *************** *** 1,4 **** ! /* $OpenBSD: tmux.h,v 1.409 2013/04/24 10:01:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: tmux.h,v 1.410 2013/05/31 12:19:34 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 1361,1373 **** }; ARRAY_DECL(clients, struct client *); ! /* Parsed arguments. */ ! struct args { ! bitstr_t *flags; ! char *values[SCHAR_MAX]; /* XXX This is awfully big. */ ! int argc; ! char **argv; }; /* Command and list of commands. */ --- 1361,1378 ---- }; ARRAY_DECL(clients, struct client *); ! /* Parsed arguments structures. */ ! struct args_entry { ! u_char flag; ! char *value; ! RB_ENTRY(args_entry) entry; ! }; ! RB_HEAD(args_tree, args_entry); ! struct args { ! struct args_tree tree; ! int argc; ! char **argv; }; /* Command and list of commands. */ *************** *** 1724,1729 **** --- 1729,1736 ---- 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 *);