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

another MidnightBSD /bin/sh kludge: classic BSD echo

Browse Source
This commit is contained in:
tg 2013-02-18 22:47:32 +00:00
parent 84189faad4
commit 0a3fe06229
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
funcs.c
View File

@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.237 2013/01/01 20:45:02 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.238 2013/02/18 22:47:32 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -274,7 +274,7 @@ c_print(const char **wp)
#define PO_HIST BIT(3) /* print to history instead of stdout */ #define PO_HIST BIT(3) /* print to history instead of stdout */
#define PO_COPROC BIT(4) /* printing to coprocess: block SIGPIPE */ #define PO_COPROC BIT(4) /* printing to coprocess: block SIGPIPE */
int fd = 1, c; int fd = 1, c;
int flags = PO_EXPAND|PO_NL; int flags = PO_EXPAND | PO_NL;
const char *s, *emsg; const char *s, *emsg;
XString xs; XString xs;
char *xp; char *xp;
@ -282,7 +282,21 @@ c_print(const char **wp)
if (wp[0][0] == 'e') { if (wp[0][0] == 'e') {
/* echo builtin */ /* echo builtin */
wp++; wp++;
if (Flag(FPOSIX) || Flag(FSH) || Flag(FAS_BUILTIN)) { #ifdef MKSH_MIDNIGHTBSD01ASH_COMPAT
if (Flag(FSH)) {
/*
* MidnightBSD /bin/sh needs a BSD echo, that is,
* one that supports -e but does not enable it by
* default
*/
flags = PO_NL;
}
#endif
if (Flag(FPOSIX) ||
#ifndef MKSH_MIDNIGHTBSD01ASH_COMPAT
Flag(FSH) ||
#endif
Flag(FAS_BUILTIN)) {
/* Debian Policy 10.4 compliant "echo" builtin */ /* Debian Policy 10.4 compliant "echo" builtin */
if (*wp && !strcmp(*wp, "-n")) { if (*wp && !strcmp(*wp, "-n")) {
/* we recognise "-n" only as the first arg */ /* we recognise "-n" only as the first arg */