projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce a new utility function smemclr(), which memsets things to
[u/mdw/putty]
/
unix
/
uxucs.c
diff --git
a/unix/uxucs.c
b/unix/uxucs.c
index
8359553
..
9d8242f
100644
(file)
--- a/
unix/uxucs.c
+++ b/
unix/uxucs.c
@@
-21,14
+21,14
@@
int is_dbcs_leadbyte(int codepage, char byte)
return 0; /* we don't do DBCS */
}
return 0; /* we don't do DBCS */
}
-int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
+int mb_to_wc(int codepage, int flags, c
onst c
har *mbstr, int mblen,
wchar_t *wcstr, int wclen)
{
if (codepage == DEFAULT_CODEPAGE) {
int n = 0;
wchar_t *wcstr, int wclen)
{
if (codepage == DEFAULT_CODEPAGE) {
int n = 0;
- mbstate_t state
= { 0 }
;
+ mbstate_t state;
-
setlocale(LC_CTYPE, ""
);
+
memset(&state, 0, sizeof state
);
while (mblen > 0) {
size_t i = mbrtowc(wcstr+n, mbstr, (size_t)mblen, &state);
while (mblen > 0) {
size_t i = mbrtowc(wcstr+n, mbstr, (size_t)mblen, &state);
@@
-39,8
+39,6
@@
int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
mblen -= i;
}
mblen -= i;
}
- setlocale(LC_CTYPE, "C");
-
return n;
} else if (codepage == CS_NONE) {
int n = 0;
return n;
} else if (codepage == CS_NONE) {
int n = 0;
@@
-58,7
+56,7
@@
int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
NULL, NULL, 0);
}
NULL, NULL, 0);
}
-int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
+int wc_to_mb(int codepage, int flags,
const
wchar_t *wcstr, int wclen,
char *mbstr, int mblen, char *defchr, int *defused,
struct unicode_data *ucsdata)
{
char *mbstr, int mblen, char *defchr, int *defused,
struct unicode_data *ucsdata)
{
@@
-68,10
+66,10
@@
int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
if (codepage == DEFAULT_CODEPAGE) {
char output[MB_LEN_MAX];
if (codepage == DEFAULT_CODEPAGE) {
char output[MB_LEN_MAX];
- mbstate_t state
= { 0 }
;
+ mbstate_t state;
int n = 0;
int n = 0;
-
setlocale(LC_CTYPE, ""
);
+
memset(&state, 0, sizeof state
);
while (wclen > 0) {
int i = wcrtomb(output, wcstr[0], &state);
while (wclen > 0) {
int i = wcrtomb(output, wcstr[0], &state);
@@
-83,8
+81,6
@@
int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
wclen--;
}
wclen--;
}
- setlocale(LC_CTYPE, "C");
-
return n;
} else if (codepage == CS_NONE) {
int n = 0;
return n;
} else if (codepage == CS_NONE) {
int n = 0;
@@
-137,7
+133,7
@@
int init_ucs(struct unicode_data *ucsdata, char *linecharset,
/*
* Failing that, line_codepage should be decoded from the
/*
* Failing that, line_codepage should be decoded from the
- * specification in c
fg
.
+ * specification in c
onf
.
*/
if (ucsdata->line_codepage == CS_NONE)
ucsdata->line_codepage = decode_codepage(linecharset);
*/
if (ucsdata->line_codepage == CS_NONE)
ucsdata->line_codepage = decode_codepage(linecharset);
@@
-160,7
+156,8
@@
int init_ucs(struct unicode_data *ucsdata, char *linecharset,
* in the line codepage into Unicode.
*/
for (i = 0; i < 256; i++) {
* in the line codepage into Unicode.
*/
for (i = 0; i < 256; i++) {
- char c[1], *p;
+ char c[1];
+ const char *p;
wchar_t wc[1];
int len;
c[0] = i;
wchar_t wc[1];
int len;
c[0] = i;
@@
-214,7
+211,8
@@
int init_ucs(struct unicode_data *ucsdata, char *linecharset,
* simply CP437.
*/
for (i = 0; i < 256; i++) {
* simply CP437.
*/
for (i = 0; i < 256; i++) {
- char c[1], *p;
+ char c[1];
+ const char *p;
wchar_t wc[1];
int len;
c[0] = i;
wchar_t wc[1];
int len;
c[0] = i;