From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Thu, 21 Dec 2017 14:23:56 +0000 (+0100)
Subject: lib/mbsalign: escape "\x" when HAVE_WIDECHAR not defined
X-Git-Tag: v2.32-rc1~99^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ba65f379d2c57b87700192b37a0451a3820594e;p=thirdparty%2Futil-linux.git

lib/mbsalign: escape "\x" when HAVE_WIDECHAR not defined

Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
---

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index 07fc313b84..3959d46ddf 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';