ObjFW  Diff

Differences From Artifact [d33bbd220e]:

To Artifact [97a4e4b983]:


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
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







-
+


-
+


-
+




-
+


-
+


-
+






-
+


-
+





-
+







-
+


-
+














-
+


-
+


-
+




-
+


-
+


-
+







#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
    defined(OF_THREADS)
static OFMutex *mutex;
#endif

#ifdef HAVE_GMTIME_R
# define GMTIME_RET(field)						  \
	time_t sec_ = (time_t)sec;					  \
	time_t seconds_ = (time_t)seconds;				  \
	struct tm tm;							  \
									  \
	if (sec != sec_)						  \
	if (seconds != seconds_)					  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	if (gmtime_r(&sec_, &tm) == NULL)				  \
	if (gmtime_r(&seconds_, &tm) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm.field;
# define LOCALTIME_RET(field)						  \
	time_t sec_ = (time_t)sec;					  \
	time_t seconds_ = (time_t)seconds;				  \
	struct tm tm;							  \
									  \
	if (sec != sec_)						  \
	if (seconds != seconds_)					  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	if (localtime_r(&sec_, &tm) == NULL)				  \
	if (localtime_r(&seconds_, &tm) == NULL)			  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm.field;
#else
# ifdef OF_THREADS
#  define GMTIME_RET(field)						  \
	time_t sec_ = (time_t)sec;					  \
	time_t seconds_ = (time_t)seconds;				  \
	struct tm *tm;							  \
									  \
	if (sec != sec_)						  \
	if (seconds != seconds_)					  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	[mutex lock];							  \
									  \
	@try {								  \
		if ((tm = gmtime(&sec_)) == NULL)			  \
		if ((tm = gmtime(&seconds_)) == NULL)			  \
			@throw [OFOutOfRangeException newWithClass: isa]; \
									  \
		return tm->field;					  \
	} @finally {							  \
		[mutex unlock];						  \
	}
#  define LOCALTIME_RET(field)						  \
	time_t sec_ = (time_t)sec;					  \
	time_t seconds_ = (time_t)seconds;				  \
	struct tm *tm;							  \
									  \
	if (sec != sec_)						  \
	if (seconds != seconds_)					  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	[mutex lock];							  \
									  \
	@try {								  \
		if ((tm = localtime(&sec_)) == NULL)			  \
			@throw [OFOutOfRangeException newWithClass: isa]; \
									  \
		return tm->field;					  \
	} @finally {							  \
		[mutex unlock];						  \
	}
# else
#  define GMTIME_RET(field)						  \
	time_t sec_ = (time_t)sec;					  \
	time_t seconds_ = (time_t)seconds;				  \
	struct tm *tm;							  \
									  \
	if (sec != sec_)						  \
	if (seconds != seconds_)					  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	if ((tm = gmtime(&sec_)) == NULL)				  \
	if ((tm = gmtime(&seconds_)) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm->field;
#  define LOCALTIME_RET(field)						  \
	time_t sec_ = (time_t)sec;					  \
	time_t seconds_ = (time_t)seconds;				  \
	struct tm *tm;							  \
									  \
	if (sec != sec_)						  \
	if (seconds != seconds_)					  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	if ((tm = localtime(&sec_)) == NULL)				  \
	if ((tm = localtime(&seconds_)) == NULL)			  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm->field;
# endif
#endif

@implementation OFDate
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
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







-
+

-
+
+


-
-
+
+

-
-
+
+
+


-
+

-
+
+


-
-
+
+

-
-
+
+
+







#endif

+ date
{
	return [[[self alloc] init] autorelease];
}

+ dateWithTimeIntervalSince1970: (int64_t)sec
+ dateWithTimeIntervalSince1970: (int64_t)seconds
{
	return [[[self alloc] initWithTimeIntervalSince1970: sec] autorelease];
	return [[[self alloc]
	    initWithTimeIntervalSince1970: seconds] autorelease];
}

+ dateWithTimeIntervalSince1970: (int64_t)sec
		   microseconds: (uint32_t)usec
+ dateWithTimeIntervalSince1970: (int64_t)seconds
		   microseconds: (uint32_t)microseconds
{
	return [[[self alloc] initWithTimeIntervalSince1970: sec
					       microseconds: usec] autorelease];
	return [[[self alloc]
	    initWithTimeIntervalSince1970: seconds
			     microseconds: microseconds] autorelease];
}

+ dateWithTimeIntervalSinceNow: (int64_t)sec
+ dateWithTimeIntervalSinceNow: (int64_t)seconds
{
	return [[[self alloc] initWithTimeIntervalSinceNow: sec] autorelease];
	return [[[self alloc]
	    initWithTimeIntervalSinceNow: seconds] autorelease];
}

+ dateWithTimeIntervalSinceNow: (int64_t)sec
		  microseconds: (uint32_t)usec
+ dateWithTimeIntervalSinceNow: (int64_t)seconds
		  microseconds: (uint32_t)microseconds
{
	return [[[self alloc] initWithTimeIntervalSinceNow: sec
					      microseconds: usec] autorelease];
	return [[[self alloc]
	    initWithTimeIntervalSinceNow: seconds
			    microseconds: microseconds] autorelease];
}

+ distantFuture
{
	if (sizeof(time_t) == sizeof(int64_t))
		return [[[self alloc]
		    initWithTimeIntervalSince1970: INT64_MAX
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
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







-
+

-
+



-
-
+
+



-
-
+
+




-
+

-
+



-
-
+
+



-
-
+
+

-
-
+
+
-
-






+
+


-
+
+
+
+
+












+
+




-
+
+
+

-
+


-
+

-
+












-
+







		@throw [OFInitializationFailedException newWithClass: c];
	}

	return [self initWithTimeIntervalSince1970: t.tv_sec
				      microseconds: (uint32_t)t.tv_usec];
}

- initWithTimeIntervalSince1970: (int64_t)sec_
- initWithTimeIntervalSince1970: (int64_t)seconds_
{
	return [self initWithTimeIntervalSince1970: sec_
	return [self initWithTimeIntervalSince1970: seconds_
				      microseconds: 0];
}

- initWithTimeIntervalSince1970: (int64_t)sec_
		   microseconds: (uint32_t)usec_
- initWithTimeIntervalSince1970: (int64_t)seconds_
		   microseconds: (uint32_t)microseconds_
{
	self = [super init];

	sec = sec_;
	usec = usec_;
	seconds = seconds_;
	microseconds = microseconds_;

	return self;
}

- initWithTimeIntervalSinceNow: (int64_t)sec_
- initWithTimeIntervalSinceNow: (int64_t)seconds_
{
	return [self initWithTimeIntervalSinceNow: sec_
	return [self initWithTimeIntervalSinceNow: seconds_
				     microseconds: 0];
}

- initWithTimeIntervalSinceNow: (int64_t)sec_
		  microseconds: (uint32_t)usec_
- initWithTimeIntervalSinceNow: (int64_t)seconds_
		  microseconds: (uint32_t)microseconds_
{
	self = [self init];

	sec += sec_;
	usec += usec_;
	seconds += seconds_;
	microseconds += microseconds_;

	while (usec > 999999) {
		usec -= 10000000;
	seconds += microseconds / 1000000;
	microseconds %= 1000000;
		sec++;
	}

	return self;
}

- (BOOL)isEqual: (id)obj
{
	OFDate *otherDate;

	if (![obj isKindOfClass: [OFDate class]])
		return NO;
	if (((OFDate*)obj)->sec != sec || ((OFDate*)obj)->usec != usec)

	otherDate = (OFDate*)obj;

	if (otherDate->seconds != seconds ||
	    otherDate->microseconds != microseconds)
		return NO;

	return YES;
}

- copy
{
	return [self retain];
}

- (of_comparison_result_t)compare: (id)obj
{
	OFDate *otherDate;

	if (![obj isKindOfClass: [OFDate class]])
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	if (sec < ((OFDate*)obj)->sec)
	otherDate = (OFDate*)obj;

	if (seconds < otherDate->seconds)
		return OF_ORDERED_ASCENDING;
	if (sec > ((OFDate*)obj)->sec)
	if (seconds > otherDate->seconds)
		return OF_ORDERED_DESCENDING;

	if (usec < ((OFDate*)obj)->usec)
	if (microseconds < otherDate->microseconds)
		return OF_ORDERED_ASCENDING;
	if (usec > ((OFDate*)obj)->usec)
	if (microseconds > otherDate->microseconds)
		return OF_ORDERED_DESCENDING;

	return OF_ORDERED_SAME;
}

- (OFString*)description
{
	return [self dateStringWithFormat: @"%Y-%m-%dT%H:%M:%SZ"];
}

- (uint32_t)microsecond
{
	return usec;
	return microseconds;
}

- (uint8_t)second
{
	GMTIME_RET(tm_sec)
}

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
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







-
+



-
+



-
+









-
+







{
	LOCALTIME_RET(tm_yday + 1)
}

- (OFString*)dateStringWithFormat: (OFString*)fmt
{
	OFString *ret;
	time_t sec_ = (time_t)sec;
	time_t seconds_ = (time_t)seconds;
	struct tm tm;
	char *buf;

	if (sec != sec_)
	if (seconds != seconds_)
		@throw [OFOutOfRangeException newWithClass: isa];

#ifdef HAVE_GMTIME_R
	if (gmtime_r(&sec_, &tm) == NULL)
	if (gmtime_r(&seconds_, &tm) == NULL)
		@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
	[mutex lock];

	@try {
# endif
		struct tm *tmp;

		if ((tmp = gmtime(&sec_)) == NULL)
		if ((tmp = gmtime(&seconds_)) == NULL)
			@throw [OFOutOfRangeException newWithClass: isa];

		tm = *tmp;
# ifdef OF_THREADS
	} @finally {
		[mutex unlock];
	}
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
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







-
+



-
+



-
+









-
+








	return ret;
}

- (OFString*)localDateStringWithFormat: (OFString*)fmt
{
	OFString *ret;
	time_t sec_ = (time_t)sec;
	time_t seconds_ = (time_t)seconds;
	struct tm tm;
	char *buf;

	if (sec != sec_)
	if (seconds != seconds_)
		@throw [OFOutOfRangeException newWithClass: isa];

#ifdef HAVE_LOCALTIME_R
	if (localtime_r(&sec_, &tm) == NULL)
	if (localtime_r(&seconds_, &tm) == NULL)
		@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
	[mutex lock];

	@try {
# endif
		struct tm *tmp;

		if ((tmp = localtime(&sec_)) == NULL)
		if ((tmp = localtime(&seconds_)) == NULL)
			@throw [OFOutOfRangeException newWithClass: isa];

		tm = *tmp;
# ifdef OF_THREADS
	} @finally {
		[mutex unlock];
	}
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
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







-
+

-
-
+
+




-
+

-
-
+
+






-
+




-
+


-
+

-
-
+
+

-
-
+
+
-
-
-
+
+
-
-
-
+
+


-
+


-
+

-
+

-
-
+

-
-
+
+

-
+








-
-
+
+

-
-
+
+

-
-
+
+
-
-
+
-
-
-
+
+


	} @finally {
		[self freeMemory: buf];
	}

	return ret;
}

- (OFDate*)earlierDate: (OFDate*)date
- (OFDate*)earlierDate: (OFDate*)otherDate
{
	if ([self compare: date] == OF_ORDERED_DESCENDING)
		return [[date retain] autorelease];
	if ([self compare: otherDate] == OF_ORDERED_DESCENDING)
		return [[otherDate retain] autorelease];

	return [[self retain] autorelease];
}

- (OFDate*)laterDate: (OFDate*)date
- (OFDate*)laterDate: (OFDate*)otherDate
{
	if ([self compare: date] == OF_ORDERED_ASCENDING)
		return [[date retain] autorelease];
	if ([self compare: otherDate] == OF_ORDERED_ASCENDING)
		return [[otherDate retain] autorelease];

	return [[self retain] autorelease];
}

- (int64_t)timeIntervalSince1970
{
	return sec;
	return seconds;
}

- (uint32_t)microsecondsOfTimeIntervalSince1970
{
	return usec;
	return microseconds;
}

- (int64_t)timeIntervalSinceDate: (OFDate*)date
- (int64_t)timeIntervalSinceDate: (OFDate*)otherDate
{
	int64_t sec_ = sec - date->sec;
	int32_t usec_ = (int32_t)usec - date->usec;
	int64_t seconds_ = seconds - otherDate->seconds;
	int32_t microseconds_ = (int32_t)microseconds - otherDate->microseconds;

	while (usec_ > 999999) {
		usec_ -= 1000000;
	seconds_ += microseconds_ / 1000000;
	microseconds_ %= 1000000;
		sec_++;
	}


	while (microseconds_ < 0) {
	while (usec_ < 0) {
		usec_ += 1000000;
		sec_--;
		microseconds_ += 1000000;
		seconds_--;
	}

	return sec_;
	return seconds_;
}

- (uint32_t)microsecondsOfTimeIntervalSinceDate: (OFDate*)date
- (uint32_t)microsecondsOfTimeIntervalSinceDate: (OFDate*)otherDate
{
	int32_t usec_ = (int32_t)usec - date->usec;
	int32_t microseconds_ = (int32_t)microseconds - otherDate->microseconds;

	while (usec_ > 999999)
		usec_ -= 1000000;
	microseconds_ %= 1000000;

	while (usec_ < 0)
		usec_ += 1000000;
	while (microseconds_ < 0)
		microseconds_ += 1000000;

	return usec_;
	return microseconds_;
}

- (OFDate*)dateByAddingTimeInterval: (int64_t)sec_
{
	return [self dateByAddingTimeInterval: sec_
			     withMicroseconds: 0];
}

- (OFDate*)dateByAddingTimeInterval: (int64_t)sec_
		   withMicroseconds: (uint32_t)usec_
- (OFDate*)dateByAddingTimeInterval: (int64_t)seconds_
		   withMicroseconds: (uint32_t)microseconds_
{
	sec_ += sec;
	usec_ += usec;
	seconds_ += seconds;
	microseconds_ += microseconds;

	while (usec_ > 999999) {
		usec_ -= 1000000;
	seconds_ += microseconds_ / 1000000;
	microseconds_ %= 1000000;
		sec_++;
	}


	return [OFDate dateWithTimeIntervalSince1970: sec_
					microseconds: usec_];
	return [OFDate dateWithTimeIntervalSince1970: seconds_
					microseconds: microseconds_];
}
@end