File: time.c

package info (click to toggle)
gnuplot 3.5beta6.347-3
  • links: PTS
  • area: main
  • in suites: slink
  • size: 5,032 kB
  • ctags: 4,235
  • sloc: ansic: 42,086; makefile: 561; asm: 539; sh: 386; objc: 379; csh: 297; pascal: 194; perl: 138; lisp: 88
file content (835 lines) | stat: -rw-r--r-- 18,387 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
#ifndef lint
static char *RCSid = "$Id: time.c,v 1.11 1998/04/14 00:16:27 drd Exp $";
#endif

/* GNUPLOT - time.c */

/*[
 * Copyright 1986 - 1993, 1998   Thomas Williams, Colin Kelley
 *
 * Permission to use, copy, and distribute this software and its
 * documentation for any purpose with or without fee is hereby granted,
 * provided that the above copyright notice appear in all copies and
 * that both that copyright notice and this permission notice appear
 * in supporting documentation.
 *
 * Permission to modify the software is granted, but not the right to
 * distribute the complete modified source code.  Modifications are to
 * be distributed as patches to the released version.  Permission to
 * distribute binaries produced by compiling modified sources is granted,
 * provided you
 *   1. distribute the corresponding source modifications from the
 *    released version in the form of a patch file along with the binaries,
 *   2. add special version identification to distinguish your version
 *    in addition to the base release version number,
 *   3. provide your name and address as the primary contact for the
 *    support of your modified version, and
 *   4. retain our contact information in regard to use of the base
 *    software.
 * Permission to distribute the released version of the source code along
 * with corresponding source modifications in the form of a patch file is
 * granted with same provisions 2 through 4 for binary distributions.
 *
 * This software is provided "as is" without express or implied warranty
 * to the extent permitted by applicable law.
]*/


/* some systems may not implement time very well ; in particular,
 * things might break as the year 2000 approaches.
 * This module either adds a routine gstrptime() to read a formatted time,
 * augmenting the standard suite of time routines provided by ansi,
 * or it completely replaces the whole lot with a new set of routines,
 * which count time relative to the year 2000. Default is to use the
 * new routines. define SYSTEM_TIME to use the system routines, at your own
 * risk. One problem in particular is that not all systems allow
 * the time with integer value 0 to be represented symbolically, which
 * prevents use of relative times.
 */


#include "plot.h"

#ifdef TEST_TIME  /* build as a standalone test */
#include <sys/timeb.h>  /* for linux */
#define int_error(x,y) fprintf(stderr, "Error: " x "\n")
#define int_warn(x,y) fprintf(stderr, "Warn: " x "\n")
/* need (only) these from plot.h */
#define ZERO_YEAR	2000
#define JAN_FIRST_WDAY 6  /* 1st jan, 2000 is a Saturday (cal 1 2000 on unix) */
#define SEC_OFFS_SYS	946684800.0		/*  zero gnuplot (2000) - zero system (1970) */
#define YEAR_SEC	31557600.0	/* avg, incl. leap year */
#define MON_SEC		2629800.0	/* YEAR_SEC / 12 */
#define WEEK_SEC	604800.0
#define DAY_SEC		86400.0
/*forward decls */
extern char *abbrev_month_names[];
extern char *full_month_names[];
extern char *abbrev_day_names[];
extern char *full_day_names[];

#else /* TEST_TIME */

#include "setshow.h" /* for month names etc */

#endif /* TEST_TIME */

static char *read_int __PROTO((char *s, int nr, int *d));
static int gdysize __PROTO((int yr));


static char *
read_int(s,nr,d)
char *s;
int nr, *d;
{
	int result=0;

	while (--nr >= 0 && *s >= '0' && *s <= '9' )
		result = result*10 + (*s++ - '0');

	*d = result;
	return(s);
}



#ifndef SYSTEM_TIME

/* a new set of routines to completely replace the ansi ones
 * Use at your own risk
 */


