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

Use 69 pivot kludge from date(1) to make it consistant. Also honor

Browse Source 
is_delta and only apply date kludge when it isn't a delta time.
This commit is contained in:
Warner Losh 1999-01-15 07:37:00 +00:00
parent 24b95c55fe
commit d75398b55e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=42689
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/tcpdump/tcpslice/tcpslice.c
View File

@ -27,7 +27,7 @@ static const char copyright[] =
#ifndef lint
static const char rcsid[] =
"$Id: tcpslice.c,v 1.5 1998/01/20 07:30:27 charnier Exp $";
"$Id: tcpslice.c,v 1.6 1999/01/15 05:46:28 imp Exp $";
#endif /* not lint */
/*
@ -325,9 +325,6 @@ fill_tm(char *time_string, int is_delta, struct tm *t, time_t *usecs_addr)
{
char *t_start, *t_stop, format_ch;
int val;
struct timeval now;
struct timezone tz;
struct tm tmnow;
#define SET_VAL(lhs,rhs) \
if (is_delta) \
@ -335,10 +332,6 @@ fill_tm(char *time_string, int is_delta, struct tm *t, time_t *usecs_addr)
else \
lhs = rhs
if (gettimeofday(&now, &tz) < 0)
err(1, "gettimeofday");
tmnow = *localtime(&now.tv_sec);
/* Loop through the time string parsing one specification at
* a time. Each specification has the form <number><letter>
* where <number> indicates the amount of time and <letter>
@ -363,10 +356,12 @@ fill_tm(char *time_string, int is_delta, struct tm *t, time_t *usecs_addr)
switch (format_ch) {
case 'y':
if ( val > 1900 )
if ( val >= 1900 )
val -= 1900;
else if (val < 100)
val += (tmnow.tm_year / 100) * 100;
else if (val < 100 && !is_delta) {
if (val < 69) /* Same hack as date */
val += 100;
}
SET_VAL(t->tm_year, val);
break;