diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-12-31 21:09:46 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-12-31 21:09:46 +0100 |
| commit | 6cadd03bbeace1c256ba875c2e6a877f924877cd (patch) | |
| tree | 8079ea6f6ccdb1c2cbb2b7813f618837617cb33e /sys/src/cmd/sam | |
| parent | 6d99096136278f06f6333f927da34105a8dfe0bf (diff) | |
fix utf and rune handling in preparation for 32bit runes
Diffstat (limited to 'sys/src/cmd/sam')
| -rw-r--r-- | sys/src/cmd/sam/cmd.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/sam/regexp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/src/cmd/sam/cmd.c b/sys/src/cmd/sam/cmd.c index d34333d18..a0e336f01 100644 --- a/sys/src/cmd/sam/cmd.c +++ b/sys/src/cmd/sam/cmd.c @@ -71,7 +71,7 @@ int inputc(void) { int n, nbuf; - char buf[3]; + char buf[UTFmax]; Rune r; Again: diff --git a/sys/src/cmd/sam/regexp.c b/sys/src/cmd/sam/regexp.c index 3fd05a0b5..4c655dda3 100644 --- a/sys/src/cmd/sam/regexp.c +++ b/sys/src/cmd/sam/regexp.c @@ -494,7 +494,7 @@ bldcclass(void) exprp++; /* eat '-' */ if((c2 = nextrec()) == ']') goto Error; - classp[n+0] = 0xFFFF; + classp[n+0] = Runemax; classp[n+1] = c1; classp[n+2] = c2; n += 3; @@ -516,7 +516,7 @@ classmatch(int classno, int c, int negate) p = class[classno]; while(*p){ - if(*p == 0xFFFF){ + if(*p == Runemax){ if(p[1]<=c && c<=p[2]) return !negate; p += 3; |