Re: calendar: Remove support for non-UTF-8 locales
On Tue, Jul 25, 2017 at 11:56:42PM +0200, Theo Buehler wrote:
> On Tue, Jul 25, 2017 at 11:38:59PM +0200, Klemens Nanni wrote:
> > 5.9 is out, KOI8 isn't supported anymore.
>
> It's at least the third time I see this diff. Pretty sure that Jan Stary
> sent the same quite a while back.
>
> ok -- without the '))' -> ') )' change.
Overlooked, here you go.
Index: io.c
===
RCS file: /cvs/src/usr.bin/calendar/io.c,v
retrieving revision 1.44
diff -u -p -r1.44 io.c
--- io.c31 Aug 2016 09:38:47 - 1.44
+++ io.c25 Jul 2017 21:35:50 -
@@ -89,13 +89,9 @@ cal(void)
if (strncmp(buf, "LANG=", 5) == 0) {
(void) setlocale(LC_ALL, buf + 5);
setnnames();
- /* XXX remove KOI8 lines after 5.9 is out */
if (!strcmp(buf + 5, "ru_RU.UTF-8") ||
!strcmp(buf + 5, "uk_UA.UTF-8") ||
- !strcmp(buf + 5, "by_BY.UTF-8") ||
- !strcmp(buf + 5, "ru_RU.KOI8-R") ||
- !strcmp(buf + 5, "uk_UA.KOI8-U") ||
- !strcmp(buf + 5, "by_BY.KOI8-B")) {
+ !strcmp(buf + 5, "by_BY.UTF-8")) {
bodun_maybe++;
bodun = 0;
free(prefix);
Re: calendar: Remove support for non-UTF-8 locales
On Tue, Jul 25, 2017 at 11:38:59PM +0200, Klemens Nanni wrote:
> 5.9 is out, KOI8 isn't supported anymore.
It's at least the third time I see this diff. Pretty sure that Jan Stary
sent the same quite a while back.
ok -- without the '))' -> ') )' change.
>
> Index: io.c
> ===
> RCS file: /cvs/src/usr.bin/calendar/io.c,v
> retrieving revision 1.44
> diff -u -p -r1.44 io.c
> --- io.c 31 Aug 2016 09:38:47 - 1.44
> +++ io.c 25 Jul 2017 21:35:50 -
> @@ -89,13 +89,9 @@ cal(void)
> if (strncmp(buf, "LANG=", 5) == 0) {
> (void) setlocale(LC_ALL, buf + 5);
> setnnames();
> - /* XXX remove KOI8 lines after 5.9 is out */
> if (!strcmp(buf + 5, "ru_RU.UTF-8") ||
> !strcmp(buf + 5, "uk_UA.UTF-8") ||
> - !strcmp(buf + 5, "by_BY.UTF-8") ||
> - !strcmp(buf + 5, "ru_RU.KOI8-R") ||
> - !strcmp(buf + 5, "uk_UA.KOI8-U") ||
> - !strcmp(buf + 5, "by_BY.KOI8-B")) {
> + !strcmp(buf + 5, "by_BY.UTF-8") ) {
> bodun_maybe++;
> bodun = 0;
> free(prefix);
>
calendar: Remove support for non-UTF-8 locales
5.9 is out, KOI8 isn't supported anymore.
Index: io.c
===
RCS file: /cvs/src/usr.bin/calendar/io.c,v
retrieving revision 1.44
diff -u -p -r1.44 io.c
--- io.c31 Aug 2016 09:38:47 - 1.44
+++ io.c25 Jul 2017 21:35:50 -
@@ -89,13 +89,9 @@ cal(void)
if (strncmp(buf, "LANG=", 5) == 0) {
(void) setlocale(LC_ALL, buf + 5);
setnnames();
- /* XXX remove KOI8 lines after 5.9 is out */
if (!strcmp(buf + 5, "ru_RU.UTF-8") ||
!strcmp(buf + 5, "uk_UA.UTF-8") ||
- !strcmp(buf + 5, "by_BY.UTF-8") ||
- !strcmp(buf + 5, "ru_RU.KOI8-R") ||
- !strcmp(buf + 5, "uk_UA.KOI8-U") ||
- !strcmp(buf + 5, "by_BY.KOI8-B")) {
+ !strcmp(buf + 5, "by_BY.UTF-8") ) {
bodun_maybe++;
bodun = 0;
free(prefix);
