hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-26 10:53:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

last: improve non-UTF8 locale output after libxo support was added

Browse Source 
Some strftime(3) conversion specifications will generate strings encoded
with the current locale, not necessarily UTF8. As per xo_format.5, use
the h string modifier so that libxo interprets it appropriately.

Reviewed by:	eugen, philip
Differential Revision:	https://reviews.freebsd.org/D32437
This commit is contained in:
Piotr Pawel Stefaniak 2021-10-10 09:16:59 +02:00
parent 902cde5d0a
commit 8da2705253
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/last/last.c
View File

@ -262,7 +262,7 @@ wtmp(void)
(void) strftime(ct, sizeof(ct), "%+", tm); (void) strftime(ct, sizeof(ct), "%+", tm);
xo_emit("\n{:utxdb/%s}", (file == NULL) ? "utx.log" : file); xo_emit("\n{:utxdb/%s}", (file == NULL) ? "utx.log" : file);
xo_attr("seconds", "%lu", (unsigned long) t); xo_attr("seconds", "%lu", (unsigned long) t);
xo_emit(" begins {:begins/%s}\n", ct); xo_emit(" begins {:begins/%hs}\n", ct);
xo_close_container("last-information"); xo_close_container("last-information");
} }
@ -379,7 +379,7 @@ printentry(struct utmpx *bp, struct idtab *tt)
break; break;
} }
xo_attr("seconds", "%lu", (unsigned long)t); xo_attr("seconds", "%lu", (unsigned long)t);
xo_emit(" {:login-time/%s%c/%s}", ct, tt == NULL ? '\n' : ' '); xo_emit(" {:login-time/%hs%c/%s}", ct, tt == NULL ? '\n' : ' ');
if (tt == NULL) if (tt == NULL)
goto end; goto end;
if (!tt->logout) { if (!tt->logout) {