From nobody Wed Mar 23 15:51:42 2022 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 360BA1A203CB; Wed, 23 Mar 2022 15:51:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNtBk2RGlz51BD; Wed, 23 Mar 2022 15:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648050702; 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=sCIr/Km9bkjWqWBU61ZB53yHuC25iq/SA2AHdWPqIn8=; b=KPTymdvIAkAb9UsuA/J2yv27xAJxkihtO3192/1Uok3KoYp+SaCMekBU/du/0XVu4H7C3g loAHA10fyeijxVHu9ZqvoJENVRwdijWNZBdDUeJGWpAYsTFr8PuJXKdil4R1zMH2WaFcn+ SfgFA45EEF2mpbfUX82O0t89SsHSqEJoUEBeFtzfT9/ScoX3EqMQ7ZD1oq8jjBO6D5tHv0 dT7e9DRbAmUJ/8Mg6X5ztRa7J4RZV2MS3InkIDxYfLWlPWX+FXHxVzQwKlsu79R2N7nzqo a6nBE186nruJAUJ+6OZMidW716B7beusKXhuXxWhdbDAwNgVd8wzRD5mZ2jkyg== 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 28C8A26457; Wed, 23 Mar 2022 15:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22NFpgsw093777; Wed, 23 Mar 2022 15:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NFpgDj093776; Wed, 23 Mar 2022 15:51:42 GMT (envelope-from git) Date: Wed, 23 Mar 2022 15:51:42 GMT Message-Id: <202203231551.22NFpgDj093776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: c4e1fbfe56c2 - stable/13 - mount: make libxo support more locale-aware 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4e1fbfe56c2fbe53e2fbbb9a7ec5aa2bc46e4b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648050702; 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=sCIr/Km9bkjWqWBU61ZB53yHuC25iq/SA2AHdWPqIn8=; b=oAzzWLD23gu1iLmSZ9UEDDCn62O5vRIG9qu3E7S/vd4IHBmCOxXWCQroZs6AKkM93toHWs lqSFQXo87KZ/7rslR58SC8d3DARUa9ngsaxnDRaAjxeOyC++Gu7Jx4HnpVfUnY2WxgpF4l eWhM/4Bgp0YcHNQYp/n+W9/LStmBej3L2t1o2stEqMISpG5hFWd0c/MrTE9MB1w3ahbk+C mCLhTw1/7TJiSmnjyIRp/dOIpncXu1AULD7F2sxCSsfT9DSQ+TpDB1g1T0SX7z0nqM5Nei BhPsFjDIBbtH+KjywmSeX+8tShcV270gg5oJYc3bA6lAio+pUNwIdeJifxzRuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648050702; a=rsa-sha256; cv=none; b=SE18qBsuFBtEBTPbyUpEEfq4nIP8zKXmie1CG8pHboSMRwZYzQmpNL+cWmGjMaY1d/Tfyb I03zbRexbUwHLgLvPAbveBUnkAyz0swQqLt/PfdM8cq544eOZl7sHFSrP6fWTg+XULk0ez MpZMcgsT/BxRfW0iTZkwz11he1BwIRZdFxdDsbqw7oCBPp/8rd4VpOsvh/OGh+eBDPGHR1 7AK5jFSNv7nGwDGvMhTy9geysIB5+wVX59dUXl4vfxzusWp8+4eTUy1Kygrqh+P8HFS3Mh 519yy/lTK1ir1vtyYPx3+lgByD9uyiMzEt0FP3wViiHGNGOi3ZojshhznMev4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e1fbfe56c2fbe53e2fbbb9a7ec5aa2bc46e4b4 commit c4e1fbfe56c2fbe53e2fbbb9a7ec5aa2bc46e4b4 Author: Piotr Pawel Stefaniak AuthorDate: 2021-09-26 20:50:28 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-03-23 15:48:03 +0000 mount: make libxo support more locale-aware "special", "node", and "mounter" are not guaranteed to be encoded with UTF-8. Use the appropriate modifier. (cherry picked from commit 260f26f035af2095a1b55c04439f479c49e4056c) --- sbin/mount/mount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 02242791a7a2..9cb4077d9a29 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -671,7 +671,7 @@ prmount(struct statfs *sfp) struct passwd *pw; char *fsidbuf; - xo_emit("{:special}{L: on }{:node}{L: (}{:fstype}", sfp->f_mntfromname, + xo_emit("{:special/%hs}{L: on }{:node/%hs}{L: (}{:fstype}", sfp->f_mntfromname, sfp->f_mntonname, sfp->f_fstypename); flags = sfp->f_flags & MNT_VISFLAGMASK; @@ -687,9 +687,9 @@ prmount(struct statfs *sfp) if ((flags & MNT_USER) != 0 || sfp->f_owner != 0) { xo_emit("{D:, }{L:mounted by }"); if ((pw = getpwuid(sfp->f_owner)) != NULL) - xo_emit("{:mounter}", pw->pw_name); + xo_emit("{:mounter/%hs}", pw->pw_name); else - xo_emit("{:mounter}", sfp->f_owner); + xo_emit("{:mounter/%hs}", sfp->f_owner); } if (verbose) { if (sfp->f_syncwrites != 0 || sfp->f_asyncwrites != 0) {