d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last(1): unbreak for 8-bit locales

Browse Source 
Ouput format of last(1) is broken for non UTF-8 locales
since it got libxo(3) support. It uses strftime(3) that produces
non UTF-8 strings passed to xo_emit(3) with wrong %s format -
it should be %hs in this case, so xo_emit(3) produces empty output.

This change is basically no-op when locale is of UTF-8 type,
f.e. en_GB.UTF-8 or ru_RU.UTF-8 or sr_RS.UTF-8@latin.
It fixes output for other locales.

MFC after:	2 weeks
This commit is contained in:
Eugene Grosbein 2019-08-23 01:25:38 +00:00
parent e1aa7047af
commit 8e67c427b5
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,7 @@ static time_t currentout; /* current logout value */
static long maxrec; /* records to display */ static long maxrec; /* records to display */
static const char *file = NULL; /* utx.log file */ static const char *file = NULL; /* utx.log file */
static int sflag = 0; /* show delta in seconds */ static int sflag = 0; /* show delta in seconds */
static int utf8flag; /* current locale is UTF-8 */
static int width = 5; /* show seconds in delta */ static int width = 5; /* show seconds in delta */
static int yflag; /* show year */ static int yflag; /* show year */
static int d_first; static int d_first;
@ -103,6 +104,7 @@ static time_t snaptime; /* if != 0, we will only
*/ */
static void addarg(int, char *); static void addarg(int, char *);
static const char *ctf(const char *);
static time_t dateconv(char *); static time_t dateconv(char *);
static void doentry(struct utmpx *); static void doentry(struct utmpx *);
static void hostconv(char *); static void hostconv(char *);
@ -112,6 +114,31 @@ static int want(struct utmpx *);
static void usage(void); static void usage(void);
static void wtmp(void); static void wtmp(void);
static const char*
ctf(const char *fmt) {
static char buf[31];
const char *src, *end;
char *dst;
if (utf8flag)
return (fmt);
end = buf + sizeof(buf);
for (src = fmt, dst = buf; dst < end; *dst++ = *src++) {
if (*src == '\0') {
*dst = '\0';
break;
} else if (*src == '%' && *(src+1) == 's') {
*dst++ = '%';
*dst++ = 'h';
*dst++ = 's';
strlcpy(dst, src+2, end - dst);
return (buf);
}
}
return (buf);
}
static void static void
usage(void) usage(void)
{ {
@ -130,6 +157,9 @@ main(int argc, char *argv[])
(void) setlocale(LC_TIME, ""); (void) setlocale(LC_TIME, "");
d_first = (*nl_langinfo(D_MD_ORDER) == 'd'); d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
(void) setlocale(LC_CTYPE, "");
utf8flag = (strcmp(nl_langinfo(CODESET), "UTF-8") == 0);
argc = xo_parse_args(argc, argv); argc = xo_parse_args(argc, argv);
if (argc < 0) if (argc < 0)
exit(1); exit(1);
@ -262,7 +292,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(ctf(" begins {:begins/%s}\n"), ct);
xo_close_container("last-information"); xo_close_container("last-information");
} }
@ -379,7 +409,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(ctf(" {:login-time/%s%c/%s}"), ct, tt == NULL ? '\n' : ' ');
if (tt == NULL) if (tt == NULL)
goto end; goto end;
if (!tt->logout) { if (!tt->logout) {
@ -393,7 +423,7 @@ printentry(struct utmpx *bp, struct idtab *tt)
tm = localtime(&tt->logout); tm = localtime(&tt->logout);
(void) strftime(ct, sizeof(ct), "%R", tm); (void) strftime(ct, sizeof(ct), "%R", tm);
xo_attr("seconds", "%lu", (unsigned long)tt->logout); xo_attr("seconds", "%lu", (unsigned long)tt->logout);
xo_emit("- {:logout-time/%s}", ct); xo_emit(ctf("- {:logout-time/%s}"), ct);
} }
delta = tt->logout - bp->ut_tv.tv_sec; delta = tt->logout - bp->ut_tv.tv_sec;
xo_attr("seconds", "%ld", (long)delta); xo_attr("seconds", "%ld", (long)delta);
@ -403,9 +433,9 @@ printentry(struct utmpx *bp, struct idtab *tt)
tm = gmtime(&delta); tm = gmtime(&delta);
(void) strftime(ct, sizeof(ct), width >= 8 ? "%T" : "%R", tm); (void) strftime(ct, sizeof(ct), width >= 8 ? "%T" : "%R", tm);
if (delta < 86400) if (delta < 86400)
xo_emit(" ({:session-length/%s})\n", ct); xo_emit(ctf(" ({:session-length/%s})\n"), ct);
else else
xo_emit(" ({:session-length/%ld+%s})\n", xo_emit(ctf(" ({:session-length/%ld+%s})\n"),
(long)delta / 86400, ct); (long)delta / 86400, ct);
} }