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 2015-10-25 09:22:20 +00:00
commit 3e0d31c4e9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
format.c
View File

@ -40,7 +40,7 @@ struct format_entry;
typedef void (*format_cb)(struct format_tree *, struct format_entry *); typedef void (*format_cb)(struct format_tree *, struct format_entry *);
void format_job_callback(struct job *); void format_job_callback(struct job *);
const char *format_job_get(struct format_tree *, const char *); char *format_job_get(struct format_tree *, const char *);
void format_job_timer(int, short, void *); void format_job_timer(int, short, void *);
void format_cb_host(struct format_tree *, struct format_entry *); void format_cb_host(struct format_tree *, struct format_entry *);
@ -214,7 +214,7 @@ format_job_callback(struct job *job)
} }
/* Find a job. */ /* Find a job. */
const char * char *
format_job_get(struct format_tree *ft, const char *cmd) format_job_get(struct format_tree *ft, const char *cmd)
{ {
struct format_job fj0, *fj; struct format_job fj0, *fj;
@ -244,7 +244,7 @@ format_job_get(struct format_tree *ft, const char *cmd)
if (ft->flags & FORMAT_STATUS) if (ft->flags & FORMAT_STATUS)
fj->status = 1; fj->status = 1;
return (fj->out); return (format_expand(ft, fj->out));
} }
/* Remove old jobs. */ /* Remove old jobs. */
@ -726,9 +726,9 @@ 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, *tmp, *cmd; char *buf, *tmp, *cmd, *out;
const char *ptr, *s, *saved = fmt; const char *ptr, *s, *saved = fmt;
size_t off, len, n, slen; size_t off, len, n, outlen;
int ch, brackets; int ch, brackets;
if (fmt == NULL) if (fmt == NULL)
@ -768,18 +768,20 @@ format_expand(struct format_tree *ft, const char *fmt)
tmp[n] = '\0'; tmp[n] = '\0';
cmd = format_expand(ft, tmp); cmd = format_expand(ft, tmp);
s = format_job_get(ft, cmd); out = format_job_get(ft, cmd);
slen = strlen(s); outlen = strlen(out);
free(cmd); free(cmd);
free(tmp); free(tmp);
while (len - off < slen + 1) { while (len - off < outlen + 1) {
buf = xreallocarray(buf, 2, len); buf = xreallocarray(buf, 2, len);
len *= 2; len *= 2;
} }
memcpy(buf + off, s, slen); memcpy(buf + off, out, outlen);
off += slen; off += outlen;
free(out);
fmt += n + 1; fmt += n + 1;
continue; continue;

2
tmux.c
View File

@ -131,8 +131,6 @@ makesocketpath(const char *label)
uid = getuid(); uid = getuid();
if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0') if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0')
xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid); xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid);
else if ((s = getenv("TMPDIR")) != NULL && *s != '\0')
xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid);
else else
xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid); xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid);