about summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/btowc.c3
-rw-r--r--wcsmbs/mbrtowc.c12
-rw-r--r--wcsmbs/mbsnrtowcs.c12
-rw-r--r--wcsmbs/mbsrtowcs.c12
-rw-r--r--wcsmbs/wcrtomb.c11
-rw-r--r--wcsmbs/wcsnrtombs.c14
-rw-r--r--wcsmbs/wcsrtombs.c18
-rw-r--r--wcsmbs/wctob.c5
8 files changed, 56 insertions, 31 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index 268b1f2378..b627324738 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -61,7 +61,8 @@ btowc (c)
 					     &data, inbuf, &inbytes,
 					     &converted, 0);
   /* The conversion failed.  */
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT)
+  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+      && status != GCONV_EMPTY_INPUT)
     return WEOF;
 
   return *(wchar_t *)buf;
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 99bc5a4797..5a52b1dde1 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -28,7 +28,6 @@
 # define EILSEQ EINVAL
 #endif
 
-
 /* This is the private state used if PS is NULL.  */
 static mbstate_t state;
 
@@ -69,12 +68,15 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
      characters.  The output buffer must be large enough, otherwise the
      definition of MB_CUR_MAX is not correct.  All the other possible
      errors also must not happen.  */
-  assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT
-	  || status == GCONV_INCOMPLETE_INPUT);
+  assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+	  || status == GCONV_ILLEGAL_INPUT
+	  || status == GCONV_INCOMPLETE_INPUT
+	  || status == GCONV_FULL_OUTPUT);
 
-  if (status == GCONV_OK)
+  if (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+      || status == GCONV_FULL_OUTPUT)
     {
-      if (*(wchar_t *)data.outbuf == L'\0')
+      if (data.outbufavail > 0 && *(wchar_t *)data.outbuf == L'\0')
 	{
 	  /* The converted character is the NUL character.  */
 	  assert (mbsinit (data.statep));
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index ded15e4299..9787e97661 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -84,7 +84,8 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
 	}
       while (status == GCONV_FULL_OUTPUT);
 
-      if (status == GCONV_OK && ((wchar_t *) dst)[written - 1] == L'\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && buf[written - 1] == L'\0')
 	/* Don't count the NUL character in.  */
 	--result;
     }
@@ -105,7 +106,8 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
 
       /* We have to determine whether the last character converted
 	 is the NUL character.  */
-      if (status == GCONV_OK && ((wchar_t *) dst)[result - 1] == L'\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && ((wchar_t *) dst)[result - 1] == L'\0')
 	{
 	  assert (result > 0);
 	  assert (mbsinit (data.statep));
@@ -118,10 +120,12 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
 
   /* There must not be any problems with the conversion but illegal input
      characters.  */
-  assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT
+  assert (status == GCONV_OK || status != GCONV_EMPTY_INPUT
+	  || status == GCONV_ILLEGAL_INPUT
 	  || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT);
 
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT)
+  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+      && status != GCONV_EMPTY_INPUT)
     {
       result = (size_t) -1;
       __set_errno (EILSEQ);
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index d0af40fb54..0b5af9bab0 100644
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -76,7 +76,8 @@ __mbsrtowcs (dst, src, len, ps)
 	}
       while (status == GCONV_FULL_OUTPUT);
 
-      if (status == GCONV_OK && ((wchar_t *) dst)[written - 1] == L'\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && buf[written - 1] == L'\0')
 	/* Don't count the NUL character in.  */
 	--result;
     }
@@ -98,7 +99,8 @@ __mbsrtowcs (dst, src, len, ps)
 
       /* We have to determine whether the last character converted
 	 is the NUL character.  */
-      if (status == GCONV_OK && ((wchar_t *) dst)[result - 1] == L'\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && ((wchar_t *) dst)[result - 1] == L'\0')
 	{
 	  assert (result > 0);
 	  assert (mbsinit (data.statep));
@@ -111,10 +113,12 @@ __mbsrtowcs (dst, src, len, ps)
 
   /* There must not be any problems with the conversion but illegal input
      characters.  */
-  assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT
+  assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+	  || status == GCONV_ILLEGAL_INPUT
 	  || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT);
 
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT)
+  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+      && status != GCONV_EMPTY_INPUT)
     {
       result = (size_t) -1;
       __set_errno (EILSEQ);
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index d45ae444bb..dcc2ef67cd 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -70,7 +70,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
 						 &data, NULL, &inbytes,
 						 NULL, 1);
 
-      if (status == GCONV_OK)
+      if (status == GCONV_OK || status == GCONV_EMPTY_INPUT)
 	data.outbuf[data.outbufavail++] = '\0';
     }
   else
@@ -87,10 +87,13 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
      characters.  The output buffer must be large enough, otherwise the
      definition of MB_CUR_MAX is not correct.  All the other possible
      errors also must not happen.  */
