20070901-1541

Charles.Forsyth committed 19 years ago

Commit de2f8de1 parent b2446075 files · +54 −16Browse files

Unified · Split

5 files

CHANGES +2 −0
appl/lib/daytime.b +20 −4
dis/lib/daytime.dis +0 −0
man/2/INDEX +1 −0
man/2/daytime +32 −13

@@ -1,3 +1,5 @@
	1	+20070902
	2	+ make /appl/lib/daytime.b accept Daytime->text's output; add string2tm to man page (issue 59)
1	3	20070901
2	4	add andrey's changes to emu/MacOSX/win.c (used by emu/MacOSX/mkfile-a)
3	5	add saoret's changes to dis/lookman, dis/man (issue 58)

appl/lib/daytime.b+20−4

@@ -341,10 +341,26 @@ string2tm(date: string): ref Tm · 340 unmodified lines
341	341	if(!ok)
342	342	return nil;
343	343
	344	+ # optional time zone
	345	+ while(date != nil && date[0] == ' ')
	346	+ date = date[1:];
	347	+ if(date != nil && !(date[0] >= '0' && date[0] <= '9')){
	348	+ for(i := 0; i < len date; i++)
	349	+ if(date[i] == ' '){
	350	+ (tm.zone, tm.tzoff) = tzinfo(date[0: i]);
	351	+ date = date[i:];
	352	+ break;
	353	+ }
	354	+ }
	355	+
344	356	# YY\|YYYY
345		− (buf, tm.year) = datenum(date);
	357	+ (nil, tm.year) = datenum(date);
346	358	if(tm.year > 1900)
347	359	tm.year -= 1900;
	360	+ if(tm.zone == ""){
	361	+ tm.zone = "GMT";
	362	+ tm.tzoff = 0;
	363	+ }
348	364	} else {
349	365	# Mon was not OK
350	366	date = odate;
@@ -364,10 +380,10 @@ string2tm(date: string): ref Tm · 13 unmodified lines
364	380	(ok, buf) = hhmmss(date, tm);
365	381	if(!ok)
366	382	return nil;
	383	+ (tm.zone, tm.tzoff) = tzinfo(buf);
	384	+ if(tm.zone == "")
	385	+ return nil;
367	386	}
368		− (tm.zone, tm.tzoff) = tzinfo(buf);
369		− if(tm.zone == "")
370		− return nil;
371	387
372	388	return tm;
373	389	}

dis/lib/daytime.dis+0−0

Binary file not shown.

man/2/INDEX+1−0

@@ -28,6 +28,7 @@ filet daytime · 27 unmodified lines
28	28	gmt daytime
29	29	local daytime
30	30	now daytime
	31	+string2tm daytime
31	32	text daytime
32	33	time daytime
33	34	tm2epoch daytime

man/2/daytime+32−13

@@ -1,6 +1,6 @@
1	1	.TH DAYTIME 2
2	2	.SH NAME
3		−daytime: text, filet, gmt, local, now, time, tm2epoch \- time conversions
	3	+daytime: text, filet, gmt, local, now, string2tm, time, tm2epoch \- time conversions
4	4	.SH SYNOPSIS
5	5	.EX
6	6	include "daytime.m";
@@ -20,13 +20,14 @@ Tm: adt · 13 unmodified lines
20	20	tzoff: int; # time zone offset (seconds from GMT)
21	21	};
22	22
23		−text: fn(tm: ref Tm): string;
24		−filet: fn(now, t: int): string;
25		−gmt: fn(tim: int): ref Tm;
26		−local: fn(tim: int): ref Tm;
27		−now: fn(): int;
28		−time: fn(): string;
29		−tm2epoch: fn(tm: ref Tm): int;
	23	+text: fn(tm: ref Tm): string;
	24	+filet: fn(now, t: int): string;
	25	+gmt: fn(tim: int): ref Tm;
	26	+local: fn(tim: int): ref Tm;
	27	+now: fn(): int;
	28	+time: fn(): string;
	29	+tm2epoch: fn(tm: ref Tm): int;
	30	+string2tm: fn(date: string): ref Tm;
30	31	.EE
31	32	.SH DESCRIPTION
32	33	These routines perform time conversions relative to the
@@ -42,7 +43,7 @@ converts a time structure referenced by · 9 unmodified lines
42	43	.I tm
43	44	from local or GMT time to a string in the format:
44	45	.IP
45		−.BR "Sat Jan 1 13:00:00 GMT 2000" .
	46	+.B "Sat Jan 1 13:00:00 GMT 2000"
46	47	.PP
47	48	.B Filet
48	49	converts the file access or modification time
@@ -70,12 +71,10 @@ converts seconds since the epoch, received in · 21 unmodified lines
70	71	to a time structure in local time.
71	72	.PP
72	73	.B Now
73		−returns the time in seconds since the epoch, which
74		−it obtains by reading
	74	+returns the time in seconds since the epoch, obtained by reading
75	75	.B /dev/time
76	76	(see
77		−.IR cons (3))
78		−to get the time in microseconds since the epoch.
	77	+.IR cons (3)).
79	78	.PP
80	79	.B Time
81	80	converts seconds since the epoch
@@ -86,6 +85,26 @@ to the local time as a string in the format · 4 unmodified lines
86	85	converts a time structure referenced by
87	86	.I tm
88	87	from local or GMT time to seconds since the epoch.
	88	+.PP
	89	+.B String2tm
	90	+returns a reference to a
	91	+.B Tm
	92	+value corresponding to the date and time in textual form in string
	93	+.IR s ,
	94	+which must have one of the forms below:
	95	+.IP
	96	+.EX
	97	+Sun, 06 Nov 1994 08:49:37 GMT \fR(RFC822, RFC1123)\fP
	98	+Sunday, 06-Nov-94 08:49:37 GMT \fR(RFC850)\fP
	99	+Sun Nov 6 08:49:37 GMT 1994 \fR(output of \fPtext\fR, above)\fP
	100	+.EE
	101	+.PP
	102	+A missing time zone in any format is assumed to be
	103	+.BR GMT .
	104	+.B String2tm
	105	+returns nil if
	106	+.I s
	107	+is not correctly formed.
89	108	.SH SOURCE
90	109	.B /appl/lib/daytime.b
91	110	.SH SEE ALSO