d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cosmetic bug in time display. Current day logins are now displayed

Browse Source 
as plain time as originally intended, instead of displaying DayHH times
when the login time happens to be prior the GMT - TZ difference.
(Only noticable on systems operating east of GMT/UTC).
Local times are now used to determine the day.
This commit is contained in:
David Nugent 1999-11-10 04:28:16 +00:00
parent 772d2e0939
commit 658248453e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/w/pr_time.c
View File

@ -59,11 +59,12 @@ pr_attime(started, now)
time_t *started, *now;
{
static char buf[256];
struct tm *tp;
struct tm tp, tm;
time_t diff;
char fmt[20];
tp = localtime(started);
tp = *localtime(started);
tm = *localtime(now);
diff = *now - *started;
/* If more than a week, use day-month-year. */
@ -71,7 +72,11 @@ pr_attime(started, now)
(void)strcpy(fmt, "%d%b%y");
/* If not today, use day-hour-am/pm. */
else if (*now / 86400 != *started / 86400) {
else if (tm.tm_mday != tp.tm_mday ||
tm.tm_mon != tp.tm_mon ||
tm.tm_year != tp.tm_year) {
/* The line below does not take DST into consideration */
/* else if (*now / 86400 != *started / 86400) { */
(void)strcpy(fmt, __CONCAT("%a%", "I%p"));
}
@ -80,7 +85,7 @@ pr_attime(started, now)
(void)strcpy(fmt, __CONCAT("%l:%", "M%p"));
}
(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
(void)strftime(buf, sizeof(buf) - 1, fmt, &tp);
buf[sizeof(buf) - 1] = '\0';
(void)printf("%s", buf);
}