diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-03-21 14:32:02 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-03-21 14:32:02 +0000 |
| commit | 77b898c43a35c71c901e090609d1a9b34a7e1d41 (patch) | |
| tree | c25b808963f14197e7fd1173b1fbd6ac3f92b970 /usr.bin/pr | |
| parent | 9b399f7ec950f4d631f4f1f10ac81449463cc9d8 (diff) | |
| download | src-test-77b898c43a35c71c901e090609d1a9b34a7e1d41.tar.gz src-test-77b898c43a35c71c901e090609d1a9b34a7e1d41.zip | |
Use nl_langinfo instead of %Ef
Notes
Notes:
svn path=/head/; revision=74575
Diffstat (limited to 'usr.bin/pr')
| -rw-r--r-- | usr.bin/pr/pr.c | 6 | ||||
| -rw-r--r-- | usr.bin/pr/pr.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c index 817cc2582fecb..2e0376ef9f934 100644 --- a/usr.bin/pr/pr.c +++ b/usr.bin/pr/pr.c @@ -53,6 +53,7 @@ static char sccsid[] = "@(#)pr.c 8.2 (Berkeley) 4/16/94"; #include <ctype.h> #include <errno.h> +#include <langinfo.h> #include <locale.h> #include <signal.h> #include <stdio.h> @@ -1577,6 +1578,7 @@ setup(argc, argv) register char **argv; { register int c; + int d_first; int eflag = 0; int iflag = 0; int wflag = 0; @@ -1818,8 +1820,10 @@ setup(argc, argv) } } - timefrmt = TIMEFMT; (void) setlocale(LC_TIME, (Lflag != NULL) ? Lflag : ""); + d_first = (*nl_langinfo(D_MD_ORDER) == 'd'); + timefrmt = d_first ? TIMEFMTD : TIMEFMTM; + return(0); } diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h index f132675e5aea3..a4346c788dccb 100644 --- a/usr.bin/pr/pr.h +++ b/usr.bin/pr/pr.h @@ -59,7 +59,8 @@ #define HDFMT "%s %s Page %d\n\n\n" #define HEADLEN 5 #define TAILLEN 5 -#define TIMEFMT "%Ef %H:%M %Y" +#define TIMEFMTD "%e %b %H:%M %Y" +#define TIMEFMTM "%b %e %H:%M %Y" #define FNAME "" #define LBUF 8192 #define HDBUF 512 |