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

implement: empty arg in print -A is input word separator

Browse Source
This commit is contained in:
tg
2016-11-11 19:02:26 +00:00
parent 4ed09871a9
commit 1c07e75fc0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
funcs.c
View File

@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.308 2016/11/11 18:50:09 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.309 2016/11/11 19:02:26 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -435,8 +435,11 @@ c_print(const char **wp)
while (*wp != NULL) { while (*wp != NULL) {
if (po.chars) { if (po.chars) {
do { while (*wp != NULL) {
if (!evaluate(*wp, &po.wc, s = *wp++;
if (*s == '\0')
break;
if (!evaluate(s, &po.wc,
KSH_RETURN_ERROR, true)) KSH_RETURN_ERROR, true))
return (1); return (1);
Xcheck(xs, xp); Xcheck(xs, xp);
@ -448,9 +451,9 @@ c_print(const char **wp)
} while (po.ts[++c]); } while (po.ts[++c]);
} else } else
Xput(xs, xp, po.wc & 0xFF); Xput(xs, xp, po.wc & 0xFF);
} while (*++wp); }
} else { } else {
s = *wp; s = *wp++;
while ((c = *s++) != '\0') { while ((c = *s++) != '\0') {
Xcheck(xs, xp); Xcheck(xs, xp);
if (po.exp && c == '\\') { if (po.exp && c == '\\') {
@ -484,9 +487,9 @@ c_print(const char **wp)
} }
Xput(xs, xp, c); Xput(xs, xp, c);
} }
if (*++wp != NULL)
Xput(xs, xp, ' ');
} }
if (*wp != NULL)
Xput(xs, xp, ' ');
} }
if (po.nl) if (po.nl)
Xput(xs, xp, '\n'); Xput(xs, xp, '\n');