circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 02:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2018-02-20 12:02:23 +00:00
commit 5a44e18490
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
format.c
View File

@ -1137,7 +1137,7 @@ format_expand_time(struct format_tree *ft, const char *fmt, time_t t)
char * char *
format_expand(struct format_tree *ft, const char *fmt) format_expand(struct format_tree *ft, const char *fmt)
{ {
char *buf, *out; char *buf, *out, *name;
const char *ptr, *s, *saved = fmt; const char *ptr, *s, *saved = fmt;
size_t off, len, n, outlen; size_t off, len, n, outlen;
int ch, brackets; int ch, brackets;
@ -1176,8 +1176,11 @@ format_expand(struct format_tree *ft, const char *fmt)
if (ft->flags & FORMAT_NOJOBS) if (ft->flags & FORMAT_NOJOBS)
out = xstrdup(""); out = xstrdup("");
else else {
out = format_job_get(ft, xstrndup(fmt, n)); name = xstrndup(fmt, n);
out = format_job_get(ft, name);
free(name);
}
outlen = strlen(out); outlen = strlen(out);
while (len - off < outlen + 1) { while (len - off < outlen + 1) {