upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-05-13 15:13:36 +00:00
Code Activity

Accommodate a difference between mbrtowc and mbrtoc32.

Browse Source 
* lib/mbiter.h (mbiter_multi_next): Handle the mbrtoc32 return value
(size_t)(-3).
* lib/mbuiter.h (mbuiter_multi_next): Likewise.
* lib/mbfile.h (mbfile_multi_getc): Likewise.
This commit is contained in:
Bruno Haible
2023-06-30 22:48:12 +02:00
parent b57937c052
commit 2dfd7cc0f3
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2023-06-30 Bruno Haible <bruno@clisp.org>
Accommodate a difference between mbrtowc and mbrtoc32.
* lib/mbiter.h (mbiter_multi_next): Handle the mbrtoc32 return value
(size_t)(-3).
* lib/mbuiter.h (mbuiter_multi_next): Likewise.
* lib/mbfile.h (mbfile_multi_getc): Likewise.
2023-06-30 Bruno Haible <bruno@clisp.org>
doc: Reference some reported bugs (in comments).

4
lib/mbfile.h
View File

@@ -183,6 +183,10 @@ mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf)
assert (mbf->buf[0] == '\0');
assert (mbc->wc == 0);
}
else if (bytes == (size_t) -3)
/* The previous multibyte sequence produced an additional 32-bit
wide character. */
bytes = 0;
mbc->wc_valid = true;
break;
}

4
lib/mbiter.h
View File

@@ -163,6 +163,10 @@ mbiter_multi_next (struct mbiter_multi *iter)
assert (*iter->cur.ptr == '\0');
assert (iter->cur.wc == 0);
}
else if (iter->cur.bytes == (size_t) -3)
/* The previous multibyte sequence produced an additional 32-bit
wide character. */
iter->cur.bytes = 0;
iter->cur.wc_valid = true;
/* When in the initial state, we can go back treating ASCII

4
lib/mbuiter.h
View File

@@ -172,6 +172,10 @@ mbuiter_multi_next (struct mbuiter_multi *iter)
assert (*iter->cur.ptr == '\0');
assert (iter->cur.wc == 0);
}
else if (iter->cur.bytes == (size_t) -3)
/* The previous multibyte sequence produced an additional 32-bit
wide character. */
iter->cur.bytes = 0;
iter->cur.wc_valid = true;
/* When in the initial state, we can go back treating ASCII