extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-02 04:53:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-08-28 12:01:07 +01:00
commit 31c027a37a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
format.c
View File

@ -323,6 +323,7 @@ format_find(struct format_tree *ft, const char *key)
{ {
struct format_entry *fe, fe_find; struct format_entry *fe, fe_find;
struct options_entry *o; struct options_entry *o;
struct environ_entry *envent;
static char s[16]; static char s[16];
o = options_find(&global_options, key); o = options_find(&global_options, key);
@ -348,9 +349,18 @@ format_find(struct format_tree *ft, const char *key)
fe_find.key = (char *) key; fe_find.key = (char *) key;
fe = RB_FIND(format_entry_tree, &ft->tree, &fe_find); fe = RB_FIND(format_entry_tree, &ft->tree, &fe_find);
if (fe == NULL) if (fe != NULL)
return (NULL); return (fe->value);
return (fe->value);
envent = NULL;
if (ft->s != NULL)
envent = environ_find(&ft->s->environ, key);
if (envent == NULL)
envent = environ_find(&global_environ, key);
if (envent != NULL)
return (envent->value);
return (NULL);
} }
/* /*
@ -372,7 +382,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
copy[keylen] = '\0'; copy[keylen] = '\0';
/* Is there a length limit or whatnot? */ /* Is there a length limit or whatnot? */
if (!islower((u_char) *copy) && *copy != '@' && *copy != '?') { if (!isalpha((u_char) *copy) && *copy != '@' && *copy != '?') {
while (*copy != ':' && *copy != '\0') { while (*copy != ':' && *copy != '\0') {
switch (*copy) { switch (*copy) {
case '=': case '=':