From 92695a8f972c2f5bb8502079956236e182632c64 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sat, 24 Jun 2000 13:36:13 +0000 Subject: Localize ctype too. Add weekday to showuser expired fields --- pw/pw.c | 2 +- pw/pw_user.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pw') diff --git a/pw/pw.c b/pw/pw.c index 5c77783..d854c92 100644 --- a/pw/pw.c +++ b/pw/pw.c @@ -132,7 +132,7 @@ main(int argc, char *argv[]) umask(0); /* We wish to handle this manually */ LIST_INIT(&arglist); - (void)setlocale(LC_TIME, ""); + (void)setlocale(LC_ALL, ""); /* * Break off the first couple of words to determine what exactly diff --git a/pw/pw_user.c b/pw/pw_user.c index 4429050..bd574c6 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -1146,9 +1146,9 @@ print_user(struct passwd * pwd, int pretty, int v7) *p = (char) toupper((unsigned char)*p); } if (pwd->pw_expire > (time_t)0 && (tptr = localtime(&pwd->pw_expire)) != NULL) - strftime(acexpire, sizeof acexpire, "%Ef %Y %X", tptr); + strftime(acexpire, sizeof acexpire, "%a %Ef %Y %X", tptr); if (pwd->pw_change > (time_t)0 && (tptr = localtime(&pwd->pw_change)) != NULL) - strftime(pwexpire, sizeof pwexpire, "%Ef %Y %X", tptr); + strftime(pwexpire, sizeof pwexpire, "%a %Ef %Y %X", tptr); printf("Login Name: %-15s #%-12ld Group: %-15s #%ld\n" " Full Name: %s\n" " Home: %-26.26s Class: %s\n" -- cgit v1.2.3-56-ge451