extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-19 01:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 826:

Browse Source 
Move the user-visible parts of all options (names, types, limit, default
values) together into one set of tables in options-table.c. Also clean
up and simplify cmd-set-options.c and move a common print function into
option-table.c.
This commit is contained in:
Tiago Cunha
2011-01-03 23:52:38 +00:00
parent 2bdae526ad
commit 36c7c7537a
6 changed files with 917 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
status.c
View File

@@ -1,4 +1,4 @@
/* $Id: status.c,v 1.152 2010-12-30 22:39:49 tcunha Exp $ */
/* $Id: status.c,v 1.153 2011-01-03 23:52:38 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1125,12 +1125,12 @@ status_prompt_add_history(const char *line)
char *
status_prompt_complete(const char *s)
{
const struct cmd_entry **cmdent;
const struct set_option_entry *entry;
ARRAY_DECL(, const char *) list;
char *prefix, *s2;
u_int i;
size_t j;
const struct cmd_entry **cmdent;
const struct options_table_entry *oe;
ARRAY_DECL(, const char *) list;
char *prefix, *s2;
u_int i;
size_t j;
if (*s == '\0')
return (NULL);
@@ -1141,17 +1141,17 @@ status_prompt_complete(const char *s)
if (strncmp((*cmdent)->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, (*cmdent)->name);
}
for (entry = set_option_table; entry->name != NULL; entry++) {
if (strncmp(entry->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, entry->name);
for (oe = server_options_table; oe->name != NULL; oe++) {
if (strncmp(oe->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, oe->name);
}
for (entry = set_session_option_table; entry->name != NULL; entry++) {
if (strncmp(entry->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, entry->name);
for (oe = session_options_table; oe->name != NULL; oe++) {
if (strncmp(oe->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, oe->name);
}
for (entry = set_window_option_table; entry->name != NULL; entry++) {
if (strncmp(entry->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, entry->name);
for (oe = window_options_table; oe->name != NULL; oe++) {
if (strncmp(oe->name, s, strlen(s)) == 0)
ARRAY_ADD(&list, oe->name);
}
/* If none, bail now. */