Attachment #69790 for bug #107994

View | Details | Raw Unified | Return to bug 107994
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-1 / +5 lines)
0	-- tcpslice-1.1a3.orig/gwtm2secs.c 1996-12-21 22:56:52.000000000 -0500	0	++ tcpslice-1.1a3/gwtm2secs.c 2005-10-03 12:32:34.000000000 -0400
Lines 62-67 Link Here
62	else	62	else
63	year += 2000;	63	year += 2000;
64		64
		65	/* Year 2005 becomes 105, which isn't right either... */
		66	if ( year < 1900 )
		67	year += 1900;
		68
65	days = 0;	69	days = 0;
66	for ( i = 1970; i < year; ++i )	70	for ( i = 1970; i < year; ++i )
67	{	71	{





               switch (format_ch) {
                       case 'y':
/* This is not a good idea.
                               if ( val > 1900 )
                                       val -= 1900;
*/
                               SET_VAL(t->tm_year, val);
                               break;



           case TIMESTAMP_PARSEABLE:
               t = localtime((time_t *) &timestamp->tv_sec);
               sprintf( buf, "%04dy%02dm%02dd%02dh%02dm%02ds%06uu",
                       t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour,
                       t->tm_min, t->tm_sec, (u_int32_t)timestamp->tv_usec );
               break;

Return to bug 107994

Lines 368-375 Link Here

(-)tcpslice-1.1a3/tcpslice.c (-1 / +3 lines)
368		368
369	switch (format_ch) {	369	switch (format_ch) {
370	case 'y':	370	case 'y':
		371	/* This is not a good idea.
371	if ( val > 1900 )	372	if ( val > 1900 )
372	val -= 1900;	373	val -= 1900;
		374	*/
373	SET_VAL(t->tm_year, val);	375	SET_VAL(t->tm_year, val);
374	break;	376	break;
375		377
Lines 581-587 Link Here
581		583
582	case TIMESTAMP_PARSEABLE:	584	case TIMESTAMP_PARSEABLE:
583	t = localtime((time_t *) &timestamp->tv_sec);	585	t = localtime((time_t *) &timestamp->tv_sec);
584	sprintf( buf, "%02dy%02dm%02dd%02dh%02dm%02ds%06uu",	586	sprintf( buf, "%04dy%02dm%02dd%02dh%02dm%02ds%06uu",
585	t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour,	587	t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour,
586	t->tm_min, t->tm_sec, (u_int32_t)timestamp->tv_usec );	588	t->tm_min, t->tm_sec, (u_int32_t)timestamp->tv_usec );
587	break;	589	break;