static int mndday[12] = { 31,28,31,30,31,30,31,31,30,31,30,31};

static int xstrftime __PROTO((char *buf, int bufsz, char *fmt, struct tm *tm));

/* days in year */
static int
gdysize(yr)
int yr;
{

	if (!(yr%4)) {
		if ((!(yr%100)) && yr%400) 
			return(365);
		return(366);
	}
	return(365);
}


/* new strptime() and gmtime() to allow time to be read as 24 hour,
 * and spaces in the format string. time is converted to seconds from
 * year 2000.... */  

char *
gstrptime(s,fmt,tm)
char *s;
char *fmt;
struct tm *tm;
{
	int yday, date;

	date = yday = 0;
	tm->tm_mday = 1;
	tm->tm_mon = tm->tm_hour = tm->tm_min = tm->tm_sec = 0;
	tm->tm_year = ZERO_YEAR; /* make relative times work (user-defined tic step) */

	/* we do not yet calculate wday or yday, so make them illegal
	 * [but yday will be read by %j]
	 */

	tm->tm_yday = tm->tm_wday = -1;
	 
	while (*fmt)
	{
		if ( *fmt != '%' )
		{
			if (*fmt == ' ')
			{
				/* space in format means zero or more spaces in input */
				while (*s == ' ')
					++s;
				++fmt;
				continue;
			}
			else if (*fmt == *s)
			{
				++s;
				++fmt;
				continue;
			}
			else
				break; /* literal match has failed */
		}

		/* we are processing a percent escape */

		switch (*++fmt)
		{
			case 'b': /* abbreviated month name */
			{
				int m;
				for (m=0; m<12; ++m)
					if (strnicmp(s, abbrev_month_names[m], strlen(abbrev_month_names[m])) == 0)
					{
						s += strlen(abbrev_month_names[m]);
						goto found_abbrev_mon;
					}
				/* get here => not found */
				int_warn("Bad abbreviated month name", NO_CARET);
				m=0;
				found_abbrev_mon:
				tm->tm_mon=m;
				break;
			}

			case 'B': /* full month name */
			{
				int m;
				for (m=0; m<12; ++m)
					if (strnicmp(s, full_month_names[m], strlen(full_month_names[m])) == 0)
					{
						s += strlen(full_month_names[m]);
						goto found_full_mon;
					}
				/* get here => not found */
				int_warn("Bad full month name", NO_CARET);
				m=0;
				found_full_mon:
				tm->tm_mon=m;
				break;
			}

			case 'd': /* read a day of month */
				s = read_int(s,2,&tm->tm_mday);
				date++;
				break;

			case 'm': /* month number */
				s = read_int(s,2,&tm->tm_mon);
				date++;
				--tm->tm_mon;
				break;

			case 'y': /* year number */
				s = read_int(s,2,&tm->tm_year);
				date++;
				tm->tm_year += 1900;
				break;

			case 'Y':
				s = read_int(s,4,&tm->tm_year);
				date++;
				/* tm->tm_year -= 1900; */
				/* HOE tm->tm_year %= 100; */
				break;

			case 'j':
				s = read_int(s,3,&tm->tm_yday);
				tm->tm_yday--;
				date++;
				yday++;
				break;

			case 'H':
				s = read_int(s,2,&tm->tm_hour);
				break;

			case 'M':
				s = read_int(s,2,&tm->tm_min);
				break;

			case 'S':
				s = read_int(s,2,&tm->tm_sec);
				break;

			default:
				int_warn("Bad time format in string", NO_CARET);
		}
		fmt++;
	}

	FPRINTF((stderr,"read date-time : %d/%d/%d:%d:%d:%d\n", tm->tm_mday, tm->tm_mon+1, tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec));

	/* now check the date/time entered, normalising if necessary
	 * read_int cannot read a -ve number, but can read %m=0 then decrement
	 * it to -1
	 */
	 
#define S (tm->tm_sec)
#define M (tm->tm_min)
#define H (tm->tm_hour)

	if (S>=60) { M += S/60; S%=60; }

	if (M>=60) { H += M/60; M%=60; }

	if (H>=24)
	{
		if (yday) tm->tm_yday += H/24;
		tm->tm_mday += H/24;
		H %= 24;
	}

#undef S
#undef M
#undef H

	FPRINTF((stderr,"normalised time : %d/%d/%d:%d:%d:%d\n", tm->tm_mday, tm->tm_mon+1, tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec));

	if (date)
	{
		if (yday)
		{

			if (tm->tm_yday < 0)
				int_error("Illegal day of year", NO_CARET);

			/* we just set month to jan, day to yday, and let the
			 * normalising code do the work.
			 */

			tm->tm_mon=0;
			tm->tm_mday = tm->tm_yday+1;  /* yday is 0->365, day is 1->31 */
		}

		if (tm->tm_mon < 0 )
		{
			int_error("illegal month",NO_CARET);
			return(NULL);
		}
			
		if ( tm->tm_mday < 1)
		{
			int_error("illegal day of month",NO_CARET);
			return(NULL);
		}
		
		if (tm->tm_mon > 11)
		{
			tm->tm_year += tm->tm_mon / 12;
			tm->tm_mon %= 12;
		}
		
		{
			int days_in_month;
			while (tm->tm_mday > (days_in_month = (mndday[tm->tm_mon] + (tm->tm_mon == 1 && (gdysize(tm->tm_year)>365)))))
			{
				if (++tm->tm_mon == 12)
				{
					++tm->tm_year;
					tm->tm_mon = 0;
				}
				tm->tm_mday -= days_in_month;
			}
		}
	}
	
	return(s);
}

int 
gstrftime(s,bsz,fmt,clock)
char *s;
int bsz;
char *fmt;
double clock;
{
	struct tm tm;

	ggmtime(&tm,clock);
#if 0
	if ((tm.tm_zone = (char *) malloc(strlen(xtm->tm_zone)+1))) 
		strcpy(tm.tm_zone,xtm->tm_zone);
	/* printf("zone: %s - %s\n",tm.tm_zone,xtm->tm_zone); */
#endif

	return(xstrftime(s,bsz,fmt,&tm));
}


/* some shorthands : check that there is space in the output string
 * Odd-looking defn is dangling-else-safe
 */
#define CHECK_SPACE(n) if ( (l+(n)) <= bsz) ; else return 0

/* copy a fixed string, checking that there's room */
#define COPY_STRING(z) CHECK_SPACE(strlen(z)) ; strcpy(s, z)

/* format a string, using default spec if none given
 * w and z are width and zero-flag
 * dw and dz are the defaults for these
 * In fact, CHECK_SPACE(w) is not a sufficient test, since
 * sprintf("%2d", 365) outputs three characters
 */
 
#define FORMAT_STRING(dz, dw, x)           \
  if (w==0) { w=(dw); if (!z) z=(dz); }    \
  CHECK_SPACE(w);                          \
  sprintf(s, z ? "%0*d" : "%*d", w, (x) )

static int 
xstrftime(str,bsz,fmt,tm)
char *str; /* output buffer */
int bsz;   /* space available */
char *fmt;
struct tm *tm;
{
	int l=0; /* chars written so far */
	
	char *s = str;
	
	memset(s,'\0',bsz);

