summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-09-14 12:12:25 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-09-14 12:12:25 +0000
commit3aedd13594b5249baa08165d20b5ffea443cf50d (patch)
tree3f4befd35765479c1a6d3e67a195852308295521 /usr.bin
parent24921b97bf1fb726696fffdaba02974bb3b2de92 (diff)
Move tzset() from log_open to main.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/log.c4
-rw-r--r--usr.bin/tmux/tmux.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/log.c b/usr.bin/tmux/log.c
index 0f85308af83..51eec207250 100644
--- a/usr.bin/tmux/log.c
+++ b/usr.bin/tmux/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.15 2015/09/01 19:14:43 nicm Exp $ */
+/* $OpenBSD: log.c,v 1.16 2015/09/14 12:12:24 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -48,8 +48,6 @@ log_open(const char *path)
setvbuf(log_file, NULL, _IOLBF, 0);
event_set_log_callback(log_event_cb);
-
- tzset();
}
/* Close logging. */
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 23237f32dc9..91d28dab528 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.143 2015/09/03 14:30:23 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.144 2015/09/14 12:12:24 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -199,6 +199,7 @@ main(int argc, char **argv)
#endif
setlocale(LC_TIME, "");
+ tzset();
if (**argv == '-')
flags = CLIENT_LOGIN;