|
a/src/utils/rclutil.cpp |
|
b/src/utils/rclutil.cpp |
|
... |
|
... |
| 162 |
|
162 |
|
| 163 |
// Printable url: this is used to transcode from the system charset
|
163 |
// Printable url: this is used to transcode from the system charset
|
| 164 |
// into either utf-8 if transcoding succeeds, or url-encoded
|
164 |
// into either utf-8 if transcoding succeeds, or url-encoded
|
| 165 |
bool printableUrl(const string& fcharset, const string& in, string& out)
|
165 |
bool printableUrl(const string& fcharset, const string& in, string& out)
|
| 166 |
{
|
166 |
{
|
|
|
167 |
#ifdef _WIN32
|
|
|
168 |
// On windows our paths are always utf-8
|
|
|
169 |
out = in;
|
|
|
170 |
#else
|
| 167 |
int ecnt = 0;
|
171 |
int ecnt = 0;
|
| 168 |
if (!transcode(in, out, fcharset, "UTF-8", &ecnt) || ecnt) {
|
172 |
if (!transcode(in, out, fcharset, "UTF-8", &ecnt) || ecnt) {
|
| 169 |
out = url_encode(in, 7);
|
173 |
out = url_encode(in, 7);
|
| 170 |
}
|
174 |
}
|
|
|
175 |
#endif
|
| 171 |
return true;
|
176 |
return true;
|
| 172 |
}
|
177 |
}
|
| 173 |
|
178 |
|
| 174 |
string url_gpathS(const string& url)
|
179 |
string url_gpathS(const string& url)
|
| 175 |
{
|
180 |
{
|