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

we absolutely require unambiguous mapping between EBCDIC and extended ASCII

Browse Source 
to be able to provide a global stronly monotonous order for comparisons and
bracket expression ranges
This commit is contained in:
tg
2017-05-03 21:50:33 +00:00
parent efa4d0d2cf
commit 01b0c107b5
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shf.c
View File

@ -25,7 +25,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.93 2017/05/03 17:51:06 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/shf.c,v 1.94 2017/05/03 21:50:33 tg Exp $");
/* flags to shf_emptybuf() */ /* flags to shf_emptybuf() */
#define EB_READSW 0x01 /* about to switch to reading */ #define EB_READSW 0x01 /* about to switch to reading */
@ -1234,7 +1234,7 @@ ebcdic_init(void)
{ {
int i = 256; int i = 256;
unsigned char t; unsigned char t;
bool mapcache[128]; bool mapcache[256];
while (i--) while (i--)
ebcdic_rtt_toascii[i] = i; ebcdic_rtt_toascii[i] = i;
@ -1251,6 +1251,16 @@ ebcdic_init(void)
i = 256; i = 256;
while (i--) { while (i--) {
t = ebcdic_rtt_toascii[i]; t = ebcdic_rtt_toascii[i];
/* ensure unique round-trip capable mapping */
if (mapcache[t]) {
write(2, "mksh: duplicate EBCDIC to ASCII mapping\n", 40);
exit(255);
}
/*
* since there are 256 input octets, this also ensures
* the other mapping direction is completely filled
*/
mapcache[t] = true;
/* fill the complete round-trip map */ /* fill the complete round-trip map */
ebcdic_rtt_fromascii[t] = i; ebcdic_rtt_fromascii[t] = i;
/* /*
@ -1264,14 +1274,9 @@ ebcdic_init(void)
* an unsigned int, and or the raw unconverted EBCDIC * an unsigned int, and or the raw unconverted EBCDIC
* values with 0x01000000 instead. * values with 0x01000000 instead.
*/ */
if (t < 0x80U) { if (t < 0x80U)
if (mapcache[t]) {
write(2, "mksh: duplicate EBCDIC to ASCII mapping\n", 40);
exit(255);
}
mapcache[t] = true;
ebcdic_map[i] = (unsigned short)ord(t); ebcdic_map[i] = (unsigned short)ord(t);
} else else
ebcdic_map[i] = (unsigned short)(0x100U | ord(i)); ebcdic_map[i] = (unsigned short)(0x100U | ord(i));
} }
if (ebcdic_rtt_toascii[0] || ebcdic_rtt_fromascii[0] || ebcdic_map[0]) { if (ebcdic_rtt_toascii[0] || ebcdic_rtt_fromascii[0] || ebcdic_map[0]) {