diff options
| author | Russ Cox <russcox@gmail.com> | 2009-09-11 17:03:06 -0400 |
|---|---|---|
| committer | Russ Cox <russcox@gmail.com> | 2009-09-11 17:03:06 -0400 |
| commit | 0cadb4301d18724e7513d7489cb5bebd262c82f1 (patch) | |
| tree | 48209a4083885288eaa09178d4017769897107b3 /src/cmd/sam | |
| parent | 4dbf255619efac4f0a00e4216d6c999128910df2 (diff) | |
| download | plan9port-0cadb4301d18724e7513d7489cb5bebd262c82f1.tar.gz plan9port-0cadb4301d18724e7513d7489cb5bebd262c82f1.tar.bz2 plan9port-0cadb4301d18724e7513d7489cb5bebd262c82f1.zip | |
convert to 4-byte UTF-8 and 32-bit Rune
http://codereview.appspot.com/116075
Diffstat (limited to 'src/cmd/sam')
| -rw-r--r-- | src/cmd/sam/cmd.c | 2 | ||||
| -rw-r--r-- | src/cmd/sam/regexp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/sam/cmd.c b/src/cmd/sam/cmd.c index cdf00b9b..12510689 100644 --- a/src/cmd/sam/cmd.c +++ b/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/src/cmd/sam/regexp.c b/src/cmd/sam/regexp.c index 3477baef..3234d731 100644 --- a/src/cmd/sam/regexp.c +++ b/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; |