mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-02 03:52:49 -05:00
Whitespace rationalisation of entire code base.
The number of people has been steadily increasing who read our source
code with an editor that thinks tab stops are 4 spaces apart, as
opposed to the traditional tty-derived 8 that the PuTTY code expects.
So I've been wondering for ages about just fixing it, and switching to
a spaces-only policy throughout the code. And I recently found out
about 'git blame -w', which should make this change not too disruptive
for the purposes of source-control archaeology; so perhaps now is the
time.
While I'm at it, I've also taken the opportunity to remove all the
trailing spaces from source lines (on the basis that git dislikes
them, and is the only thing that seems to have a strong opinion one
way or the other).
Apologies to anyone downstream of this code who has complicated patch
sets to rebase past this change. I don't intend it to be needed again.
This commit is contained in:
Simon Tatham
224
unix/uxucs.c
224
unix/uxucs.c
@ -22,76 +22,76 @@ bool is_dbcs_leadbyte(int codepage, char byte)
|
||||
}
|
||||
|
||||
int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen,
|
||||
wchar_t *wcstr, int wclen)
|
||||
wchar_t *wcstr, int wclen)
|
||||
{
|
||||
if (codepage == DEFAULT_CODEPAGE) {
|
||||
int n = 0;
|
||||
mbstate_t state;
|
||||
int n = 0;
|
||||
mbstate_t state;
|
||||
|
||||
memset(&state, 0, sizeof state);
|
||||
memset(&state, 0, sizeof state);
|
||||
|
||||
while (mblen > 0) {
|
||||
size_t i = mbrtowc(wcstr+n, mbstr, (size_t)mblen, &state);
|
||||
if (i == (size_t)-1 || i == (size_t)-2)
|
||||
break;
|
||||
n++;
|
||||
mbstr += i;
|
||||
mblen -= i;
|
||||
}
|
||||
while (mblen > 0) {
|
||||
size_t i = mbrtowc(wcstr+n, mbstr, (size_t)mblen, &state);
|
||||
if (i == (size_t)-1 || i == (size_t)-2)
|
||||
break;
|
||||
n++;
|
||||
mbstr += i;
|
||||
mblen -= i;
|
||||
}
|
||||
|
||||
return n;
|
||||
return n;
|
||||
} else if (codepage == CS_NONE) {
|
||||
int n = 0;
|
||||
int n = 0;
|
||||
|
||||
while (mblen > 0) {
|
||||
wcstr[n] = 0xD800 | (mbstr[0] & 0xFF);
|
||||
n++;
|
||||
mbstr++;
|
||||
mblen--;
|
||||
}
|
||||
while (mblen > 0) {
|
||||
wcstr[n] = 0xD800 | (mbstr[0] & 0xFF);
|
||||
n++;
|
||||
mbstr++;
|
||||
mblen--;
|
||||
}
|
||||
|
||||
return n;
|
||||
return n;
|
||||
} else
|
||||
return charset_to_unicode(&mbstr, &mblen, wcstr, wclen, codepage,
|
||||
NULL, NULL, 0);
|
||||
return charset_to_unicode(&mbstr, &mblen, wcstr, wclen, codepage,
|
||||
NULL, NULL, 0);
|
||||
}
|
||||
|
||||
int wc_to_mb(int codepage, int flags, const wchar_t *wcstr, int wclen,
|
||||
char *mbstr, int mblen, const char *defchr,
|
||||
struct unicode_data *ucsdata)
|
||||
char *mbstr, int mblen, const char *defchr,
|
||||
struct unicode_data *ucsdata)
|
||||
{
|
||||
if (codepage == DEFAULT_CODEPAGE) {
|
||||
char output[MB_LEN_MAX];
|
||||
mbstate_t state;
|
||||
int n = 0;
|
||||
char output[MB_LEN_MAX];
|
||||
mbstate_t state;
|
||||
int n = 0;
|
||||
|
||||
memset(&state, 0, sizeof state);
|
||||
memset(&state, 0, sizeof state);
|
||||
|
||||
while (wclen > 0) {
|
||||
int i = wcrtomb(output, wcstr[0], &state);
|
||||
if (i == (size_t)-1 || i > n - mblen)
|
||||
break;
|
||||
memcpy(mbstr+n, output, i);
|
||||
n += i;
|
||||
wcstr++;
|
||||
wclen--;
|
||||
}
|
||||
while (wclen > 0) {
|
||||
int i = wcrtomb(output, wcstr[0], &state);
|
||||
if (i == (size_t)-1 || i > n - mblen)
|
||||
break;
|
||||
memcpy(mbstr+n, output, i);
|
||||
n += i;
|
||||
wcstr++;
|
||||
wclen--;
|
||||
}
|
||||
|
||||
return n;
|
||||
return n;
|
||||
} else if (codepage == CS_NONE) {
|
||||
int n = 0;
|
||||
while (wclen > 0 && n < mblen) {
|
||||
if (*wcstr >= 0xD800 && *wcstr < 0xD900)
|
||||
mbstr[n++] = (*wcstr & 0xFF);
|
||||
else if (defchr)
|
||||
mbstr[n++] = *defchr;
|
||||
wcstr++;
|
||||
wclen--;
|
||||
}
|
||||
return n;
|
||||
int n = 0;
|
||||
while (wclen > 0 && n < mblen) {
|
||||
if (*wcstr >= 0xD800 && *wcstr < 0xD900)
|
||||
mbstr[n++] = (*wcstr & 0xFF);
|
||||
else if (defchr)
|
||||
mbstr[n++] = *defchr;
|
||||
wcstr++;
|
||||
wclen--;
|
||||
}
|
||||
return n;
|
||||
} else {
|
||||
return charset_from_unicode(&wcstr, &wclen, mbstr, mblen, codepage,
|
||||
NULL, defchr?defchr:NULL, defchr?1:0);
|
||||
return charset_from_unicode(&wcstr, &wclen, mbstr, mblen, codepage,
|
||||
NULL, defchr?defchr:NULL, defchr?1:0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -119,13 +119,13 @@ bool init_ucs(struct unicode_data *ucsdata, char *linecharset,
|
||||
*/
|
||||
ucsdata->line_codepage = CS_NONE;
|
||||
if (utf8_override) {
|
||||
const char *s;
|
||||
if (((s = getenv("LC_ALL")) && *s) ||
|
||||
((s = getenv("LC_CTYPE")) && *s) ||
|
||||
((s = getenv("LANG")) && *s)) {
|
||||
if (strstr(s, "UTF-8"))
|
||||
ucsdata->line_codepage = CS_UTF8;
|
||||
}
|
||||
const char *s;
|
||||
if (((s = getenv("LC_ALL")) && *s) ||
|
||||
((s = getenv("LC_CTYPE")) && *s) ||
|
||||
((s = getenv("LANG")) && *s)) {
|
||||
if (strstr(s, "UTF-8"))
|
||||
ucsdata->line_codepage = CS_UTF8;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@ -133,7 +133,7 @@ bool init_ucs(struct unicode_data *ucsdata, char *linecharset,
|
||||
* specification in conf.
|
||||
*/
|
||||
if (ucsdata->line_codepage == CS_NONE)
|
||||
ucsdata->line_codepage = decode_codepage(linecharset);
|
||||
ucsdata->line_codepage = decode_codepage(linecharset);
|
||||
|
||||
/*
|
||||
* If line_codepage is _still_ CS_NONE, we assume we're using
|
||||
@ -143,64 +143,64 @@ bool init_ucs(struct unicode_data *ucsdata, char *linecharset,
|
||||
* fall back to using the D800 page.
|
||||
*/
|
||||
if (ucsdata->line_codepage == CS_NONE)
|
||||
ucsdata->line_codepage = font_charset;
|
||||
ucsdata->line_codepage = font_charset;
|
||||
|
||||
if (ucsdata->line_codepage == CS_NONE)
|
||||
ret = true;
|
||||
ret = true;
|
||||
|
||||
/*
|
||||
* Set up unitab_line, by translating each individual character
|
||||
* in the line codepage into Unicode.
|
||||
*/
|
||||
for (i = 0; i < 256; i++) {
|
||||
char c[1];
|
||||
char c[1];
|
||||
const char *p;
|
||||
wchar_t wc[1];
|
||||
int len;
|
||||
c[0] = i;
|
||||
p = c;
|
||||
len = 1;
|
||||
if (ucsdata->line_codepage == CS_NONE)
|
||||
ucsdata->unitab_line[i] = 0xD800 | i;
|
||||
else if (1 == charset_to_unicode(&p, &len, wc, 1,
|
||||
ucsdata->line_codepage,
|
||||
NULL, L"", 0))
|
||||
ucsdata->unitab_line[i] = wc[0];
|
||||
else
|
||||
ucsdata->unitab_line[i] = 0xFFFD;
|
||||
wchar_t wc[1];
|
||||
int len;
|
||||
c[0] = i;
|
||||
p = c;
|
||||
len = 1;
|
||||
if (ucsdata->line_codepage == CS_NONE)
|
||||
ucsdata->unitab_line[i] = 0xD800 | i;
|
||||
else if (1 == charset_to_unicode(&p, &len, wc, 1,
|
||||
ucsdata->line_codepage,
|
||||
NULL, L"", 0))
|
||||
ucsdata->unitab_line[i] = wc[0];
|
||||
else
|
||||
ucsdata->unitab_line[i] = 0xFFFD;
|
||||
}
|
||||
|
||||
/*
|
||||
* Set up unitab_xterm. This is the same as unitab_line except
|
||||
* in the line-drawing regions, where it follows the Unicode
|
||||
* encoding.
|
||||
*
|
||||
*
|
||||
* (Note that the strange X encoding of line-drawing characters
|
||||
* in the bottom 32 glyphs of ISO8859-1 fonts is taken care of
|
||||
* by the font encoding, which will spot such a font and act as
|
||||
* if it were in a variant encoding of ISO8859-1.)
|
||||
*/
|
||||
for (i = 0; i < 256; i++) {
|
||||
static const wchar_t unitab_xterm_std[32] = {
|
||||
0x2666, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1,
|
||||
0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
|
||||
0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
|
||||
0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x0020
|
||||
};
|
||||
static const wchar_t unitab_xterm_poorman[32] =
|
||||
L"*#****o~**+++++-----++++|****L. ";
|
||||
static const wchar_t unitab_xterm_std[32] = {
|
||||
0x2666, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1,
|
||||
0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
|
||||
0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
|
||||
0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x0020
|
||||
};
|
||||
static const wchar_t unitab_xterm_poorman[32] =
|
||||
L"*#****o~**+++++-----++++|****L. ";
|
||||
|
||||
const wchar_t *ptr;
|
||||
const wchar_t *ptr;
|
||||
|
||||
if (vtmode == VT_POORMAN)
|
||||
ptr = unitab_xterm_poorman;
|
||||
else
|
||||
ptr = unitab_xterm_std;
|
||||
if (vtmode == VT_POORMAN)
|
||||
ptr = unitab_xterm_poorman;
|
||||
else
|
||||
ptr = unitab_xterm_std;
|
||||
|
||||
if (i >= 0x5F && i < 0x7F)
|
||||
ucsdata->unitab_xterm[i] = ptr[i & 0x1F];
|
||||
else
|
||||
ucsdata->unitab_xterm[i] = ucsdata->unitab_line[i];
|
||||
if (i >= 0x5F && i < 0x7F)
|
||||
ucsdata->unitab_xterm[i] = ptr[i & 0x1F];
|
||||
else
|
||||
ucsdata->unitab_xterm[i] = ucsdata->unitab_line[i];
|
||||
}
|
||||
|
||||
/*
|
||||
@ -208,17 +208,17 @@ bool init_ucs(struct unicode_data *ucsdata, char *linecharset,
|
||||
* simply CP437.
|
||||
*/
|
||||
for (i = 0; i < 256; i++) {
|
||||
char c[1];
|
||||
char c[1];
|
||||
const char *p;
|
||||
wchar_t wc[1];
|
||||
int len;
|
||||
c[0] = i;
|
||||
p = c;
|
||||
len = 1;
|
||||
if (1 == charset_to_unicode(&p, &len, wc, 1, CS_CP437, NULL, L"", 0))
|
||||
ucsdata->unitab_scoacs[i] = wc[0];
|
||||
else
|
||||
ucsdata->unitab_scoacs[i] = 0xFFFD;
|
||||
wchar_t wc[1];
|
||||
int len;
|
||||
c[0] = i;
|
||||
p = c;
|
||||
len = 1;
|
||||
if (1 == charset_to_unicode(&p, &len, wc, 1, CS_CP437, NULL, L"", 0))
|
||||
ucsdata->unitab_scoacs[i] = wc[0];
|
||||
else
|
||||
ucsdata->unitab_scoacs[i] = 0xFFFD;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -229,12 +229,12 @@ bool init_ucs(struct unicode_data *ucsdata, char *linecharset,
|
||||
* used in this way will be IBM or MS code pages anyway.)
|
||||
*/
|
||||
for (i = 0; i < 256; i++) {
|
||||
int lineval = ucsdata->unitab_line[i];
|
||||
if (lineval < ' ' || (lineval >= 0x7F && lineval < 0xA0) ||
|
||||
(lineval >= 0xD800 && lineval < 0xD820) || (lineval == 0xD87F))
|
||||
ucsdata->unitab_ctrl[i] = i;
|
||||
else
|
||||
ucsdata->unitab_ctrl[i] = 0xFF;
|
||||
int lineval = ucsdata->unitab_line[i];
|
||||
if (lineval < ' ' || (lineval >= 0x7F && lineval < 0xA0) ||
|
||||
(lineval >= 0xD800 && lineval < 0xD820) || (lineval == 0xD87F))
|
||||
ucsdata->unitab_ctrl[i] = i;
|
||||
else
|
||||
ucsdata->unitab_ctrl[i] = 0xFF;
|
||||
}
|
||||
|
||||
return ret;
|
||||
@ -243,7 +243,7 @@ bool init_ucs(struct unicode_data *ucsdata, char *linecharset,
|
||||
const char *cp_name(int codepage)
|
||||
{
|
||||
if (codepage == CS_NONE)
|
||||
return "Use font encoding";
|
||||
return "Use font encoding";
|
||||
return charset_to_localenc(codepage);
|
||||
}
|
||||
|
||||
@ -255,7 +255,7 @@ const char *cp_enumerate(int index)
|
||||
/* "Use font encoding" comes after all the named charsets */
|
||||
if (charset_localenc_nth(index-1) != CS_NONE)
|
||||
return "Use font encoding";
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
return charset_to_localenc(charset);
|
||||
}
|
||||
@ -263,6 +263,6 @@ const char *cp_enumerate(int index)
|
||||
int decode_codepage(char *cp_name)
|
||||
{
|
||||
if (!cp_name || !*cp_name)
|
||||
return CS_UTF8;
|
||||
return CS_UTF8;
|
||||
return charset_from_localenc(cp_name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user