Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

This commit is contained in:
Nicholas Marriott 2013-02-20 23:16:53 +00:00
commit c577b47cd5
2 changed files with 2 additions and 1 deletions

View File

@ -112,6 +112,7 @@ cmd_run_shell_callback(struct job *job)
do { do {
if ((line = evbuffer_readline(job->event->input)) != NULL) { if ((line = evbuffer_readline(job->event->input)) != NULL) {
cmd_run_shell_print (job, line); cmd_run_shell_print (job, line);
free(line);
lines++; lines++;
} }
} while (line != NULL); } while (line != NULL);

View File

@ -676,7 +676,7 @@ status_job_callback(struct job *job)
memcpy(buf, EVBUFFER_DATA(job->event->input), len); memcpy(buf, EVBUFFER_DATA(job->event->input), len);
buf[len] = '\0'; buf[len] = '\0';
} else } else
buf = xstrdup(line); buf = line;
so->out = buf; so->out = buf;
server_status_client(c); server_status_client(c);