circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-06-02 20:01:18 +01:00
parent 049ccb4a4b 7e501f1993
commit ebe866c378
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utf8.c
View File

@@ -161,14 +161,14 @@ utf8_from_data(const struct utf8_data *ud, utf8_char *uc)
m.data[1] = (offset >> 8) & 0xff; m.data[1] = (offset >> 8) & 0xff;
m.data[2] = (offset >> 16); m.data[2] = (offset >> 16);
} }
*uc = m.uc; *uc = htonl(m.uc);
return (UTF8_DONE); return (UTF8_DONE);
fail: fail:
if (ud->width == 1) if (ud->width == 1)
*uc = utf8_space1.uc; *uc = htonl(utf8_space1.uc);
else else
*uc = utf8_space2.uc; *uc = htonl(utf8_space2.uc);
return (UTF8_ERROR); return (UTF8_ERROR);
} }
@@ -176,7 +176,7 @@ fail:
void void
utf8_to_data(utf8_char uc, struct utf8_data *ud) utf8_to_data(utf8_char uc, struct utf8_data *ud)
{ {
union utf8_map m = { .uc = uc }; union utf8_map m = { .uc = ntohl(uc) };
struct utf8_item *ui; struct utf8_item *ui;
u_int offset; u_int offset;
@@ -209,7 +209,7 @@ utf8_build_one(char c, u_int width)
if (width == 2) if (width == 2)
m.flags |= UTF8_FLAG_WIDTH2; m.flags |= UTF8_FLAG_WIDTH2;
return (m.uc); return (htonl(m.uc));
} }
/* Set a single character. */ /* Set a single character. */