summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-06-27 14:40:23 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-06-27 14:40:23 +0000
commit7f79aa98ab26d8bab629908857399044f2db9f5c (patch)
treea2280d0df4d865b28e55f43a37f3f593f25c6a83 /usr.bin
parent597913dcb3cd334d391ceec1f3185e375ac85642 (diff)
Use gmtime_r so the current time isn't overwritten, the minute comparison works
and the clock is actually updated. It was already used for lock-server but not here.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/window-clock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/window-clock.c b/usr.bin/tmux/window-clock.c
index 1cc748e44d4..8a68dd3778b 100644
--- a/usr.bin/tmux/window-clock.c
+++ b/usr.bin/tmux/window-clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-clock.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */
+/* $OpenBSD: window-clock.c,v 1.2 2009/06/27 14:40:22 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -93,13 +93,13 @@ void
window_clock_timer(struct window_pane *wp)
{
struct window_clock_mode_data *data = wp->modedata;
- struct tm *now, *then;
+ struct tm now, then;
time_t t;
t = time(NULL);
- now = gmtime(&t);
- then = gmtime(&data->tim);
- if (now->tm_min == then->tm_min)
+ gmtime_r(&t, &now);
+ gmtime_r(&data->tim, &then);
+ if (now.tm_min == then.tm_min)
return;
data->tim = t;