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

BEL was, and Vi mode is, not EBCDIC-safe

Browse Source
This commit is contained in:
tg 2017-04-28 00:49:33 +00:00
parent 2231ff566d
commit 8df7c0c94a
3 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
edit.c
View File

@ -28,7 +28,7 @@
#ifndef MKSH_NO_CMDLINE_EDITING #ifndef MKSH_NO_CMDLINE_EDITING
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.329 2017/04/28 00:38:28 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.330 2017/04/28 00:49:32 tg Exp $");
/* /*
* in later versions we might use libtermcap for this, but since external * in later versions we might use libtermcap for this, but since external
@ -1313,7 +1313,7 @@ x_insert(int c)
if (c == 0) { if (c == 0) {
invmbs: invmbs:
left = 0; left = 0;
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
if (UTFMODE) { if (UTFMODE) {
@ -1375,7 +1375,7 @@ static int
x_do_ins(const char *cp, size_t len) x_do_ins(const char *cp, size_t len)
{ {
if (xep + len >= xend) { if (xep + len >= xend) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (-1); return (-1);
} }
memmove(xcp + len, xcp, xep - xcp + 1); memmove(xcp + len, xcp, xep - xcp + 1);
@ -1415,7 +1415,7 @@ x_del_back(int c MKSH_A_UNUSED)
ssize_t i = 0; ssize_t i = 0;
if (xcp == xbuf) { if (xcp == xbuf) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
do { do {
@ -1441,7 +1441,7 @@ x_del_char(int c MKSH_A_UNUSED)
} }
if (!i) { if (!i) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
x_delete(i, false); x_delete(i, false);
@ -1551,7 +1551,7 @@ x_bword(void)
char *cp = xcp; char *cp = xcp;
if (cp == xbuf) { if (cp == xbuf) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (0); return (0);
} }
while (x_arg--) { while (x_arg--) {
@ -1575,7 +1575,7 @@ x_fword(bool move)
char *cp = xcp; char *cp = xcp;
if (cp == xep) { if (cp == xep) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (0); return (0);
} }
while (x_arg--) { while (x_arg--) {
@ -1679,7 +1679,7 @@ static int
x_mv_back(int c MKSH_A_UNUSED) x_mv_back(int c MKSH_A_UNUSED)
{ {
if (xcp == xbuf) { if (xcp == xbuf) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
while (x_arg--) { while (x_arg--) {
@ -1696,7 +1696,7 @@ x_mv_forw(int c MKSH_A_UNUSED)
char *cp = xcp, *cp2; char *cp = xcp, *cp2;
if (xcp == xep) { if (xcp == xep) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
while (x_arg--) { while (x_arg--) {
@ -1717,13 +1717,13 @@ x_search_char_forw(int c MKSH_A_UNUSED)
*xep = '\0'; *xep = '\0';
if (x_e_getmbc(tmp) < 0) { if (x_e_getmbc(tmp) < 0) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
while (x_arg--) { while (x_arg--) {
if ((cp = (cp == xep) ? NULL : strstr(cp + 1, tmp)) == NULL && if ((cp = (cp == xep) ? NULL : strstr(cp + 1, tmp)) == NULL &&
(cp = strstr(xbuf, tmp)) == NULL) { (cp = strstr(xbuf, tmp)) == NULL) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
} }
@ -1738,7 +1738,7 @@ x_search_char_back(int c MKSH_A_UNUSED)
bool b; bool b;
if (x_e_getmbc(tmp) < 0) { if (x_e_getmbc(tmp) < 0) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
for (; x_arg--; cp = p) for (; x_arg--; cp = p)
@ -1746,7 +1746,7 @@ x_search_char_back(int c MKSH_A_UNUSED)
if (p-- == xbuf) if (p-- == xbuf)
p = xep; p = xep;
if (p == cp) { if (p == cp) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
if ((tmp[1] && ((p+1) > xep)) || if ((tmp[1] && ((p+1) > xep)) ||
@ -1842,7 +1842,7 @@ x_load_hist(char **hp)
sp = holdbufp; sp = holdbufp;
modified = 0; modified = 0;
} else if (hp < history || hp > histptr) { } else if (hp < history || hp > histptr) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return; return;
} }
if (sp == NULL) if (sp == NULL)
@ -1935,7 +1935,7 @@ x_search_hist(int c)
/* add char to pattern */ /* add char to pattern */
/* overflow check... */ /* overflow check... */
if ((size_t)(p - pat) >= sizeof(pat) - 1) { if ((size_t)(p - pat) >= sizeof(pat) - 1) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
continue; continue;
} }
*p++ = c, *p = '\0'; *p++ = c, *p = '\0';
@ -1981,7 +1981,7 @@ x_search(char *pat, int sameline, int offset)
return (i); return (i);
} }
} }
x_e_putc2(7); x_e_putc2(KSH_BEL);
x_histp = histptr; x_histp = histptr;
return (-1); return (-1);
} }
@ -2161,11 +2161,11 @@ x_transpose(int c MKSH_A_UNUSED)
* to the one they want. * to the one they want.
*/ */
if (xcp == xbuf) { if (xcp == xbuf) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} else if (xcp == xep || Flag(FGMACS)) { } else if (xcp == xep || Flag(FGMACS)) {
if (xcp - xbuf == 1) { if (xcp - xbuf == 1) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
/* /*
@ -2174,12 +2174,12 @@ x_transpose(int c MKSH_A_UNUSED)
*/ */
x_bs3(&xcp); x_bs3(&xcp);
if (utf_mbtowc(&tmpa, xcp) == (size_t)-1) { if (utf_mbtowc(&tmpa, xcp) == (size_t)-1) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
x_bs3(&xcp); x_bs3(&xcp);
if (utf_mbtowc(&tmpb, xcp) == (size_t)-1) { if (utf_mbtowc(&tmpb, xcp) == (size_t)-1) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
utf_wctomb(xcp, tmpa); utf_wctomb(xcp, tmpa);
@ -2192,12 +2192,12 @@ x_transpose(int c MKSH_A_UNUSED)
* cursor, move cursor position along one. * cursor, move cursor position along one.
*/ */
if (utf_mbtowc(&tmpa, xcp) == (size_t)-1) { if (utf_mbtowc(&tmpa, xcp) == (size_t)-1) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
x_bs3(&xcp); x_bs3(&xcp);
if (utf_mbtowc(&tmpb, xcp) == (size_t)-1) { if (utf_mbtowc(&tmpb, xcp) == (size_t)-1) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
utf_wctomb(xcp, tmpa); utf_wctomb(xcp, tmpa);
@ -2334,7 +2334,7 @@ x_abort(int c MKSH_A_UNUSED)
static int static int
x_error(int c MKSH_A_UNUSED) x_error(int c MKSH_A_UNUSED)
{ {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
@ -2610,7 +2610,7 @@ x_kill_region(int c MKSH_A_UNUSED)
char *xr; char *xr;
if (xmp == NULL) { if (xmp == NULL) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
if (xmp > xcp) { if (xmp > xcp) {
@ -2632,7 +2632,7 @@ x_xchg_point_mark(int c MKSH_A_UNUSED)
char *tmp; char *tmp;
if (xmp == NULL) { if (xmp == NULL) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
tmp = xmp; tmp = xmp;
@ -2710,7 +2710,7 @@ x_expand(int c MKSH_A_UNUSED)
&start, &end, &words); &start, &end, &words);
if (nwords == 0) { if (nwords == 0) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
x_goto(xbuf + start); x_goto(xbuf + start);
@ -2720,7 +2720,7 @@ x_expand(int c MKSH_A_UNUSED)
while (i < nwords) { while (i < nwords) {
if (x_escape(words[i], strlen(words[i]), x_do_ins) < 0 || if (x_escape(words[i], strlen(words[i]), x_do_ins) < 0 ||
(++i < nwords && x_ins(T1space) < 0)) { (++i < nwords && x_ins(T1space) < 0)) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
} }
@ -2744,7 +2744,7 @@ do_complete(
&start, &end, &words); &start, &end, &words);
/* no match */ /* no match */
if (nwords == 0) { if (nwords == 0) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return; return;
} }
if (type == CT_LIST) { if (type == CT_LIST) {
@ -2920,7 +2920,7 @@ x_e_putc2(int c)
} else } else
x_putc(c); x_putc(c);
switch (c) { switch (c) {
case 7: case KSH_BEL:
break; break;
case '\r': case '\r':
case '\n': case '\n':
@ -2960,7 +2960,7 @@ x_e_putc3(const char **cp)
x_putc(c); x_putc(c);
} }
switch (c) { switch (c) {
case 7: case KSH_BEL:
break; break;
case '\r': case '\r':
case '\n': case '\n':
@ -3014,7 +3014,7 @@ x_set_arg(int c)
} }
if (c < 0 || first) { if (c < 0 || first) {
x_set_arg_too_big: x_set_arg_too_big:
x_e_putc2(7); x_e_putc2(KSH_BEL);
x_arg = 1; x_arg = 1;
x_arg_defaulted = true; x_arg_defaulted = true;
} else { } else {
@ -3033,7 +3033,7 @@ x_comment(int c MKSH_A_UNUSED)
int ret = x_do_comment(xbuf, xend - xbuf, &len); int ret = x_do_comment(xbuf, xend - xbuf, &len);
if (ret < 0) if (ret < 0)
x_e_putc2(7); x_e_putc2(KSH_BEL);
else { else {
x_modified(); x_modified();
xep = xbuf + len; xep = xbuf + len;
@ -3084,7 +3084,7 @@ x_edit_line(int c MKSH_A_UNUSED)
{ {
if (x_arg_defaulted) { if (x_arg_defaulted) {
if (xep == xbuf) { if (xep == xbuf) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
if (modified) { if (modified) {
@ -3139,7 +3139,7 @@ x_prev_histword(int c MKSH_A_UNUSED)
last_arg = x_arg_defaulted ? -1 : x_arg; last_arg = x_arg_defaulted ? -1 : x_arg;
xhp = histptr - (m - 1); xhp = histptr - (m - 1);
if ((xhp < history) || !(cp = *xhp)) { if ((xhp < history) || !(cp = *xhp)) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
x_modified(); x_modified();
return (KSTD); return (KSTD);
} }
@ -3227,7 +3227,7 @@ x_fold_case(int c)
char *cp = xcp; char *cp = xcp;
if (cp == xep) { if (cp == xep) {
x_e_putc2(7); x_e_putc2(KSH_BEL);
return (KSTD); return (KSTD);
} }
while (x_arg--) { while (x_arg--) {
@ -5480,7 +5480,7 @@ vi_error(void)
{ {
/* Beem out of any macros as soon as an error occurs */ /* Beem out of any macros as soon as an error occurs */
vi_macro_reset(); vi_macro_reset();
x_putc(7); x_putc(KSH_BEL);
x_flush(); x_flush();
} }
@ -5605,7 +5605,7 @@ x_eval_region(int c MKSH_A_UNUSED)
if (cp == NULL) { if (cp == NULL) {
/* command cannot be parsed */ /* command cannot be parsed */
x_eval_region_err: x_eval_region_err:
x_e_putc2(7); x_e_putc2(KSH_BEL);
x_redraw('\r'); x_redraw('\r');
return (KSTD); return (KSTD);
} }

12
misc.c
View File

@ -30,7 +30,7 @@
#include <grp.h> #include <grp.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.264 2017/04/28 00:38:31 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.265 2017/04/28 00:49:33 tg Exp $");
#define KSH_CHVT_FLAG #define KSH_CHVT_FLAG
#ifdef MKSH_SMALL #ifdef MKSH_SMALL
@ -1146,7 +1146,7 @@ print_value_quoted(struct shf *shf, const char *s)
++p; ++p;
switch (c) { switch (c) {
/* see unbksl() in this file for comments */ /* see unbksl() in this file for comments */
case 7: case KSH_BEL:
c = 'a'; c = 'a';
if (0) if (0)
/* FALLTHROUGH */ /* FALLTHROUGH */
@ -2135,13 +2135,7 @@ unbksl(bool cstyle, int (*fg)(void), void (*fp)(int))
fc = (*fg)(); fc = (*fg)();
switch (fc) { switch (fc) {
case 'a': case 'a':
/* wc = KSH_BEL;
* according to the comments in pdksh, \007 seems
* to be more portable than \a (due to HP-UX cc,
* Ultrix cc, old pcc, etc.) so we avoid the escape
* sequence altogether in mksh and assume ASCII
*/
wc = 7;
break; break;
case 'b': case 'b':
wc = '\b'; wc = '\b';

25
sh.h
View File

@ -175,7 +175,7 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.820 2017/04/28 00:38:32 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.821 2017/04/28 00:49:33 tg Exp $");
#endif #endif
#define MKSH_VERSION "R55 2017/04/27" #define MKSH_VERSION "R55 2017/04/27"
@ -487,6 +487,17 @@ extern int __cdecl setegid(gid_t);
#define ISTRIP 0 #define ISTRIP 0
#endif #endif
#ifdef MKSH_EBCDIC
#define KSH_BEL '\a'
#else
/*
* According to the comments in pdksh, \007 seems to be more portable
* than \a (HP-UX cc, Ultrix cc, old pcc, etc.) so we avoid the escape
* sequence if ASCII can be assumed.
*/
#define KSH_BEL 7
#endif
/* some useful #defines */ /* some useful #defines */
#ifdef EXTERN #ifdef EXTERN
@ -508,9 +519,12 @@ extern int __cdecl setegid(gid_t);
* *
* MAGIC can be followed by MAGIC (to escape the octet itself) or one of: * MAGIC can be followed by MAGIC (to escape the octet itself) or one of:
* ' !)*,-?[]{|}' 0x80|' !*+?@' (probably… hysteric raisins abound) * ' !)*,-?[]{|}' 0x80|' !*+?@' (probably… hysteric raisins abound)
*
* The |0x80 is likely unsafe on EBCDIC :( though the listed chars are
* low-bit7 at least on cp1047 so YMMV
*/ */
#define MAGIC (7) /* prefix for *?[!{,} during expand */ #define MAGIC KSH_BEL /* prefix for *?[!{,} during expand */
#define ISMAGIC(c) ((unsigned char)(c) == MAGIC) #define ISMAGIC(c) (ord(c) == ord(MAGIC))
EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */ EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
@ -665,6 +679,11 @@ im_sorry_dave(void)
#define MKSH_S_NOVI 0 #define MKSH_S_NOVI 0
#endif #endif
#ifdef MKSH_EBCDIC
#undef MKSH_S_NOVI
#define MKSH_S_NOVI 1
#endif
#if defined(MKSH_NOPROSPECTOFWORK) && !defined(MKSH_UNEMPLOYED) #if defined(MKSH_NOPROSPECTOFWORK) && !defined(MKSH_UNEMPLOYED)
#define MKSH_UNEMPLOYED 1 #define MKSH_UNEMPLOYED 1
#endif #endif