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

appease gcc

Browse source
This commit is contained in:
rsc 2005-08-11 02:34:29 +00:00
parent 75e12c22c3
commit bce0902a07
1 changed files with 47 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/cmd/file.c
View file

@ -958,18 +958,18 @@ isenglish(void)
vow = 0; vow = 0;
for(p="AEIOU"; *p; p++) { for(p="AEIOU"; *p; p++) {
vow += cfreq[*p]; vow += cfreq[(uchar)*p];
vow += cfreq[tolower(*p)]; vow += cfreq[tolower((uchar)*p)];
} }
comm = 0; comm = 0;
for(p="ETAION"; *p; p++) { for(p="ETAION"; *p; p++) {
comm += cfreq[*p]; comm += cfreq[(uchar)*p];
comm += cfreq[tolower(*p)]; comm += cfreq[tolower((uchar)*p)];
} }
rare = 0; rare = 0;
for(p="VJKQXZ"; *p; p++) { for(p="VJKQXZ"; *p; p++) {
rare += cfreq[*p]; rare += cfreq[(uchar)*p];
rare += cfreq[tolower(*p)]; rare += cfreq[tolower((uchar)*p)];
} }
if(vow*5 >= nbuf-cfreq[' '] && comm >= 10*rare) { if(vow*5 >= nbuf-cfreq[' '] && comm >= 10*rare) {
print(mime ? PLAIN : "English text\n"); print(mime ? PLAIN : "English text\n");
@ -1203,32 +1203,50 @@ ismsdos(void)
int int
iself(void) iself(void)
{ {
char *cpu[] = { /* NB: incomplete and arbitary list */ static char *cpu[] = { /* NB: incomplete and arbitary list */
[1] "WE32100", nil,
[2] "SPARC", /*1*/ "WE32100",
[3] "i386", /*2*/ "SPARC",
[4] "M68000", /*3*/ "i386",
[5] "M88000", /*4*/ "M68000",
[6] "i486", /*5*/ "M88000",
[7] "i860", /*6*/ "i486",
[8] "R3000", /*7*/ "i860",
[9] "S370", /*8*/ "R3000",
[10] "R4000", /*9*/ "S370",
[15] "HP-PA", /*10*/ "R4000",
[18] "sparc v8+", nil, nil, nil, nil,
[19] "i960", /*15*/ "HP-PA",
[20] "PPC-32", nil,
[21] "PPC-64", nil,
[40] "ARM", /*18*/ "sparc v8+",
[41] "Alpha", /*19*/ "i960",
[43] "sparc v9", /*20*/ "PPC-32",
[50] "IA-46", /*21*/ "PPC-64",
[62] "AMD64", nil, nil, nil, nil,
[75] "VAX", nil, nil, nil, nil, nil,
nil, nil, nil, nil, nil,
nil, nil, nil, nil,
/*40*/ "ARM",
/*41*/ "Alpha",
nil,
/*43*/ "sparc v9",
nil, nil,
nil, nil, nil, nil,
/*50*/ "IA-46",
nil, nil, nil, nil, nil,
nil, nil, nil, nil, nil,
nil,
/*62*/ "AMD64",
nil, nil, nil,
nil, nil, nil, nil, nil,
nil, nil, nil, nil,
/*75*/ "VAX",
}; };
if (memcmp(buf, "\x7fELF", 4) == 0){ if (memcmp(buf, "\0177ELF", 4) == 0){
/* gcc misparses \x7FELF as \x7FE L F */
if (!mime){ if (!mime){
int n = (buf[19] << 8) | buf[18]; int n = (buf[19] << 8) | buf[18];
char *p = "unknown"; char *p = "unknown";