diff options
| author | Vaclav Dolezal | 2017-12-21 15:23:56 +0100 |
|---|---|---|
| committer | Vaclav Dolezal | 2017-12-22 12:32:36 +0100 |
| commit | 2ba65f379d2c57b87700192b37a0451a3820594e (patch) | |
| tree | 476e9ce427704524b2a543f647dfe0485c25cc2a /lib | |
| parent | lib/mbsalign: encode \x to \xecx (diff) | |
| download | kernel-qcow2-util-linux-2ba65f379d2c57b87700192b37a0451a3820594e.tar.gz kernel-qcow2-util-linux-2ba65f379d2c57b87700192b37a0451a3820594e.tar.xz kernel-qcow2-util-linux-2ba65f379d2c57b87700192b37a0451a3820594e.zip | |
lib/mbsalign: escape "\x" when HAVE_WIDECHAR not defined
Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mbsalign.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/mbsalign.c b/lib/mbsalign.c index 07fc313b8..3959d46dd 100644 --- a/lib/mbsalign.c +++ b/lib/mbsalign.c @@ -223,6 +223,9 @@ char *mbs_invalid_encode_to_buffer(const char *s, size_t *width, char *buf) #ifdef HAVE_WIDECHAR wchar_t wc; size_t len = mbrtowc(&wc, p, MB_CUR_MAX, &st); +#else + size_t len = 1; +#endif if (len == 0) break; /* end of string */ @@ -251,10 +254,6 @@ char *mbs_invalid_encode_to_buffer(const char *s, size_t *width, char *buf) *width += wcwidth(wc); } p += len; -#else - *r++ = *p++; - (*width)++; -#endif } *r = '\0'; |