	while (*fmt != '\0') {
		if (*fmt != '%') {
			if ( l >= bsz ) return(0);
			*s++ = *fmt++;
			l++;
		} else {

			/* set up format modifiers */
			int w=0;
			int z=0;
			if (*++fmt == '0')
			{
				z=1;
				++fmt;
			}

			while (*fmt >= '0' && *fmt <= '9')
			{
				w = w*10 + (*fmt-'0');
				++fmt;
			}
			
			switch(*fmt++)
			{
				case '%' :
					CHECK_SPACE(1);
					*s = '%';
					break;

				case 'a':
					COPY_STRING(abbrev_day_names[tm->tm_wday]);
					break;

				case 'A':
					COPY_STRING(full_day_names[tm->tm_wday]);
					break;

				case 'b':
				case 'h':
					COPY_STRING(abbrev_month_names[tm->tm_mon]);
					break;

				case 'B':
					COPY_STRING(full_month_names[tm->tm_mon]);
					break;


#if 0 /* %x not currently supported, so neither is c */
				case 'c':
					if (!xstrftime(s,bsz-l,"%x %X",tm))
						return(0);
					break;
#endif

				case 'd':
					FORMAT_STRING(1,2,tm->tm_mday); /* %02d */
					break;

				case 'D':
					if (!xstrftime(s,bsz-l,"%m/%d/%y",tm))
						return(0);
					break;

				case 'H':
					FORMAT_STRING(1,2,tm->tm_hour); /* %02d */
					break;
	
				case 'I':
					FORMAT_STRING(1,2,tm->tm_hour%12); /* %02d */
					break;

				case 'j':
					FORMAT_STRING(1,3,tm->tm_yday+1); /* %03d */
					break;

				/* not in linux strftime man page. Not really needed now */
				case 'k':
					FORMAT_STRING(0,2,tm->tm_hour); /* %2d */
					break;

				case 'l':
					FORMAT_STRING(0,2,tm->tm_hour%12); /* %2d */
					break;

				case 'm':
					FORMAT_STRING(1,2,tm->tm_mon+1); /* %02d */
					break;

				case 'M':
					FORMAT_STRING(1,2,tm->tm_min); /* %02d */
					break;

				case 'p':
					CHECK_SPACE(2);
					strcpy(s, (tm->tm_hour<12)?"am":"pm");
					break;

				case 'r':
					if (!xstrftime(s,bsz-l,"%I:%M:%S %p",tm))
						return(0);
					break;

				case 'R':
					if (!xstrftime(s,bsz-l,"%H:%M",tm))
						return(0);
					break;

				case 'S':
					FORMAT_STRING(1,2,tm->tm_sec); /* %02d */
					break;

				case 'T':
					if (!xstrftime(s,bsz-l,"%H:%M:%S",tm))
						return(0);
					break;

				case 'W':  /* mon 1 day of week */
				{
					int week;
					if ( tm->tm_yday <= tm->tm_wday ) {
						week = 1;
						
						if ( (tm->tm_mday - tm->tm_yday) > 4 ) {
							week = 52;
						}
						
						if ( tm->tm_yday == tm->tm_wday && tm->tm_wday == 0 )
							week = 52;

					} else {

						int bw = tm->tm_yday - tm->tm_wday; /* sun prev week */

						if ( tm->tm_wday > 0 )
							bw += 7; /* sun end of week */
						
						week = (int) bw/7;
					
						if ( (bw%7) > 2 ) /* jan 1 is before friday */
							week++;
					}
					FORMAT_STRING(1,2,week); /* %02d */
					break;
				}

				case 'U': /* sun 1 day of week */
				{
					int week, bw;
				
					if ( tm->tm_yday <= tm->tm_wday ) {
						week = 1;
						if ( (tm->tm_mday - tm->tm_yday) > 4 ) {
							week = 52;
						} 
					} else {
						bw = tm->tm_yday - tm->tm_wday-1; /* sat prev week */
						if ( tm->tm_wday >= 0 ) bw += 7; /* sat end of week */
						week = (int) bw/7;
						if ( (bw%7) > 1 ) { /* jan 1 is before friday */
							week++;
						}
					}
					FORMAT_STRING(1,2,week); /* %02d */
					break;
				}
				
				case 'w':  /* day of week, sun=0 */
					FORMAT_STRING(1,2,tm->tm_wday); /* %02d */
					break;
				
				case 'y':
					FORMAT_STRING(1,2,tm->tm_year%100); /* %02d */
					break;
				
				case 'Y':
					FORMAT_STRING(1,4,tm->tm_year); /* %04d */
					break;
				
#if 0
				case 'Z':
					COPY_STRING(tm->tm_zone);
					break;
#endif
			} /* switch */
			
			while ( *s != '\0' ) {
				s++;
				l++;
			}
		}
	}
	return(l);
}



