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

$'…' functionality, documentation improvements, fixes for backslash

Browse Source 
expansion in all modes, regression tests for both kinds of backslash
expansion; unbksl() revamp; make CTRL macro available globally
This commit is contained in:
tg
2009-09-19 21:54:46 +00:00
parent c8eb13a13f
commit 9fd4b9db41
7 changed files with 347 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
funcs.c
View File

@ -25,7 +25,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.132 2009/09/19 19:08:46 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.133 2009/09/19 21:54:44 tg Exp $");
#if HAVE_KILLPG
/*
@ -495,6 +495,10 @@ c_pwd(const char **wp)
return (0);
}
static const char *s_ptr;
static int s_get(void);
static void s_put(int);
int
c_print(const char **wp)
{
@ -604,7 +608,10 @@ c_print(const char **wp)
while ((c = *s++) != '\0') {
Xcheck(xs, xp);
if ((flags & PO_EXPAND) && c == '\\') {
if ((c = unbksl(&s, false)) == -1) {
s_ptr = s;
c = unbksl(false, s_get, s_put);
s = s_ptr;
if (c == -1) {
/* rejected by generic function */
switch ((c = *s++)) {
case 'c':
@ -618,7 +625,7 @@ c_print(const char **wp)
default:
Xput(xs, xp, '\\');
}
} else if (c > 0xFF) {
} else if ((unsigned int)c > 0xFF) {
/* generic function returned Unicode */
char ts[4];
@ -678,6 +685,18 @@ c_print(const char **wp)
return (0);
}
static int
s_get(void)
{
return (*s_ptr++);
}
static void
s_put(int c __unused)
{
--s_ptr;
}
int
c_whence(const char **wp)
{