h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-08 02:31:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into coverity_scan_master

Browse Source
This commit is contained in:
Aaron Gyes
2016-10-17 14:48:51 -07:00
parent 49d8e71e1f 8a7b30d3f0
commit 82325778a5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/proc.cpp
View File

@@ -503,7 +503,10 @@ static void format_job_info(const job_t *j, const wchar_t *status, size_t job_co
truncate_command(j->command()).c_str(), status);
}
fflush(stdout);
tputs(clr_eol, 1, &writeb);
if (cur_term != NULL)
tputs(clr_eol, 1, &writeb);
else
fwprintf(stdout, L"\x1b[K");
fwprintf(stdout, L"\n");
}
@@ -605,7 +608,13 @@ int job_reap(bool allow_interactive) {
sig2wcs(WTERMSIG(p->status)),
signal_get_desc(WTERMSIG(p->status)));
}
tputs(clr_eol, 1, &writeb);
if (cur_term != NULL)
tputs(clr_eol, 1, &writeb);
else
fwprintf(stdout,
L"\x1b[K"); // no term set up - do clr_eol manually
fwprintf(stdout, L"\n");
}
found = 1;