/* time_t  */
double
gtimegm(tm)
struct tm *tm;
{
	register int i;
	/* returns sec from year ZERO_YEAR, defined in plot.h */
	double dsec;

	dsec = 0;
	if ( tm->tm_year < ZERO_YEAR ) {
		for(i=tm->tm_year;i<ZERO_YEAR;i++) {
			dsec -= (double) gdysize(i);
		}
	} else {
		for(i=ZERO_YEAR;i<tm->tm_year;i++) {
			dsec += (double) gdysize(i);
		}
	}
	if ( tm->tm_mday > 0 ) {
		for (i=0;i<tm->tm_mon;i++) {
			dsec += (double) mndday[i] + (i==1 && (gdysize(tm->tm_year)>365));
		}
		dsec += (double) tm->tm_mday-1;
	} else {
		dsec += (double) tm->tm_yday;
	}
	dsec *= (double) 24;

	dsec += tm->tm_hour;
	dsec *= 60.0;
	dsec += tm->tm_min;
	dsec *= 60.0;
	dsec += tm->tm_sec;
	
	FPRINTF((stderr,"broken-down time : %d/%d/%d:%d:%d:%d = %g seconds\n", tm->tm_mday, tm->tm_mon+1, tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec, dsec));

	return(dsec);
}

int
ggmtime(tm,clock)
struct tm *tm;
/* time_t clock; */
double clock;
{
	/* clock is relative to ZERO_YEAR, jan 1, 00:00:00,defined in plot.h */
	int i, days;

	/* dodgy way of doing wday - i hope it works ! */
	
	int wday = JAN_FIRST_WDAY; /* eg 6 for 2000 */
	
	FPRINTF((stderr,"%g seconds = ", clock));
	
	tm->tm_year = ZERO_YEAR;
	tm->tm_mday = tm->tm_yday = tm->tm_mon = tm->tm_hour = tm->tm_min = tm->tm_sec = 0; 
	if ( clock < 0 ) {
		while ( clock < 0 ) {
			int days_in_year = gdysize(--tm->tm_year);
			clock += days_in_year*DAY_SEC; /* 24*3600 */
			/* adding 371 is noop in modulo 7 arithmetic, but keeps wday +ve */
			wday += 371 - days_in_year;
		}
	} else {
		for (;;) {
			int days_in_year = gdysize(tm->tm_year);
			if (clock < days_in_year*DAY_SEC) break;
			clock -= days_in_year*DAY_SEC;
			tm->tm_year ++;
			/* only interested in result modulo 7, but %7 is expensive */
			wday += (days_in_year - 364);
		}
	}
	tm->tm_yday = (int)(clock/DAY_SEC);
	clock -= tm->tm_yday*DAY_SEC;
	tm->tm_hour = (int)clock/3600;
	clock -= tm->tm_hour*3600;
	tm->tm_min = (int)clock/60;
	clock -= tm->tm_min*60;
	tm->tm_sec = (int)clock;

	days = tm->tm_yday;

	/* wday%7 should be day of week of first day of year */
	tm->tm_wday = (wday+days)%7;

	while ( days >= (i = mndday[tm->tm_mon] + (tm->tm_mon==1 && (gdysize(tm->tm_year)>365)))) {
		days -= i;
		tm->tm_mon ++;
	}
	tm->tm_mday = days+1;
	
	FPRINTF((stderr,"broken-down time : %d/%d/%d:%d:%d:%d\n", tm->tm_mday, tm->tm_mon+1, tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec));

	return(0);
}




