From 1133531b799f6db929eadae5a99f31cd7aba09a4 Mon Sep 17 00:00:00 2001 From: owen Date: Sat, 5 Feb 2005 00:29:20 +0000 Subject: [PATCH] Times and dates in the event log, fixing ltime() in the process. git-svn-id: svn://svn.tartarus.org/sgt/putty@5250 cda61777-01e9-0310-a592-d414129be87e --- mac/macevlog.c | 15 +++++++++++++-- mac/macmisc.c | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mac/macevlog.c b/mac/macevlog.c index 43a2658f..9c99f69f 100644 --- a/mac/macevlog.c +++ b/mac/macevlog.c @@ -1,4 +1,4 @@ -/* $Id: macevlog.c,v 1.8 2003/05/04 14:18:18 simon Exp $ */ +/* $Id$ */ /* * Copyright (c) 2003 Ben Harris * All rights reserved. @@ -106,6 +106,16 @@ void logevent(void *frontend, const char *str) Session *s = frontend; ListBounds bounds, visible; Cell cell = { 0, 0 }; + char timebuf[40]; + struct tm tm; + char *string; + + tm=ltime(); + strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm); + + string=snewn(strlen(timebuf) + strlen(str) +1, char); + strcpy(string, timebuf); + strcat(string, str); if (s->eventlog == NULL) mac_createeventlog(s); @@ -122,10 +132,11 @@ void logevent(void *frontend, const char *str) cell.v = bounds.bottom; LAddRow(1, cell.v, s->eventlog); - LSetCell(str, strlen(str), cell, s->eventlog); + LSetCell(string, strlen(string), cell, s->eventlog); /* ">=" and "2" because there can be a blank cell below the last one. */ if (visible.bottom >= bounds.bottom) LScroll(0, 2, s->eventlog); + sfree(string); } static void mac_draweventloggrowicon(Session *s) diff --git a/mac/macmisc.c b/mac/macmisc.c index 128b3c40..2d976e7d 100644 --- a/mac/macmisc.c +++ b/mac/macmisc.c @@ -183,8 +183,8 @@ struct tm ltime(void) tm.tm_min=d.minute; tm.tm_hour=d.hour; tm.tm_mday=d.day; - tm.tm_mon=d.month; - tm.tm_year=d.year; + tm.tm_mon=d.month-1; + tm.tm_year=d.year-1900; tm.tm_wday=d.dayOfWeek; tm.tm_yday=1; /* GetTime doesn't tell us */ tm.tm_isdst=0; /* Have to do DST ourselves */ -- 2.11.0