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
|
diff -u file.c.orig file.c
--- file.c.orig Thu Dec 7 22:41:39 2000
+++ file.c Thu Dec 7 23:04:23 2000
@@ -71,6 +71,10 @@
#ifdef JP_CHARSET
static char content_charset = '\0';
static char guess_charset(char *p);
+#ifdef NEW_FORM
+static char check_charset(char *p);
+static char check_accept_charset(char *p);
+#endif
char DocumentCode = '\0';
#endif
@@ -2545,61 +2549,68 @@
}
#ifdef NEW_FORM
-char *
-process_accept_charset(char *ac)
-{
- static Str temp = NULL;
- char *s = ac, *e;
#ifdef JP_CHARSET
- char res[2] = { '\0', '\0' };
-#endif
-
- while (*s) {
- while (*s && (IS_SPACE(*s) || *s == ',')) ++s;
- if (!*s) break;
- for (e = s ; *e && !(IS_SPACE(*e) || *e == ',') ; ++e);
-
- if (temp)
- Strclear(temp);
- else
- temp = Strnew();
-
- Strcat_charp_n(temp, s, e - s);
+char
+check_charset(char *s)
+{
+ switch (*s) {
+ case CODE_EUC:
+ case CODE_SJIS:
+ case CODE_JIS_n:
+ case CODE_JIS_m:
+ case CODE_JIS_N:
+ case CODE_JIS_j:
+ case CODE_JIS_J:
+ case CODE_INNER_EUC:
+ return *s;
+ }
+ return 0;
+}
-#ifdef JP_CHARSET
- if ((res[0] = guess_charset(temp->ptr)))
- return Strnew_charp(res)->ptr;
-#else
- if (strcasecmp(temp->ptr, "us-ascii") ||
- strcasecmp(temp->ptr, "iso-8859-1"))
-#endif
- return Strnew_charp(temp->ptr)->ptr;
+char
+check_accept_charset(char *s)
+{
+ char *e;
+ char c;
+ while (*s) {
+ while (*s && (IS_SPACE(*s) || *s == ','))
+ s++;
+ if (!*s)
+ break;
+ e = s;
+ while (*e && !(IS_SPACE(*e) || *e == ','))
+ e++;
+ c = guess_charset(Strnew_charp_n(s, e - s)->ptr);
+ if (c)
+ return c;
s = e;
}
-
- return NULL;
+ return 0;
}
+#endif
Str
process_form(struct parsed_tag *tag)
{
- char *p, *q, *r, *s, *acs, *tg;
+ char *p, *q, *r, *s, *tg;
+ char cs = 0;
p = "get";
parsedtag_get_value(tag, ATTR_METHOD, &p);
q = "!CURRENT_URL!";
parsedtag_get_value(tag, ATTR_ACTION, &q);
r = NULL;
- parsedtag_get_value(tag, ATTR_CHARSET, &r);
- acs = NULL;
- if (parsedtag_get_value(tag, ATTR_ACCEPT_CHARSET, &acs))
- acs = process_accept_charset(acs);
+#ifdef JP_CHARSET
+ if (parsedtag_get_value(tag, ATTR_ACCEPT_CHARSET, &r))
+ cs = check_accept_charset(r);
+ if (! cs && parsedtag_get_value(tag, ATTR_CHARSET, &r))
+ cs = check_charset(r);
+#endif
s = NULL;
parsedtag_get_value(tag, ATTR_ENCTYPE, &s);
tg = NULL;
parsedtag_get_value(tag, ATTR_TARGET, &tg);
- if (!r) r = acs;
form_max++;
form_sp++;
if (forms_size == 0) {
@@ -2611,7 +2622,7 @@
forms = New_Reuse(FormList *, forms, forms_size);
}
forms[form_max] =
- newFormList(q, p, r, s, tg, (form_max > 0) ? forms[form_max - 1] : NULL);
+ newFormList(q, p, &cs, s, tg, (form_max > 0) ? forms[form_max - 1] : NULL);
form_stack[form_sp] = form_max;
return NULL;
@@ -3515,6 +3526,7 @@
Anchor *a_href = NULL, *a_img = NULL, *a_form = NULL;
char outc[LINELEN];
char *p, *q, *r, *str;
+ char cs;
Lineprop outp[LINELEN], mode, effect;
int pos;
int nlines;
@@ -3731,13 +3743,16 @@
case HTML_FORM_INT:
p = "get";
q = "/";
- r = NULL;
s = NULL;
+ cs = 0;
parsedtag_get_value(tag, ATTR_METHOD, &p);
parsedtag_get_value(tag, ATTR_ACTION, &q);
- parsedtag_get_value(tag, ATTR_CHARSET, &r);
+#ifdef JP_CHARSET
+ if (parsedtag_get_value(tag, ATTR_CHARSET, &r))
+ cs = check_charset(r);
+#endif
parsedtag_get_value(tag, ATTR_ENCTYPE, &s);
- buf->formlist = newFormList(q, p, r, s, buf->formlist);
+ buf->formlist = newFormList(q, p, &cs, s, buf->formlist);
form_sp++;
form_stack[form_sp] = buf->formlist;
break;
|
