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

Correctly determine the local timezone, by looking at the tm_gmtoff result

Browse Source 
from localtime() rather than the bogus struct tz filled in by gettimeofday.
This commit is contained in:
Garrett Wollman 1995-09-28 15:28:40 +00:00
parent 1012b636c9
commit 04887fe7f0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=11048
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/tcpdump/tcpdump/util.c
View File

@ -21,7 +21,7 @@
#ifndef lint
static char rcsid[] =
"@(#) $Header: util.c,v 1.28 94/06/12 14:30:31 leres Exp $ (LBL)";
"@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/util.c,v 1.2 1995/03/08 12:52:49 olah Exp $ (LBL)";
#endif
#include <stdlib.h>
@ -317,19 +317,10 @@ read_infile(char *fname)
int
gmt2local()
{
#ifndef SOLARIS
struct timeval now;
struct timezone tz;
long t;
time_t now;
struct tm *tmp;
if (gettimeofday(&now, &tz) < 0)
error("gettimeofday");
t = tz.tz_minuteswest * -60;
if (localtime((time_t *)&now.tv_sec)->tm_isdst)
t += 3600;
return (t);
#else
tzset();
return (-altzone);
#endif
time(&now);
tmp = localtime(&now);
return tmp->tm_gmtoff;
}