ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/mbsalign: encode \x to \xecx 

Don't encode stand alone '\', our encoding is about \x<hex>, so we
need to care about \x prefix only.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-12-20 13:01:43 +01:00
parent 760942e284
commit 43afa84581
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mbsalign.c
View File

@ -54,7 +54,8 @@ size_t mbs_safe_nwidth(const char *buf, size_t bufsz, size_t *sz)
last = p + (bufsz - 1);
while (p && *p && p <= last) {
if (*p == '\\' || iscntrl((unsigned char) *p)) {
if ((p < last && *p == '\\' && *(p + 1) == 'x')
|| iscntrl((unsigned char) *p)) {
width += 4, bytes += 4; /* *p encoded to \x?? */
p++;
}
@ -135,7 +136,8 @@ char *mbs_safe_encode_to_buffer(const char *s, size_t *width, char *buf, const c
continue;
}
if (*p == '\\' || iscntrl((unsigned char) *p)) {
if ((*p == '\\' && *(p + 1) == 'x')
|| iscntrl((unsigned char) *p)) {
sprintf(r, "\\x%02x", (unsigned char) *p);
r += 4;
*width += 4;
@ -239,6 +241,10 @@ char *mbs_invalid_encode_to_buffer(const char *s, size_t *width, char *buf)
(*width)++;
*r++ = *p;
}
} else if (*p == '\\' && *(p + 1) == 'x') {
sprintf(r, "\\x%02x", (unsigned char) *p);
r += 4;
*width += 4;
} else {
memcpy(r, p, len);
r += len;