diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-04-24 20:13:18 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-04-24 20:13:18 +0200 |
| commit | 667010554b30c46e35b9cad62edcfa01e37e1576 (patch) | |
| tree | 418f828288c6c5c5ba0e6a18775af855966579f0 /sys/src/cmd/rc/lex.c | |
| parent | 78c7ba36a1a732c08fbb7e4f8b19d1bc825c5b7e (diff) | |
make all the commands agnostic about Rune width. (from sources)
Diffstat (limited to 'sys/src/cmd/rc/lex.c')
| -rw-r--r-- | sys/src/cmd/rc/lex.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/sys/src/cmd/rc/lex.c b/sys/src/cmd/rc/lex.c index 369348328..fecd0ec64 100644 --- a/sys/src/cmd/rc/lex.c +++ b/sys/src/cmd/rc/lex.c @@ -166,15 +166,25 @@ addtok(char *p, int val) char* addutf(char *p, int c) { - p = addtok(p, c); - if(twobyte(c)) /* 2-byte escape */ - return addtok(p, advance()); - if(threebyte(c)){ /* 3-byte escape */ + uchar b, m; + int i; + + p = addtok(p, c); /* 1-byte UTF runes are special */ + if(onebyte(c)) + return p; + + m = 0xc0; + b = 0x80; + for(i=1; i < UTFmax; i++){ + if((c&m) == b) + break; p = addtok(p, advance()); - return addtok(p, advance()); + b = m; + m = (m >> 1)|0x80; } return p; } + int lastdol; /* was the last token read '$' or '$#' or '"'? */ int lastword; /* was the last token read a word or compound word terminator? */ |