git: 180065eb09e6 - main - top: Make locale issues non-fatal.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Mar 2025 13:59:35 UTC
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=180065eb09e699820a1e1c45d3d00156e0effe29
commit 180065eb09e699820a1e1c45d3d00156e0effe29
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2025-03-06 13:43:44 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2025-03-06 13:59:23 +0000
top: Make locale issues non-fatal.
If the `setlocale()` call fails, emit a warning and sleep briefly so the
user has a chance to see the warning before we redraw the screen. Note
that we have no way of knowing exactly what is wrong, but at least we
can suggest that they check their environment.
MFC after: 1 week
Sponsored by: Klara, Inc.
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D49230
---
usr.bin/top/top.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index d35d755fdc82..8712e56d43ba 100644
--- a/usr.bin/top/top.c
+++ b/usr.bin/top/top.c
@@ -266,8 +266,8 @@ main(int argc, const char *argv[])
#endif
if (setlocale(LC_ALL, "") == NULL) {
- fprintf(stderr, "invalid locale.\n");
- exit(1);
+ warnx("invalid locale, check your environment");
+ sleep(2);
}
mypid = getpid();