From nobody Mon Mar 31 18:35:49 2025 X-Original-To: dev-commits-src-branches@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 4ZRKZZ36PWz5sPCl; Mon, 31 Mar 2025 18:35:50 +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 4ZRKZY6SjCz44Mx; Mon, 31 Mar 2025 18:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743446149; 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=EPLs5XPaS/y3BzoiFcomgjGX9DMcrACAs7apQJKCa+Q=; b=N3PWsPTEND2hkMGNBOxb7Pm/yfHMAaX64EMMRot6LGpBHYWWid0UfAtl1MvFbk4PgOw14+ 6uoN8PRYKk2YmzVlWL7zsxvxbZUdWmE1qyIzlgjAaAyE9Ks3BobWWhF3TJAnXTZv47KgcQ 5NJU1yZyhIFUDLsTmnsrgLhWw5pNbszqk2UAQKfWN1HPO2IdcW13NVslMcWCNM9zJKjY25 0+RNIR3/yGFn1vEtnlzn1yYoxmEwuXqzi98EaVNhBgoLMUy3P98hhoJrox/n1QLa//cCTk mGgNtPYP6T3CfOtawowx+siI2tYMXMV0w+qsRUK+7WFFaqv4k4PJDx4qgGp2Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743446149; a=rsa-sha256; cv=none; b=graeeJmNmwjArUB1lfJ/hukkj4e8bnKxRNenpNiygH0j4F1PzwVWy25fUxlShijhy/oEaN /tGtu78BrEGYnCZYFyhUz0t9n5cl/W6mEmgSgkjrY6pyDk213z0Jf6kaHf8aBIvgFevUqM nUzqWbQcxDyBAbReyGx1hJH23pl6bIER0v3NxnPsP98/S2vwDrvSGIiy35yqier11DyAJQ RiDKx4rB05PQbGzeW8rH8VCUu6nbZOOmisjNyvgB0ysKrfUK43RdlqdJOLgK8C8gRWP1fU EZluk735f4sAsXmFkPDOiuHagH5QImWbotCm4LNoCT5fRkreM9yd5L6guF5DOA== 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=1743446149; 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=EPLs5XPaS/y3BzoiFcomgjGX9DMcrACAs7apQJKCa+Q=; b=Oy/KODkuZUTvzrr2jRnanQa42yvzzsbPBBKHNfbBSRSpHkDEr7buzqpRrRPKqMsutdeuOh s2D9utdLtUy3qxpQ3rLTdKbyXGoct4m3L7mZQgjAWjGXCumXoX1GY+DqUYcpPCfAetrYJH usJqPgXLhXjUO2cjOpcwcHhGVbgLds+1WEhhJ0uO8BrSSCmvVBAaJGmmw5eY1TIlNWEXG7 BoEKLyKjRf9CxAza1tE7mNdWopAsoqXD6pPadOOLm9ui3zvs9Fq5Us4YLplsMFApK34m/q zIU/MFg+055e5DNlsbTH/+GTGih3iWlAKg28BRXAlisJ1Qytb1Zbes5Ho5wDYA== 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 4ZRKZY62MlzxCZ; Mon, 31 Mar 2025 18:35:49 +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 52VIZnNZ056743; Mon, 31 Mar 2025 18:35:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VIZnG6056740; Mon, 31 Mar 2025 18:35:49 GMT (envelope-from git) Date: Mon, 31 Mar 2025 18:35:49 GMT Message-Id: <202503311835.52VIZnG6056740@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: a4251e93f8cb - stable/14 - top: Make locale issues non-fatal. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: a4251e93f8cb008607bf9b50bd2fd95d3223dad1 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a4251e93f8cb008607bf9b50bd2fd95d3223dad1 commit a4251e93f8cb008607bf9b50bd2fd95d3223dad1 Author: Dag-Erling Smørgrav AuthorDate: 2025-03-06 13:43:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-03-31 18:35:33 +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 2b468c453e26..856ad838dc1c 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();