Backport #2155 to 24.05 #2156
Backport #2155 to 24.05 #2156
Conversation
For the height this doesn't matter unless auto_minheight is non-zero, but for the width it does, as it would subtract off the maximum of various things including the text width, which is clearly nonsense here. All we want to do is compute how much space for content there is; what's on other lines doesn't matter. Fixes: 64f7073 ("bsddialog: Optionally truncate long mixedgauge labels and screens") (cherry picked from commit 2283ee3)
The text in the [...] is 14 characters long, but that includes the terminator that isn't rendered, so there are only 13 visible characters (plus the square brackets). (cherry picked from commit b2ad856)
|
Conceptually I'm ok with this if we don't want do the fast-forward dance. Ideally main would contain the release hash. |
We could also just fast-forward main and releng/24.05. The only additional changes in dev are the KTLS fixes, and I don't understand why we didn't aim to get them in in the first place. |
OK, I'll start that process |
|
Superseded by #2158 |
I didn't think the KTLS fixes were critical, and wouldn't have merged them to |
CTSRD-CHERI#2147 archive_string: clean up strncat_from_utf8_to_utf8 (36047967a) CTSRD-CHERI#2153 archive_match: check archive_read_support_format_raw() return value (0ce1b4c38) CTSRD-CHERI#2154 archive_match: turn counter into flag (287e05d53) CTSRD-CHERI#2155 lha: Do not allow negative file sizes (93b11caed) CTSRD-CHERI#2156 tests: setenv LANG to en_US.UTF-8 in bsdunzip test_I.c (83e8b0ea8) Obtained from: libarchive Libarchive commit: 83e8b0ea8c3b07e07ac3dee90a8724565f8e53fd
CTSRD-CHERI#2147 archive_string: clean up strncat_from_utf8_to_utf8 (36047967a) CTSRD-CHERI#2153 archive_match: check archive_read_support_format_raw() return value (0ce1b4c38) CTSRD-CHERI#2154 archive_match: turn counter into flag (287e05d53) CTSRD-CHERI#2155 lha: Do not allow negative file sizes (93b11caed) CTSRD-CHERI#2156 tests: setenv LANG to en_US.UTF-8 in bsdunzip test_I.c (83e8b0ea8) MFC after: 3 days
CTSRD-CHERI#2147 archive_string: clean up strncat_from_utf8_to_utf8 (36047967a) CTSRD-CHERI#2153 archive_match: check archive_read_support_format_raw() return value (0ce1b4c38) CTSRD-CHERI#2154 archive_match: turn counter into flag (287e05d53) CTSRD-CHERI#2155 lha: Do not allow negative file sizes (93b11caed) CTSRD-CHERI#2156 tests: setenv LANG to en_US.UTF-8 in bsdunzip test_I.c (83e8b0ea8) MFC after: 3 days
No description provided.