mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-03 08:11:03 +02:00
22200: process text wasn't unmetafied for output.
This commit is contained in:
parent
30176eaf63
commit
ba8349e6ed
2 changed files with 20 additions and 4 deletions
|
@ -1,5 +1,7 @@
|
|||
2006-02-07 Peter Stephenson <pws@csr.com>
|
||||
|
||||
* 22200: Src/jobs.c: process text wasn't unmetafied for output.
|
||||
|
||||
* 22198: README, Src/init.c, Src/params.c, Doc/Zsh/params.yo:
|
||||
modify 22195 so that HOME gets set as before in native emulation.
|
||||
|
||||
|
|
22
Src/jobs.c
22
Src/jobs.c
|
@ -556,10 +556,18 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
|
|||
#ifdef HAVE_GETRUSAGE
|
||||
double total_time;
|
||||
#endif
|
||||
int percent;
|
||||
int percent, desclen;
|
||||
|
||||
if (!desc)
|
||||
{
|
||||
desc = "";
|
||||
desclen = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
desc = dupstring(desc);
|
||||
unmetafy(desc, &desclen);
|
||||
}
|
||||
|
||||
/* go ahead and compute these, since almost every TIMEFMT will have them */
|
||||
elapsed_time = real->tv_sec + real->tv_usec / 1000000.0;
|
||||
|
@ -706,7 +714,7 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
|
|||
break;
|
||||
#endif
|
||||
case 'J':
|
||||
fprintf(stderr, "%s", desc);
|
||||
fwrite(desc, sizeof(char), desclen, stderr);
|
||||
break;
|
||||
case '%':
|
||||
putc('%', stderr);
|
||||
|
@ -914,8 +922,14 @@ printjob(Job jn, int lng, int synch)
|
|||
(int)(len - 14 + 2 - strlen(sigmsg(WTERMSIG(pn->status)))), "");
|
||||
else
|
||||
fprintf(fout, "%-*s", len + 2, sigmsg(WTERMSIG(pn->status)));
|
||||
for (; pn != qn; pn = pn->next)
|
||||
fprintf(fout, (pn->next) ? "%s | " : "%s", pn->text);
|
||||
for (; pn != qn; pn = pn->next) {
|
||||
char *txt = dupstring(pn->text);
|
||||
int txtlen;
|
||||
unmetafy(txt, &txtlen);
|
||||
fwrite(txt, sizeof(char), txtlen, fout);
|
||||
if (pn->next)
|
||||
fputs(" | ", fout);
|
||||
}
|
||||
putc('\n', fout);
|
||||
fline = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue