1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
--- webalizer.c.a-urasim Wed Apr 17 07:11:31 2002
+++ webalizer.c Tue Dec 23 23:26:23 2003
@@ -39,6 +39,7 @@
#include <sys/utsname.h>
#include <sys/times.h>
#include <zlib.h>
+#include <iconv.h>
/* ensure getopt */
#ifdef HAVE_GETOPT_H
@@ -224,6 +225,8 @@
char *f_cp=f_buf+GZ_BUFSIZE; /* pointer into the buffer */
int f_end; /* count to end of buffer */
+iconv_t cd_from_sjis, cd_from_utf8;
+
/*********************************************/
/* MAIN - start here */
/*********************************************/
@@ -526,6 +529,9 @@
start_time = times(&mytms);
+ cd_from_sjis = iconv_open("EUC-JP", "Shift_JIS");
+ cd_from_utf8 = iconv_open("EUC-JP", "UTF-8");
+
/*********************************************/
/* MAIN PROCESS LOOP - read through log file */
/*********************************************/
@@ -1345,6 +1351,9 @@
if (dns_db) close_cache();
#endif
+ iconv_close(cd_from_sjis);
+ iconv_close(cd_from_utf8);
+
/* Whew, all done! Exit with completion status (0) */
exit(0);
}
@@ -1773,6 +1782,23 @@
if (!str) return NULL; /* make sure strings valid */
+ while(*cp1){ /* for apache log's escape code. */
+ if(*cp1 == '\\' && *(cp1+1) == 'x' &&
+ isxdigit(*(cp1+2)) && isxdigit(*(cp1+3))){
+ *cp2 = from_hex(*(cp1+2))*16 + from_hex(*(cp1+3));
+ if ((*cp2<32)||(*cp2==127)) *cp2='_';
+ cp1+=4; cp2++;
+
+ }
+ else if(*cp1 == '\\' && *(cp1+1) == '\\'){
+ *cp2++='\\';
+ cp1+=2;
+ }
+ else *cp2++ = *cp1++;
+ }
+ *cp2=*cp1;
+
+ cp1=cp2=str;
while (*cp1)
{
if (*cp1=='%') /* Found an escape? */
@@ -1783,7 +1809,7 @@
if (*cp1) *cp2=from_hex(*cp1++)*16; /* convert hex to an ascii */
if (*cp1) *cp2+=from_hex(*cp1); /* (hopefully) character */
if ((*cp2<32)||(*cp2==127)) *cp2='_'; /* make '_' if its bad */
- if (*cp1) cp2++; cp1++;
+ if (*cp1){ cp2++; cp1++;} /* bug? */
}
else *cp2++='%';
}
@@ -1793,6 +1819,116 @@
return str; /* return the string */
}
+int score_eucj(unsigned char *str)
+{
+ int stat=0;
+ int score=0;
+ int bad=0;
+ if(str==NULL) return -1;
+
+ for(; *str!=0;str++){
+ switch(stat){
+ case 0:
+ if(*str>= 0x20 && *str <= 0x7e) score++; //ASCII
+ else if(*str >= 0xa1 && *str <= 0xfe) stat=1; //KANJI(1)
+ else if(*str == 0x8f); // HOJYO KANJI
+ else if(*str == 0x8e) stat=2; // KANA
+ else if(*str < 0x20); //CTRL
+ else bad=1;
+ break;
+ case 1:
+ if(*str >= 0xa1 && *str <= 0xfe) score += 2; //KANJI(2)
+ else bad=1;
+ stat=0;
+ break;
+ case 2:
+ if(*str >= 0xa1 && *str <= 0xdf); //hankaku <- 0
+ else bad=1;
+ stat=0;
+ break;
+ }
+ }
+ if(bad != 0) score = -1;
+ return score;
+}
+
+int score_sjis(unsigned char *str)
+{
+ int stat=0;
+ int score=0;
+ int bad=0;
+ if(str==NULL) return -1;
+
+ for(; *str != 0; str++){
+ switch(stat){
+ case 0:
+ if(*str>= 0x20 && *str <= 0x7e) score++;//ASCII
+ else if((*str >= 0x81 && *str <= 0x9f) ||
+ (*str >= 0xe0 && *str <= 0xfc)) stat=1; //SJIS(1)
+ else if(*str >= 0xa1 && *str <= 0xdf); // KANA
+ else if(*str < 0x20); // CTRL
+ else bad=1;
+ break;
+ case 1:
+ if((*str >= 0x40 && *str <= 0x7e) ||
+ (*str >= 0x80 && *str <= 0xfc)) score += 2; //SJIS(2)
+ else bad=1;
+ stat=0;
+ break;
+ }
+ }
+ if(bad != 0) score = -1;
+ return score;
+}
+
+int score_utf8(unsigned char *str)
+{
+ int stat=0;
+ int score=0;
+ int bad=0;
+ if(str==NULL) return -1;
+
+ for(; *str != 0; str++){
+ switch(stat){
+ case 0:
+ if(*str>= 0x20 && *str <= 0x7e) score++; //ASCII
+ else if(*str >= 0xc0 && *str <= 0xdf) stat=1; //greek etc.
+ else if(*str >= 0xe0 && *str <= 0xef) stat=2; //KANJI etc.
+ else if(*str >= 0xf0 && *str <= 0xf7) stat=4;
+ else if(*str < 0x20); //CTRL
+ else bad=1;
+ break;
+ case 1:
+ if(*str >= 0x80 && *str <= 0xbf) score++;
+ else bad=1;
+ stat=0;
+ break;
+ case 2:
+ if(*str >= 0x80 && *str <= 0xbf) stat=3; //KANJI(2)
+ else {bad=1; stat=0;}
+ break;
+ case 3:
+ if(*str >= 0x80 && *str <= 0xbf) score+=3; //KANJI(3)
+ else bad=1;
+ stat=0;
+ break;
+ case 4:
+ case 5:
+ if(*str >= 0x80 && *str <= 0xbf) stat++;
+ else {bad=1; stat=0;}
+ break;
+ case 6:
+ if(*str >= 0x80 && *str <= 0xbf) score+=4;
+ else bad=1;
+ stat=0;
+ break;
+ }
+ }
+ if(bad != 0) score = -1;
+ return score;
+}
+
+
/*********************************************/
/* SRCH_STRING - get search strings from ref */
/*********************************************/
@@ -1804,6 +1940,10 @@
char srch[80]="";
unsigned char *cp1, *cp2, *cps;
int sp_flg=0;
+ int sjis, eucj, utf8;
+ char tmpbuf2[BUFSIZE];
+ size_t inlen, outlen;
+ unsigned char *cp3;
/* Check if search engine referrer or return */
if ( (cps=isinglist(search_list,log_rec.refer))==NULL) return;
@@ -1839,9 +1978,39 @@
cp1=cp2+strlen(cp2)-1;
while (cp1!=cp2) if (isspace(*cp1)) *cp1--='\0'; else break;
+ utf8=score_utf8(cp2);
+ sjis=score_sjis(cp2);
+ eucj=score_eucj(cp2);
+ if(utf8 >= sjis && utf8 >= eucj){
+ iconv(cd_from_utf8, NULL, 0, NULL, 0);
+ cp3 = cp2;
+ inlen = strlen(cp2)+1;
+ cp1 = tmpbuf2;
+ outlen = sizeof(tmpbuf2);
+ if(iconv(cd_from_utf8, (char **)&cp3, &inlen, (char**)&cp1, &outlen) >= 0 &&
+ inlen == 0){
+ cp2 = tmpbuf2;
+ }
+ }
+ else if(sjis > utf8 && sjis > eucj){
+ iconv(cd_from_sjis, NULL, 0, NULL, 0);
+ cp3 = cp2;
+ inlen = strlen(cp2)+1;
+ cp1 = tmpbuf2;
+ outlen = sizeof(tmpbuf2);
+ if(iconv(cd_from_sjis, (char **)&cp3, &inlen, (char**)&cp1, &outlen) >= 0 &&
+ inlen == 0){
+ cp2 = tmpbuf2;
+ }
+ }
+
/* strip invalid chars */
cp1=cp2;
- while (*cp1!=0) { if ((*cp1<32)||(*cp1==127)) *cp1='_'; cp1++; }
+ while (*cp1!=0) {
+ if ((*cp1<32)||(*cp1==127)) *cp1='_';
+ *cp1=tolower(*cp1);
+ cp1++;
+ }
if (put_snode(cp2,(u_long)1,sr_htab))
{
|