-  assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT
-	  || status == GCONV_INCOMPLETE_INPUT);
+  assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+	  || status == GCONV_ILLEGAL_INPUT
+	  || status == GCONV_INCOMPLETE_INPUT
+	  || status == GCONV_FULL_OUTPUT);
 
-  if (status == GCONV_OK)
+  if (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+      || status == GCONV_FULL_OUTPUT)
     result = data.outbufavail;
   else
     {
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index 2dd9f7c17e..02770ce876 100644
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -54,7 +54,7 @@ __wcsnrtombs (dst, src, nwc, len, ps)
 
   if (nwc == 0)
     return 0;
-  inbytes_in = __wcsnlen (*src, nwc - 1) + 1;
+  inbytes_in = (__wcsnlen (*src, nwc - 1) + 1) * sizeof (wchar_t);
 
   /* Make sure we use the correct function.  */
   update_conversion_ptrs ();
@@ -85,7 +85,8 @@ __wcsnrtombs (dst, src, nwc, len, ps)
 	}
       while (status == GCONV_FULL_OUTPUT);
 
-      if (status == GCONV_OK && dst[data.outbufavail - 1] == '\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && buf[data.outbufavail - 1] == '\0')
 	/* Don't count the NUL character in.  */
 	--result;
     }
@@ -106,7 +107,8 @@ __wcsnrtombs (dst, src, nwc, len, ps)
 
       /* We have to determine whether the last character converted
 	 is the NUL character.  */
-      if (status == GCONV_OK && dst[data.outbufavail - 1] == '\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && dst[data.outbufavail - 1] == '\0')
 	{
 	  assert (data.outbufavail > 0);
 	  assert (mbsinit (data.statep));
@@ -119,10 +121,12 @@ __wcsnrtombs (dst, src, nwc, len, ps)
 
   /* There must not be any problems with the conversion but illegal input
      characters.  */
-  assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT
+  assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+	  || status == GCONV_ILLEGAL_INPUT
 	  || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT);
 
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT)
+  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+      && status != GCONV_EMPTY_INPUT)
     {
       result = (size_t) -1;
       __set_errno (EILSEQ);
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 35bb58e977..904a003840 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -55,7 +55,7 @@ __wcsrtombs (dst, src, len, ps)
   if (dst == NULL)
     {
       char buf[256];		/* Just an arbitrary value.  */
-      size_t inbytes_in = __wcslen (*src) + 1;
+      size_t inbytes_in = (__wcslen (*src) + 1) * sizeof (wchar_t);
       size_t inbytes = inbytes_in;
       const wchar_t *inbuf = *src;
       size_t written;
@@ -78,7 +78,8 @@ __wcsrtombs (dst, src, len, ps)
 	}
       while (status == GCONV_FULL_OUTPUT);
 
-      if (status == GCONV_OK && dst[data.outbufavail - 1] == '\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT)
+	  && buf[data.outbufavail - 1] == '\0')
 	/* Don't count the NUL character in.  */
 	--result;
     }
@@ -87,7 +88,8 @@ __wcsrtombs (dst, src, len, ps)
       /* This code is based on the safe assumption that all internal
 	 multi-byte encodings use the NUL byte only to mark the end
 	 of the string.  */
-      size_t inbytes_in = __wcsnlen (*src, len * MB_CUR_MAX) + 1;
+      size_t inbytes_in = ((__wcsnlen (*src, len * MB_CUR_MAX) + 1)
+			   * sizeof (wchar_t));
       size_t inbytes = inbytes_in;
 
       data.outbuf = dst;
@@ -100,7 +102,9 @@ __wcsrtombs (dst, src, len, ps)
 
       /* We have to determine whether the last character converted
 	 is the NUL character.  */
-      if (status == GCONV_OK && dst[data.outbufavail - 1] == '\0')
+      if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT
+	   || status == GCONV_FULL_OUTPUT)
+	  && dst[data.outbufavail - 1] == '\0')
 	{
 	  assert (data.outbufavail > 0);
 	  assert (mbsinit (data.statep));
@@ -113,10 +117,12 @@ __wcsrtombs (dst, src, len, ps)
 
   /* There must not be any problems with the conversion but illegal input
      characters.  */
-  assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT
+  assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT
+	  || status == GCONV_ILLEGAL_INPUT
 	  || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT);
 
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT)
+  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+      && status != GCONV_EMPTY_INPUT)
     {
       result = (size_t) -1;
       __set_errno (EILSEQ);
diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index 0461877d32..e70b4e7fe6 100644
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -56,9 +56,10 @@ wctob (c)
 					     (const char *) inbuf, &inbytes,
 					     &converted, 0);
   /* The conversion failed or the output is too long.  */
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
+  if ((status != GCONV_OK && status != GCONV_FULL_OUTPUT
+       && status != GCONV_EMPTY_INPUT)
       || data.outbufavail != 1)
-    return WEOF;
+    return EOF;
 
   return buf[0];
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 15:23:25 +0000