o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use plan 9 versions

Browse source
This commit is contained in:
rsc 2005-03-09 17:12:40 +00:00
parent 3e635a65b4
commit 7551b2ec8b
2 changed files with 54 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/tcs/tcs.c
View file

@ -984,7 +984,7 @@ long tab8859_15[256] = /* from anyrhine@cs.helsinki.fi (Aki Nyrhinen) */
0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
0xa0,0xa1,0xa2,0xa3,0x20a0,0xa5,0x0160,0xa7,0x0161,0xa9,0xaa,0xab,0xac,0xad,
0xa0,0xa1,0xa2,0xa3,0x20ac,0xa5,0x0160,0xa7,0x0161,0xa9,0xaa,0xab,0xac,0xad,
0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0x017d,0xb5,0xb6,0xb7,0x017e,0xb9,0xba,0xbb,
0x0152,0x0153,0x0178,0xbf,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,
0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,

202
src/cmd/tcs/utf.c
View file

@ -20,13 +20,6 @@
unsigned char.
*/
#ifdef PLAN9
long getrune(Biobuf *);
long getisorune(Biobuf *);
#else
long getrune(FILE *);
long getisorune(FILE *);
#endif
int our_wctomb(char *s, unsigned long wc);
int our_mbtowc(unsigned long *p, char *s, unsigned n);
int runetoisoutf(char *str, Rune *rune);
@ -36,51 +29,37 @@ int isochartorune(Rune *rune, char *str);
void
utf_in(int fd, long *notused, struct convert *out)
{
#ifndef PLAN9
FILE *fp;
#else /* PLAN9 */
Biobuf b;
#endif /* PLAN9 */
Rune *r;
long l;
char buf[N];
int i, j, c, n, tot;
ulong l;
USED(notused);
#ifndef PLAN9
if((fp = fdopen(fd, "r")) == NULL){
EPR "%s: input setup error: %s\n", argv0, strerror(errno));
#else /* PLAN9 */
if(Binit(&b, fd, OREAD) < 0){
EPR "%s: input setup error: %r\n", argv0);
#endif /* PLAN9 */
EXIT(1, "input error");
}
r = runes;
for(;;)
#ifndef PLAN9
switch(l = getrune(fp))
#else /* PLAN9 */
switch(l = getrune(&b))
#endif /* PLAN9 */
{
case -1:
goto done;
case -2:
if(squawk)
EPR "%s: bad UTF sequence near byte %ld in input\n", argv0, ninput);
if(clean)
continue;
nerrors++;
l = Runeerror;
default:
*r++ = l;
if(r >= &runes[N]){
OUT(out, runes, r-runes);
r = runes;
tot = 0;
while((n = read(fd, buf+tot, N-tot)) >= 0){
tot += n;
for(i=j=0; i<tot; ){
c = our_mbtowc(&l, buf+i, tot-i);
if(c == -1)
break;
if(c == -2){
if(squawk)
EPR "%s: bad UTF sequence near byte %ld in input\n", argv0, ninput+i);
if(clean)
continue;
nerrors++;
l = Runeerror;
}
runes[j++] = l;
i += c;
}
done:
if(r > runes)
OUT(out, runes, r-runes);
OUT(out, runes, j);
tot -= i;
ninput += i;
if(tot)
memmove(buf, buf+i, tot);
if(n == 0)
break;
}
}
void
@ -101,51 +80,35 @@ utf_out(Rune *base, int n, long *notused)
void
isoutf_in(int fd, long *notused, struct convert *out)
{
#ifndef PLAN9
FILE *fp;
#else /* PLAN9 */
Biobuf b;
#endif /* PLAN9 */
Rune *r;
long l;
char buf[N];
int i, j, c, n, tot;
USED(notused);
#ifndef PLAN9
if((fp = fdopen(fd, "r")) == 0){
EPR "%s: input setup error: %s\n", argv0, strerror(errno));
#else /* PLAN9 */
if(Binit(&b, fd, OREAD) < 0){
EPR "%s: input setup error: %r\n", argv0);
#endif /* PLAN9 */
EXIT(1, "input error");
}
r = runes;
for(;;)
#ifndef PLAN9
switch(l = getisorune(fp))
#else /* PLAN9 */
switch(l = getisorune(&b))
#endif /* PLAN9 */
{
case -1:
goto done;
case -2:
if(squawk)
EPR "%s: bad UTF sequence near byte %ld in input\n", argv0, ninput);
if(clean)
continue;
nerrors++;
l = Runeerror;
default:
*r++ = l;
if(r >= &runes[N]){
OUT(out, runes, r-runes);
r = runes;
tot = 0;
while((n = read(fd, buf+tot, N-tot)) >= 0){
tot += n;
for(i=j=0; i<tot; ){
if(!fullisorune(buf+i, tot-i))
break;
c = isochartorune(&runes[j], buf+i);
if(runes[j] == Runeerror){
if(squawk)
EPR "%s: bad UTF sequence near byte %ld in input\n", argv0, ninput+i);
if(clean)
continue;
nerrors++;
}
j++;
i += c;
}
done:
if(r > runes)
OUT(out, runes, r-runes);
OUT(out, runes, j);
tot -= i;
ninput += i;
if(tot)
memmove(buf, buf+i, tot);
if(n == 0)
break;
}
}
void
@ -162,65 +125,6 @@ isoutf_out(Rune *base, int n, long *notused)
write(1, obuf, p-obuf);
}
long
#ifndef PLAN9
getrune(FILE *fp)
#else /* PLAN9 */
getrune(Biobuf *bp)
#endif /* PLAN9 */
{
int c, i;
char str[UTFmax]; /* MB_LEN_MAX really */
unsigned long l;
int n;
for(i = 0;;){
#ifndef PLAN9
c = getc(fp);
#else /* PLAN9 */
c = Bgetc(bp);
#endif /* PLAN9 */
if(c < 0)
return(c);
ninput++;
str[i++] = c;
n = our_mbtowc(&l, str, i);
if(n == -1)
return(-2);
if(n > 0)
return(l);
}
}
long
#ifndef PLAN9
getisorune(FILE *fp)
#else /* PLAN9 */
getisorune(Biobuf *bp)
#endif /* PLAN9 */
{
int c, i;
Rune rune;
char str[UTFmax]; /* MB_LEN_MAX really */
for(i = 0;;){
#ifndef PLAN9
c = getc(fp);
#else /* PLAN9 */
c = Bgetc(bp);
#endif /* PLAN9 */
if(c < 0)
return(c);
ninput++;
str[i++] = c;
if(fullisorune(str, i))
break;
}
isochartorune(&rune, str);
if(rune == Runeerror)
return -2;
return(rune);
}
enum
{
@ -343,7 +247,7 @@ runetoisoutf(char *str, Rune *rune)
* 000A0-000FF => A0; A0-FF
*/
if(c < Rune21) {
str[0] = (uchar)Char1;
str[0] = Char1;
str[1] = c;
return 2;
}