JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make print -c honour line separator

Browse Source
This commit is contained in:
tg
2016-11-11 21:13:25 +00:00
parent 26689a7c81
commit 6c04e4a665
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
funcs.c
View File

@ -38,7 +38,7 @@
#endif
#endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.315 2016/11/11 20:53:15 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.316 2016/11/11 21:13:23 tg Exp $");
#if HAVE_KILLPG
/*
@ -525,25 +525,21 @@ c_print(const char **wp)
}
if (po.col) {
size_t w = XPsize(words);
char *cp;
struct columnise_opts co;
XPput(words, NULL);
co.shf = shf_sopen(NULL, 128, SHF_WR | SHF_DYNAMIC, NULL);
co.prefcol = false;
co.linesep = po.nl;
co.prefcol = co.do_last = false;
pr_list(&co, (char **)XPptrv(words));
while (w--)
afree(XPptrv(words)[w], ATEMP);
XPfree(words);
cp = shf_sclose(co.shf);
w = strlen(cp);
w = co.shf->wp - co.shf->buf;
XcheckN(xs, xp, w);
memcpy(xp, cp, w);
memcpy(xp, co.shf->buf, w);
xp += w;
afree(cp, ATEMP);
po.nl = '!'; /* for now */
shf_sclose(co.shf);
}
print_no_arg:
if (po.nl != '!')
@ -1520,7 +1516,8 @@ c_kill(const char **wp)
}
co.shf = shl_stdout;
co.prefcol = true;
co.linesep = '\n';
co.prefcol = co.do_last = true;
print_columns(&co, (unsigned int)(ksh_NSIG - 1),
kill_fmt_entry, (void *)&ki,