diff options
| author | Piotr Pawel Stefaniak <pstef@FreeBSD.org> | 2021-09-26 20:50:28 +0000 |
|---|---|---|
| committer | Piotr Pawel Stefaniak <pstef@FreeBSD.org> | 2022-03-23 15:48:03 +0000 |
| commit | c4e1fbfe56c2fbe53e2fbbb9a7ec5aa2bc46e4b4 (patch) | |
| tree | c9cbde4c92b7801979cbf3037fef0df4499f9ba5 | |
| parent | 3f8b52c9108717129a0dfec218748f39a1b2db98 (diff) | |
| download | src-c4e1fbfe56c2fbe53e2fbbb9a7ec5aa2bc46e4b4.tar.gz src-c4e1fbfe56c2fbe53e2fbbb9a7ec5aa2bc46e4b4.zip | |
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)
| -rw-r--r-- | sbin/mount/mount.c | 6 |
1 files 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) { |