From nobody Mon Mar 31 18:35:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZRKZc2fkGz5sPMg; Mon, 31 Mar 2025 18:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRKZb2kJKz44W9; Mon, 31 Mar 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743446151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7vuUyd5rtdYaPd5pGGdMx0TSDqMIkDWUF5azjiTXFOE=; b=i39WJvdqae9njkLgPumolGdu6lmdZ6PGjJQ0e4DkbVj6Q9nD6rtrr6a2C09xmqOuKNAlyN 7dbDadsSt17NNhTIgfdC6b2zBq1Mn5888mhLjXKHmL99aXNWWZ7MkMHJY6Rv61YoC4Tr0Z 0JD8oJBcLQOrQ20n/HmY9fBsVCqf4L26oldOy/b6Aj7EgJwr6fGWnxuXjUeHVQDaFD/C/8 PppuBMpqt38fdF9Ww+DFtGEqrvhlfwR68DwvCgP5JLuhxm34rJmSwYakpxdedlPhfan6ef Qi92mC7ZKV53JuTHjCG4mbzo5iptV4mzlFRzk/wD45ape4nOlWQBxUIV1c6K3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743446151; a=rsa-sha256; cv=none; b=fL+x4lJKZKK+7iw41Oy925Eu8N5wrzz1kW6n2+Z4OOOBAFP40bmtH6wkbjrjQaKXOvTqvj lL0TSThL2Dwg09WIquyYE7Hxtnqw1G0sjCjbVsvtAwQLEpWNEalQXCo6Cao3fid9TDhjXX FU/+DUl+NztGJbD8AQ5H8nl60zkXGXp/gLesz0n3OJvqn8pKzYa5OwCzV2iEVtQdXvFs8U 7DG8Qi1Lo9QRv1itMy1zCMMiM6h+ic/P+Gk3lPTz3h9gpAYx28kdoxbkZYihlRTGf9e8YI 0Kmf+EGBHIjv8NV+nZ+r2MXUMDIb1uIxfNor+jb3q54AI9KLlVmY3AFcsscIew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743446151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7vuUyd5rtdYaPd5pGGdMx0TSDqMIkDWUF5azjiTXFOE=; b=YWbgKPf2S1/44jlGNj81ZDgpYQCqJW3MF7MjQY/8+ifuERCBuUM9ONhZ6ZhIQlQnPMx68b 2mGfD0o51pOKhzVG8NafJYYclstO1n4TQn8ZZOiZTFf4+r0zlvWfjZAALYN+xojGQcDIZ3 rihyGlW7MAjzXKbWccTrLVor/Np3IILoHioBJRdYi53gYJYFaYw+ySDkzF+yhTAlehK9A/ wKRxjHo6stl00t67pUQwl4vXGHoHMLiKuodM6TZcMHqybPZ++e+iOcExhU6brpqt0f41Pv 9kDz88BHcv3pGsm7idOFZN4R6sJQVlYJZBKAGfwG6GgFK6GSJ3CynzTcE9k+uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZRKZb22tkzxCc; Mon, 31 Mar 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52VIZpef056880; Mon, 31 Mar 2025 18:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VIZp7f056877; Mon, 31 Mar 2025 18:35:51 GMT (envelope-from git) Date: Mon, 31 Mar 2025 18:35:51 GMT Message-Id: <202503311835.52VIZp7f056877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 227c1270719f - stable/13 - top: Make locale issues non-fatal. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 227c1270719f1add47b70d13b3a8cbf3cb188e13 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=227c1270719f1add47b70d13b3a8cbf3cb188e13 commit 227c1270719f1add47b70d13b3a8cbf3cb188e13 Author: Dag-Erling Smørgrav AuthorDate: 2025-03-06 13:43:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-03-31 18:36:01 +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 (cherry picked from commit 180065eb09e699820a1e1c45d3d00156e0effe29) --- 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();