summaryrefslogtreecommitdiff
path: root/usr.bin/pr
diff options
context:
space:
mode:
authorJeremie Courreges-Anglas <jca@cvs.openbsd.org>2017-11-02 09:52:05 +0000
committerJeremie Courreges-Anglas <jca@cvs.openbsd.org>2017-11-02 09:52:05 +0000
commitc52d16d8edf27be731dc9285a29394dd70dac519 (patch)
tree0737a6fb15f35f163f7e40d6dfefcebb83b68be5 /usr.bin/pr
parent04c60c86cda9b9a1905a606fe37d16ae24e7e3b1 (diff)
Kill bogus use of LC_TIME
Diff from Jan Stary, ok kettenis@
Diffstat (limited to 'usr.bin/pr')
-rw-r--r--usr.bin/pr/pr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index b7916ffa195..08941e13d16 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr.c,v 1.39 2015/11/11 02:52:46 deraadt Exp $ */
+/* $OpenBSD: pr.c,v 1.40 2017/11/02 09:52:04 jca Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -124,7 +124,6 @@ char schar; /* text column separation character */
int sflag; /* -s option for multiple columns */
int nohead; /* do not write head and trailer */
int pgwd; /* page width with multiple col output */
-char *timefrmt; /* time conversion string */
/*
* misc globals
@@ -1546,7 +1545,7 @@ nxtfile(int argc, char *argv[], char **fname, char *buf, int dt)
/*
* set up time field used in header
*/
- if (strftime(buf, HDBUF, timefrmt, timeptr) == 0) {
+ if (strftime(buf, HDBUF, TIMEFMT, timeptr) == 0) {
++errcnt;
if (inf != stdin)
(void)fclose(inf);
@@ -2006,7 +2005,5 @@ setup(int argc, char *argv[])
}
}
- if ((timefrmt = getenv("LC_TIME")) == NULL)
- timefrmt = TIMEFMT;
return(0);
}