upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mount: make libxo support more locale-aware

Browse source 
"special", "node", and "mounter" are not guaranteed to be encoded with
UTF-8. Use the appropriate modifier.

(cherry picked from commit 260f26f035)
This commit is contained in:
Piotr Pawel Stefaniak 2021-09-26 22:50:28 +02:00
parent 3f8b52c910
commit c4e1fbfe56
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sbin/mount/mount.c
View file

@ -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) {