git-svn: trunk@2560
Nigel Horne authored on 2006/12/17 01:58:17... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Sat Dec 16 16:57:27 GMT 2006 (njh) |
|
2 |
+---------------------------------- |
|
3 |
+ * libclamav/pst.c: Fixed typo |
|
4 |
+ |
|
1 | 5 |
Sat Dec 16 00:47:04 CET 2006 (tk) |
2 | 6 |
--------------------------------- |
3 | 7 |
* libclamav/md5.c: updated version providing better performance on x86-64 |
... | ... |
@@ -268,7 +272,7 @@ Sun Nov 5 09:57:44 GMT 2006 (njh) |
268 | 268 |
Sun Nov 5 02:25:39 CET 2006 (acab) |
269 | 269 |
----------------------------------- |
270 | 270 |
* libclamav/pe.c: RVA broken.executable checks |
271 |
- skip checks on virtual-only sections (reported by |
|
271 |
+ skip checks on virtual-only sections (reported by |
|
272 | 272 |
Andrey J. Melnikoff (TEMHOTA) <temnota * kmv.ru> ) |
273 | 273 |
|
274 | 274 |
Sun Nov 5 00:45:44 CET 2006 (acab) |
... | ... |
@@ -36,7 +36,7 @@ |
36 | 36 |
* TODO: Remove the vcard handling |
37 | 37 |
* FIXME: The code does little error checking of OOM scenarios |
38 | 38 |
*/ |
39 |
-static char const rcsid[] = "$Id: pst.c,v 1.41 2006/12/11 09:37:13 njh Exp $"; |
|
39 |
+static char const rcsid[] = "$Id: pst.c,v 1.42 2006/12/16 16:57:01 njh Exp $"; |
|
40 | 40 |
|
41 | 41 |
#if HAVE_CONFIG_H |
42 | 42 |
#include "clamav-config.h" /* must come first */ |
... | ... |
@@ -3602,6 +3602,7 @@ int32_t _pst_process(pst_num_array *list , pst_item *item) { |
3602 | 3602 |
} |
3603 | 3603 |
break; |
3604 | 3604 |
case 0x0821: // All day appointment flag |
3605 |
+ case 0x0815: // All day appointment flag |
|
3605 | 3606 |
cli_dbgmsg("All day flag - "); |
3606 | 3607 |
MALLOC_APPOINTMENT(item); |
3607 | 3608 |
if(*(int16_t *)list->items[x]->data != 0) { |
... | ... |
@@ -5554,13 +5555,15 @@ pst_decode(const char *dir, int desc) |
5554 | 5554 |
fprintf(f->output, "SUMMARY:%s\n", rfc2426_escape(item->email->subject->subj, &rfc2426ptr)); |
5555 | 5555 |
if (item->email != NULL && item->email->body != NULL) |
5556 | 5556 |
fprintf(f->output, "DESCRIPTION:%s\n", rfc2426_escape(item->email->body, &rfc2426ptr)); |
5557 |
- if (item->appointment != NULL && item->appointment->start != NULL) |
|
5558 |
- fprintf(f->output, "DTSTART;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->start, rfc2445buffer, sizeof(rfc2445buffer))); |
|
5559 |
- if (item->appointment != NULL && item->appointment->end != NULL) |
|
5560 |
- fprintf(f->output, "DTEND;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->end, rfc2445buffer, sizeof(rfc2445buffer))); |
|
5561 |
- if (item->appointment != NULL && item->appointment->location != NULL) |
|
5562 |
- fprintf(f->output, "LOCATION:%s\n", rfc2426_escape(item->appointment->location, &rfc2426ptr)); |
|
5563 | 5557 |
if (item->appointment != NULL) { |
5558 |
+ if (item->appointment->start != NULL) |
|
5559 |
+ fprintf(f->output, "DTSTART;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->start, rfc2445buffer, sizeof(rfc2445buffer))); |
|
5560 |
+ if (item->appointment->end != NULL) |
|
5561 |
+ fprintf(f->output, "DTEND;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->end, rfc2445buffer, sizeof(rfc2445buffer))); |
|
5562 |
+ if (item->appointment->location != NULL) |
|
5563 |
+ fprintf(f->output, "LOCATION:%s\n", rfc2426_escape(item->appointment->location, &rfc2426ptr)); |
|
5564 |
+ fprintf(f->output, "ALLDAY:%s\n", item->appointment->all_day ? "Yes" : "No"); |
|
5565 |
+ |
|
5564 | 5566 |
switch (item->appointment->showas) { |
5565 | 5567 |
case PST_FREEBUSY_TENTATIVE: |
5566 | 5568 |
fputs("STATUS:TENTATIVE\n", f->output); |