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
|
--- src/hooks/msnhook.cc Fri Dec 13 00:17:12 2002
+++ src/hooks/msnhook.cc Sun Jan 5 02:02:44 2003
@@ -29,6 +29,7 @@
#include "accountmanager.h"
#include "eventmanager.h"
#include "imlogger.h"
+#include "utf8conv.h"
#include "msn_bittybits.h"
@@ -225,7 +226,8 @@
}
icqcontact *c = clist.get(ev.getcontact());
- text = siconv(text, conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET, "utf8");
+// text = siconv(text, conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET, "utf8");
+ text = StrToUtf8(text);
if(c)
if(c->getstatus() != offline || !c->inlist()) {
@@ -352,11 +354,11 @@
void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
string oldnick = c->getnick();
- string newnick = unmime(friendlynick);
+ string newnick = Utf8ToStr(unmime(friendlynick));
c->setnick(newnick);
- if(forcefetch || (oldnick != newnick && c->getdispnick() == oldnick) || oldnick.empty()) {
+ if(forcefetch || (oldnick != newnick && c->getdispnick() != newnick) || oldnick.empty()) {
c->setdispnick(newnick);
face.relaxedupdate();
}
@@ -556,7 +558,8 @@
mhook.checkinlist(ic);
- string text = siconv(msg->body, "utf8", conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET);
+// string text = siconv(msg->body, "utf8", conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET);
+ string text = Utf8ToStr(msg->body);
em.store(immessage(ic, imevent::incoming, text));
}
@@ -717,3 +720,138 @@
log(string("[OUT] ") + buf);
}
}
+
+#if HAVE_ICONV_H
+int safe_iconv( iconv_t handle, const char **inbuf, size_t *inbytesleft,
+ char **outbuf, size_t *outbytesleft)
+{
+ int ret;
+ while (*inbytesleft) {
+ ret = iconv( handle, inbuf, inbytesleft,
+ outbuf, outbytesleft);
+ if (!*inbytesleft || !*outbytesleft)
+ return ret;
+ /*got invalid seq - so replace it with '?' */
+ **outbuf = '?'; (*outbuf)++; (*outbytesleft)--;
+ (*inbuf)++; (*inbytesleft)--;
+ }
+ return ret;
+}
+
+const char* guess_current_locale_charset()
+{
+ char *lang, *ch;
+ /* Return previously learned charset */
+ if (loc_charset[0])
+ return loc_charset;
+
+ lang = getenv("LANG");
+ if (!lang) {
+ strcpy( loc_charset, DEFAULT_CHARSET );
+ return loc_charset;
+ };
+ ch = strrchr( lang, '.' );
+ if (!ch)
+ strcpy( loc_charset, DEFAULT_CHARSET );
+ else {
+ iconv_t pt;
+ ch++;
+ strncpy( loc_charset, ch, sizeof(loc_charset) );
+ /* try to open iconv handle using guessed charset */
+ if ( (pt = iconv_open( loc_charset, loc_charset )) == (iconv_t)(-1) )
+ {
+ strcpy( loc_charset, DEFAULT_CHARSET );
+ } else {
+ iconv_close(pt);
+ };
+
+ }
+
+ return loc_charset;
+}
+
+char *StrToUtf8( const char *inbuf )
+{
+ size_t length = strlen( inbuf );
+ size_t outmaxlength = UTF8_BUF_LENGTH;
+ char *outbuf = utf8_buf;
+ char *outbuf_save = outbuf;
+ int ret;
+
+ iconv_t handle = iconv_open( "utf-8", guess_current_locale_charset() );
+ if(((int) handle) != -1) {
+ ret = safe_iconv( handle, (const char **) &inbuf, &length, &outbuf, &outmaxlength );
+
+ *outbuf = '\0';
+ iconv_close( handle );
+ return outbuf_save;
+ } else {
+ return (char *)inbuf;
+ };
+}
+
+std::string StrToUtf8( const std::string &instr )
+{
+ size_t length = instr.length();
+ size_t outmaxlength = UTF8_BUF_LENGTH;
+ const char *inbuf = instr.c_str();
+ char *outbuf = utf8_buf;
+ char *outbuf_save = outbuf;
+ int ret;
+
+ iconv_t handle = iconv_open( "utf-8", guess_current_locale_charset() );
+ if(((int) handle) != -1) {
+ ret = safe_iconv( handle, (const char **) &inbuf, &length, &outbuf, &outmaxlength );
+
+ *outbuf = '\0';
+ iconv_close( handle );
+
+ std::string return_me = outbuf_save;
+ return return_me;
+ } else {
+ return instr;
+ };
+}
+
+char *Utf8ToStr( const char *inbuf )
+{
+ size_t length = strlen( inbuf );
+ size_t outmaxlength = UTF8_BUF_LENGTH / 4;
+ char *outbuf = utf8_buf;
+ char *outbuf_save = outbuf;
+ int ret;
+
+ iconv_t handle = iconv_open( guess_current_locale_charset(), "utf-8" );
+ if(((int) handle) != -1) {
+ ret = safe_iconv( handle, (const char **) &inbuf, &length, &outbuf, &outmaxlength );
+ *outbuf = '\0';
+ iconv_close( handle );
+ return outbuf_save;
+ } else {
+ return (char *)inbuf;
+ };
+}
+
+std::string Utf8ToStr( const std::string &instr )
+{
+ size_t length = instr.length();
+ const char *inbuf = instr.c_str();
+ size_t outmaxlength = UTF8_BUF_LENGTH / 4;
+ char *outbuf = utf8_buf;
+ char *outbuf_save = outbuf;
+ int ret;
+
+ iconv_t handle = iconv_open( guess_current_locale_charset(), "utf-8" );
+
+ if(((int) handle) != -1) {
+ ret = safe_iconv( handle, (const char **) &inbuf, &length, &outbuf, &outmaxlength );
+ *outbuf = '\0';
+ iconv_close( handle );
+ std::string return_me = outbuf_save;
+ return return_me;
+ } else {
+ return instr;
+ };
+}
+#endif /* HAVE_ICONV_H */
+
|
