src/usr.bin/tmux/cmd-show-options.c - diff

Return to cmd-show-options.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/cmd-show-options.c between version 1.10 and 1.11

version 1.10, 2009/12/10 09:16:52

version 1.11, 2011/01/01 16:51:21

Line 43

int

cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)

{

struct cmd_target_data *data = self->data;

const struct set_option_entry *table;

const struct options_table_entry *table, *oe;

struct session *s;

struct winlink *wl;

struct options *oo;

struct options_entry *o;

const struct set_option_entry *entry;

const char *optval;

if (cmd_check_flag(data->chflags, 's')) {

oo = &global_options;

table = set_option_table;

table = server_options_table;

} else if (cmd_check_flag(data->chflags, 'w')) {

table = set_window_option_table;

table = window_options_table;

if (cmd_check_flag(data->chflags, 'g'))

oo = &global_w_options;

else {

Line 66

Line 65

oo = &wl->window->options;

}

} else {

table = set_session_option_table;

table = session_options_table;

if (cmd_check_flag(data->chflags, 'g'))

oo = &global_s_options;

else {

Line 77

Line 76

}

for (entry = table; entry->name != NULL; entry++) {

for (oe = table; oe->name != NULL; oe++) {

if ((o = options_find1(oo, entry->name)) == NULL)

if ((o = options_find1(oo, oe->name)) == NULL)

continue;

optval = cmd_set_option_print(entry, o);

optval = options_table_print_entry(oe, o);

ctx->print(ctx, "%s %s", entry->name, optval);

ctx->print(ctx, "%s %s", oe->name, optval);

}

return (0);