#else  /* SYSTEM_TIME */

/* define gnu time routines in terms of system time routines */

int gstrftime(buf, bufsz, fmt, clock)
char *buf;
int bufsz;
char *fmt;
double clock;
{
	time_t t = (time_t) clock;
	return strftime(buf, bufsz, fmt, gmtime(&t));
}

double gtimegm(tm)
struct tm *tm;
{
	return (double) mktime(tm);
}

int ggmtime(tm, clock)
struct tm *tm;
double clock;
{
	time_t t = (time_t) clock;
	struct tm *m = gmtime(&t);
	*tm = *m; /* can any non-ansi compilers not do this ? */
}
#define NOTHING	
#define LETTER(L, width, field, extra) \
  case L: s=read_int(s,width,&tm->field); extra; continue

/* supplemental routine gstrptime() to read a formatted time */

char *
gstrptime(s,fmt,tm)
char *s;
char *fmt;
struct tm *tm;
{
	FPRINTF((stderr,"gstrptime(\"%s\", \"%s\")\n", s, fmt));

	/* linux does not appear to like years before 1902
	 * NT complains if its before 1970
	 * initialise fields to midnight, 1st Jan, 1970 (for relative times)
	 */
	tm->tm_sec = tm->tm_min = tm->tm_hour = 0;
	tm->tm_mday = 1; tm->tm_mon=0; tm->tm_year=70;
	/* oops - it goes wrong without this */
	tm->tm_isdst=0;
	
	for (;*fmt && *s;++fmt) {
		if (*fmt != '%')
		{
			if (*s != *fmt)
				return s;
			++s;
			continue;
		}
		assert(*fmt == '%');

		switch(*++fmt)
		{
			case 0:
				/* uh oh - % is last character in format */
				return s;
			case '%':
				/* literal % */
				if (*s++ != '%') return s-1;
				continue;

			LETTER('d', 2, tm_mday, NOTHING);
			LETTER('m', 2, tm_mon, NOTHING);
			LETTER('y', 2, tm_year, NOTHING);
			LETTER('Y', 4, tm_year, tm->tm_year -= 1900);
			LETTER('H', 2, tm_hour, NOTHING);
			LETTER('M', 2, tm_min, NOTHING);
			LETTER('S', 2, tm_sec, NOTHING);

			default:
				int_error("incorrect time format character", NO_CARET);
		}
	}

	FPRINTF((stderr,"Before mktime : %d/%d/%d:%d:%d:%d\n", tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec));
	/* mktime range-checks the time */

	if (mktime(tm) == -1)
	{
		FPRINTF((stderr,"mktime() was not happy\n"));
		int_error("Invalid date/time [mktime() did not like it]", NO_CARET);
	}

	FPRINTF((stderr,"After mktime : %d/%d/%d:%d:%d:%d\n", tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec));

	return s;
}


#endif






#ifdef TEST_TIME

char *abbrev_month_names[]={"jan","feb","mar","apr","may","jun","jul",
                            "aug","sep","oct","nov","dec"};
char *full_month_names[]={"January","February","March","April","May",
"June","July","August","September","October","November","December"};

char *abbrev_day_names[]={"sun","mon","tue","wed","thu","fri","sat"};
char *full_day_names[]={"Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"};



/* either print current time using supplied format, or read
 * supplied time using supplied format
 */


int main(int argc, char *argv[])
{
	char output[80];
	
	if (argc < 2)
	{
		fprintf(stderr, "usage : test 'format' ['time']\n");
		return 1;
	}

	if (argc == 2)
	{
		struct timeb now;
      struct tm *tm;
		ftime(&now);
		tm = gmtime(&now.time);
      xstrftime(output, 80, argv[1], tm);
      puts(output);
	}
	else
	{
		struct tm tm;
		gstrptime(argv[2], argv[1],&tm);
		puts(asctime(&tm));
	}
	return 0;
}

#endif /* TEST_TIME */