3 files changed, 60 insertions, 60 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index 5bcf0cb..6781312 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -77,97 +77,97 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #define yynerrs mime_nerrs

 #define yyerrflag mime_errflag

 #define yyss mime_ss

 #define yyssp mime_ssp

 #define yyvs mime_vs

 #define yyvsp mime_vsp

 #define yylhs mime_lhs

 #define yylen mime_len

 #define yydefred mime_defred

 #define yydgoto mime_dgoto

 #define yysindex mime_sindex

 #define yyrindex mime_rindex

 #define yygindex mime_gindex

 #define yytable mime_table

 #define yycheck mime_check

 #define yyname mime_name

 #define yyrule mime_rule

 #ifdef YYPREFIX

 #undef YYPREFIX

 #endif

 #define YYPREFIX "mime_"

 #endif

 

 

 #ifndef _NO_LINE_FOLDING

 #define _SUPPORT_LINE_FOLDING 1

 #endif

 

 /* undef below if compile with MFC */

 /* #define INCLUDEMFC 1 */

 

 #if defined(WIN32) || defined(_WIN32)

 #ifdef INCLUDEMFC

 #include <afx.h>

 #endif

 #endif

 

 #include <string.h>

 #ifndef __MWERKS__

 #include <stdlib.h>

 #endif

 #include <stdio.h>

 #include <stdlib.h>

 #include <ctype.h>

 

 //#ifdef PALMTOPCENTER

 //#include <qpe/vobject_p.h>

 //#else

-#include "vobject_p.h"

+#include <qtopia/private/vobject_p.h>
 //#endif

 

 /****  Types, Constants  ****/

 

         #define YYDEBUG                 0/* 1 to compile in some debugging code */

         #define MAXTOKEN        256/* maximum token (line) length */

         #define YYSTACKSIZE     100// ~unref ?

         #define MAXLEVEL        10/* max # of nested objects parseable */

                                 /* (includes outermost) */

 

 

 /****  Global Variables  ****/

 int mime_lineNum, mime_numErrors; /* yyerror() can use these */

 static VObject* vObjList;

 static VObject *curProp;

 static VObject *curObj;

 static VObject* ObjStack[MAXLEVEL];

 static int ObjStackTop;

 

 

 /* A helpful utility for the rest of the app. */

 #if __CPLUSPLUS__

 extern "C" {

 #endif

 

     extern void yyerror(char *s);

 

 #if __CPLUSPLUS__

     };

 #endif

 

 int yyparse();

 

 enum LexMode {

         L_NORMAL,

         L_VCARD,

         L_VCAL,

         L_VEVENT,

         L_VTODO,

         L_VALUES,

         L_BASE64,

         L_QUOTED_PRINTABLE

         };

 

 /****  Private Forward Declarations  ****/

 static int pushVObject(const char *prop);

 static VObject* popVObject();

 static void lexPopMode(int top);

diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 19a108f..b2b0c14 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -113,97 +113,97 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #define yynerrs mime_nerrs

 #define yyerrflag mime_errflag

 #define yyss mime_ss

 #define yyssp mime_ssp

 #define yyvs mime_vs

 #define yyvsp mime_vsp

 #define yylhs mime_lhs

 #define yylen mime_len

 #define yydefred mime_defred

 #define yydgoto mime_dgoto

 #define yysindex mime_sindex

 #define yyrindex mime_rindex

 #define yygindex mime_gindex

 #define yytable mime_table

 #define yycheck mime_check

 #define yyname mime_name

 #define yyrule mime_rule

 #ifdef YYPREFIX

 #undef YYPREFIX

 #endif

 #define YYPREFIX "mime_"

 #endif

 

 

 #ifndef _NO_LINE_FOLDING

 #define _SUPPORT_LINE_FOLDING 1

 #endif

 

 /* undef below if compile with MFC */

 /* #define INCLUDEMFC 1 */

 

 #if defined(WIN32) || defined(_WIN32)

 #ifdef INCLUDEMFC

 #include <afx.h>

 #endif

 #endif

 

 #include <string.h>

 #ifndef __MWERKS__

 #include <stdlib.h>

 #endif

 #include <stdio.h>

 #include <stdlib.h>

 #include <ctype.h>

 

 /*#ifdef PALMTOPCENTER
*/
 /*#include <qpe/vobject_p.h>
*/
 /*#else
*/
-#include "vobject_p.h"

+#include <qtopia/private/vobject_p.h>
 /*#endif
*/
 

 /****  Types, Constants  ****/

 

         #define YYDEBUG                 0/* 1 to compile in some debugging code */

         #define MAXTOKEN        256/* maximum token (line) length */

         #define YYSTACKSIZE     100/* ~unref ?
*/
         #define MAXLEVEL        10/* max # of nested objects parseable */

                                 /* (includes outermost) */

 

 

 /****  Global Variables  ****/

 int mime_lineNum, mime_numErrors; /* yyerror() can use these */

 static VObject* vObjList;

 static VObject *curProp;

 static VObject *curObj;

 static VObject* ObjStack[MAXLEVEL];

 static int ObjStackTop;

 

 

 /* A helpful utility for the rest of the app. */

 #if __CPLUSPLUS__

 extern "C" {

 #endif

 

     extern void yyerror(char *s);

 

 #if __CPLUSPLUS__

     };

 #endif

 

 int yyparse();

 

 enum LexMode {

         L_NORMAL,

         L_VCARD,

         L_VCAL,

         L_VEVENT,

         L_VTODO,

         L_VALUES,

         L_BASE64,

         L_QUOTED_PRINTABLE

         };

 

 /****  Private Forward Declarations  ****/

 static int pushVObject(const char *prop);

 static VObject* popVObject();

 static void lexPopMode(int top);

diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index e6f6b78..dab128e 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1,98 +1,98 @@
 /***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+
+For purposes of this license notice, the term Licensors shall mean,
+collectively, Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+The term Licensor shall mean any of the Licensors.
+
+Subject to acceptance of the following conditions, permission is hereby
+granted by Licensors without the need for written agreement and without
+license or royalty fees, to use, copy, modify and distribute this
+software for any purpose.
+
+The above copyright notice and the following four paragraphs must be
+reproduced in all copies of this software and any software including
+this software.
+
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
+ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
+MODIFICATIONS.
+
+IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
+
+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
+disclosure by the government are subject to restrictions set forth in
+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 
 ***************************************************************************/
 
 /*
  * src: vobject.c
- * doc: vobject and APIs to construct vobject, APIs pretty print 
+ * doc: vobject and APIs to construct vobject, APIs pretty print
  * vobject, and convert a vobject into its textual representation.
  */
 
         #ifndef MWERKS
 #include <malloc.h>
 #endif
 
-#include "vobject_p.h"
-#include "qfiledirect_p.h"
+#include <qtopia/private/vobject_p.h>
+#include <qtopia/private/qfiledirect_p.h>
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
 //#include <io.h>
 
 
         #define NAME_OF(o)                      o->id
         #define VALUE_TYPE(o)           o->valType
         #define STRINGZ_VALUE_OF(o)     o->val.strs
         #define INTEGER_VALUE_OF(o)     o->val.i
         #define LONG_VALUE_OF(o)        o->val.l
         #define ANY_VALUE_OF(o)                 o->val.any
         #define VOBJECT_VALUE_OF(o)     o->val.vobj
 
 typedef union ValueItem {
     const char *strs;
     unsigned int i;
     unsigned long l;
     void *any;
     VObject *vobj;
     } ValueItem;
 
 struct VObject {
     VObject *next;
     const char *id;
     VObject *prop;
     unsigned short valType;
     ValueItem val;
     };
 
 typedef struct StrItem StrItem;
 
 struct StrItem {
     StrItem *next;
     const char *s;
     unsigned int refCnt;
     };
 
 const char** fieldedProp;
 
 
 
 /*----------------------------------------------------------------------
    The following functions involve with memory allocation:
         newVObject
         deleteVObject
         dupStr
         deleteStr
@@ -282,173 +282,173 @@ DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)
 
 DLLEXPORT(VObject*) addProp(VObject *o, const char *id)
 {
     return addVObjectProp(o,newVObject(id));
 }
 
 DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)
 {
     return addVObjectProp(o,newVObject_(id));
 }
 
 DLLEXPORT(void) addList(VObject **o, VObject *p)
 {
     p->next = 0;
     if (*o == 0) {
         *o = p;
         }
     else {
         VObject *t = *o;
         while (t->next) {
            t = t->next;
            }
         t->next = p;
         }
 }
 
 DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
 {
     return o->next;
 }
 
 DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
 {
     VObject *sizeProp;
     setVObjectAnyValue(prop, val);
     sizeProp = addProp(prop,VCDataSizeProp);
     setVObjectLongValue(sizeProp, size);
     return prop;
 }
 
 DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
 {
     void *p = dupStr((const char *)val,size);
     return setValueWithSize_(prop,p,p?size:0);
 }
 
 DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
 {
-    i->start = o->prop; 
+    i->start = o->prop;
     i->next = 0;
 }
 
 DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
 {
-    i->start = o->next; 
+    i->start = o->next;
     i->next = 0;
 }
 
 DLLEXPORT(int) moreIteration(VObjectIterator *i)
-{ 
+{
     return (i->start && (i->next==0 || i->next!=i->start));
 }
 
 DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
 {
     if (i->start && i->next != i->start) {
         if (i->next == 0) {
             i->next = i->start->next;
             return i->next;
             }
         else {
             i->next = i->next->next;
             return i->next;
             }
         }
     else return (VObject*)0;
 }
 
 DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
 {
     VObjectIterator i;
     initPropIterator(&i,o);
     while (moreIteration(&i)) {
         VObject *each = nextVObject(&i);
         if (!qstricmp(id,each->id))
             return each;
         }
     return (VObject*)0;
 }
 
 DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
 {
     /*
         a.b.c
         -->
         prop(c)
             prop(VCGrouping=b)
                 prop(VCGrouping=a)
      */
     char *dot = strrchr(g,'.');
     if (dot) {
         VObject *p, *t;
         char *gs, *n = dot+1;
                 gs = dupStr(g,0);/* so we can write to it. */
         /* used to be
         * t = p = addProp_(o,lookupProp_(n));
         */
         t = p = addProp_(o,lookupProp(n));
         dot = strrchr(gs,'.');
         *dot = 0;
         do {
             dot = strrchr(gs,'.');
             if (dot) {
                 n = dot+1;
                 *dot=0;
                 }
             else
                 n = gs;
             /* property(VCGroupingProp=n);
                      *and the value may have VCGrouping property
              */
             t = addProp(t,VCGroupingProp);
             setVObjectStringZValue(t,lookupProp_(n));
             } while (n != gs);
-                deleteStr(gs);
+        deleteStr(gs);
         return p;
         }
     else
         return addProp_(o,lookupProp(g));
 }
 
 DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
 {
     VObject *prop;
     prop = addProp(o,p);
     setVObjectStringZValue_(prop, strdup( v ) );
     return prop;
 }
 
 DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
         unsigned int size)
 {
     VObject *prop;
     prop = addProp(o,p);
     setValueWithSize_(prop, (void*)v, size);
     return prop;
 }
 
 DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
         unsigned int size)
 {
     return addPropSizedValue_(o,p,dupStr(v,size),size);
 }
 
 
 DLLEXPORT(void) cleanVObject(VObject *o)
 {
     if (o == 0) return;
     if (o->prop) {
         /* destroy time: cannot use the iterator here.
            Have to break the cycle in the circular link
            list and turns it into regular NULL-terminated
            list -- since at some point of destruction,
            the reference entry for the iterator to work
            will not longer be valid.
            */
         VObject *p;
         p = o->prop->next;
         o->prop->next = 0;
         do {
            VObject *t = p->next;
            cleanVObject(p);
            p = t;
@@ -754,124 +754,124 @@ static struct PreDefProp propNames[] = {
     { VCQPProp, VCQuotedPrintableProp, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
     { VCRegionProp, 0, 0, 0 },
     { VCRelatedToProp, 0, 0, 0 },
     { VCRepeatCountProp, 0, 0, 0 },
     { VCResourcesProp, 0, 0, 0 },
     { VCRNumProp, 0, 0, 0 },
     { VCRoleProp, 0, 0, 0 },
     { VCRRuleProp, 0, 0, 0 },
     { VCRSVPProp, 0, 0, 0 },
     { VCRunTimeProp, 0, 0, 0 },
     { VCSequenceProp, 0, 0, 0 },
     { VCSnoozeTimeProp, 0, 0, 0 },
     { VCStartProp, 0, 0, 0 },
     { VCStatusProp, 0, 0, 0 },
     { VCStreetAddressProp, 0, 0, 0 },
     { VCSubTypeProp, 0, 0, 0 },
     { VCSummaryProp, 0, 0, 0 },
     { VCTelephoneProp, 0, 0, 0 },
     { VCTIFFProp, 0, 0, 0 },
     { VCTimeZoneProp, 0, 0, 0 },
     { VCTitleProp, 0, 0, 0 },
     { VCTLXProp, 0, 0, 0 },
     { VCTodoProp, 0, 0, PD_BEGIN },
     { VCTranspProp, 0, 0, 0 },
     { VCUniqueStringProp, 0, 0, 0 },
     { VCURLProp, 0, 0, 0 },
     { VCURLValueProp, 0, 0, 0 },
     { VCValueProp, 0, 0, 0 },
     { VCVersionProp, 0, 0, 0 },
     { VCVideoProp, 0, 0, 0 },
     { VCVoiceProp, 0, 0, 0 },
     { VCWAVEProp, 0, 0, 0 },
     { VCWMFProp, 0, 0, 0 },
     { VCWorkProp, 0, 0, 0 },
     { VCX400Prop, 0, 0, 0 },
     { VCX509Prop, 0, 0, 0 },
     { VCXRuleProp, 0, 0, 0 },
     { 0,0,0,0 }
     };
 
 
 static struct PreDefProp* lookupPropInfo(const char* str)
 {
     /* brute force for now, could use a hash table here. */
     int i;
-        
+
     for (i = 0; propNames[i].name; i++)
         if (qstricmp(str, propNames[i].name) == 0) {
             return &propNames[i];
             }
-    
+
     return 0;
 }
 
 
 DLLEXPORT(const char*) lookupProp_(const char* str)
 {
     int i;
-        
+
     for (i = 0; propNames[i].name; i++)
         if (qstricmp(str, propNames[i].name) == 0) {
             const char* s;
             s = propNames[i].alias?propNames[i].alias:propNames[i].name;
             return lookupStr(s);
             }
     return lookupStr(str);
 }
 
 
 DLLEXPORT(const char*) lookupProp(const char* str)
 {
     int i;
-        
+
     for (i = 0; propNames[i].name; i++)
         if (qstricmp(str, propNames[i].name) == 0) {
             const char *s;
             fieldedProp = propNames[i].fields;
             s = propNames[i].alias?propNames[i].alias:propNames[i].name;
             return lookupStr(s);
             }
     fieldedProp = 0;
     return lookupStr(str);
 }
 
 
 /*----------------------------------------------------------------------
   APIs to Output text form.
   ----------------------------------------------------------------------*/
 #define OFILE_REALLOC_SIZE 256
 typedef struct OFile {
     FILE *fp;
     char *s;
     int len;
     int limit;
     int alloc:1;
     int fail:1;
     } OFile;
 
 #if 0
 static void appendsOFile(OFile *fp, const char *s)
 {
     int slen;
     if (fp->fail) return;
     slen  = strlen(s);
     if (fp->fp) {
         fwrite(s,1,slen,fp->fp);
         }
     else {
 stuff:
         if (fp->len + slen < fp->limit) {
             memcpy(fp->s+fp->len,s,slen);
             fp->len += slen;
             return;
             }
         else if (fp->alloc) {
             fp->limit = fp->limit + OFILE_REALLOC_SIZE;
             if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;
             fp->s = (char *) realloc(fp->s,fp->limit);
             if (fp->s) goto stuff;
             }
         if (fp->alloc)
@@ -960,185 +960,185 @@ static void initOFile(OFile *fp, FILE *ofp)
     fp->len = 0;
     fp->limit = 0;
     fp->alloc = 0;
     fp->fail = 0;
 }
 
 static int writeBase64(OFile *fp, unsigned char *s, long len)
 {
     long cur = 0;
     int i, numQuads = 0;
     unsigned long trip;
     unsigned char b;
     char quad[5];
 #define MAXQUADS 16
 
     quad[4] = 0;
 
     while (cur < len) {
         // collect the triplet of bytes into 'trip'
         trip = 0;
         for (i = 0; i < 3; i++) {
             b = (cur < len) ? *(s + cur) : 0;
             cur++;
             trip = trip << 8 | b;
             }
         // fill in 'quad' with the appropriate four characters
         for (i = 3; i >= 0; i--) {
             b = (unsigned char)(trip & 0x3F);
             trip = trip >> 6;
             if ((3 - i) < (cur - len))
                 quad[i] = '='; // pad char
             else if (b < 26) quad[i] = (char)b + 'A';
             else if (b < 52) quad[i] = (char)(b - 26) + 'a';
             else if (b < 62) quad[i] = (char)(b - 52) + '0';
             else if (b == 62) quad[i] = '+';
             else quad[i] = '/';
             }
         // now output 'quad' with appropriate whitespace and line ending
         appendsOFile(fp, (numQuads == 0 ? "    " : ""));
         appendsOFile(fp, quad);
         appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
         numQuads = (numQuads + 1) % MAXQUADS;
         }
     appendcOFile(fp,'\n');
 
     return 1;
 }
 
-static const char *replaceChar(unsigned char c) 
+static const char *replaceChar(unsigned char c)
 {
     if (c == '\n') {
         return "=0A=\n";
     } else if (
-            (c >= 'A' && c <= 'Z') 
+            (c >= 'A' && c <= 'Z')
             ||
-            (c >= 'a' && c <= 'z') 
+            (c >= 'a' && c <= 'z')
             ||
-            (c >= '0' && c <= '9') 
+            (c >= '0' && c <= '9')
             ||
-            (c >= '\'' && c <= ')') 
+            (c >= '\'' && c <= ')')
             ||
-            (c >= '+' && c <= '-') 
+            (c >= '+' && c <= '-')
             ||
             (c == '/')
             ||
-            (c == '?') 
+            (c == '?')
             ||
-            (c == ' ')) 
-    { 
+            (c == ' '))
+    {
         return 0;
     }
 
     static char trans[4];
     trans[0] = '=';
     trans[3] = '\0';
     int rem = c % 16;
     int div = c / 16;
 
     if (div < 10)
         trans[1] = '0' + div;
     else
         trans[1] = 'A' + (div - 10);
 
     if (rem < 10)
         trans[2] = '0' + rem;
     else
         trans[2] = 'A' + (rem - 10);
 
     return trans;
 }
 
 static void writeQPString(OFile *fp, const char *s)
 {
     /*
-        only A-Z, 0-9 and 
+        only A-Z, 0-9 and
        "'"  (ASCII code 39)
        "("  (ASCII code 40)
        ")"  (ASCII code 41)
        "+"  (ASCII code 43)
        ","  (ASCII code 44)
        "-"  (ASCII code 45)
        "/"  (ASCII code 47)
        "?"  (ASCII code 63)
-       
+
        should remain un-encoded.
        '=' needs to be encoded as it is the escape character.
        ';' needs to be as it is a field separator.
 
      */
     const char *p = s;
     while (*p) {
         const char *rep = replaceChar(*p);
         if (rep)
             appendsOFile(fp, rep);
         else
             appendcOFile(fp, *p);
         p++;
     }
 }
 
 static bool includesUnprintable(VObject *o)
 {
     if (o) {
         if (VALUE_TYPE(o) == VCVT_STRINGZ) {
             const char *p = STRINGZ_VALUE_OF(o);
             if (p) {
                 while (*p) {
                     if (replaceChar(*p))
                         return TRUE;
                     p++;
                 }
             }
         }
     }
     return FALSE;
 }
-            
+
 static void writeVObject_(OFile *fp, VObject *o);
 
 static void writeValue(OFile *fp, VObject *o, unsigned long size)
 {
     if (o == 0) return;
     switch (VALUE_TYPE(o)) {
         case VCVT_STRINGZ: {
             writeQPString(fp, STRINGZ_VALUE_OF(o));
             break;
             }
         case VCVT_UINT: {
             char buf[16];
             sprintf(buf,"%u", INTEGER_VALUE_OF(o));
             appendsOFile(fp,buf);
             break;
             }
         case VCVT_ULONG: {
             char buf[16];
             sprintf(buf,"%lu", LONG_VALUE_OF(o));
             appendsOFile(fp,buf);
             break;
             }
         case VCVT_RAW: {
             appendcOFile(fp,'\n');
             writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
             break;
             }
         case VCVT_VOBJECT:
             appendcOFile(fp,'\n');
             writeVObject_(fp,VOBJECT_VALUE_OF(o));
             break;
         }
 }
 
 static void writeAttrValue(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
         if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
         if ( includesUnprintable(o) ) {
             appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
             appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
         }
         appendcOFile(fp,';');
         appendsOFile(fp,NAME_OF(o));
         }
     else
@@ -1184,97 +1184,97 @@ static void writeProp(OFile *fp, VObject *o)
             writeVObject_(fp,o);
             return;
             }
         if (isAPropertyOf(o,VCGroupingProp))
             writeGroup(fp,o);
         else
             appendsOFile(fp,NAME_OF(o));
         if (pi) fields_ = pi->fields;
         initPropIterator(&t,o);
         while (moreIteration(&t)) {
             const char *s;
             VObject *eachProp = nextVObject(&t);
             s = NAME_OF(eachProp);
             if (qstricmp(VCGroupingProp,s) && !inList(fields_,s))
                 writeAttrValue(fp,eachProp);
             }
         if (fields_) {
             int i = 0, n = 0;
             const char** fields = fields_;
             /* output prop as fields */
             bool printable = TRUE;
             while (*fields && printable) {
                 VObject *t = isAPropertyOf(o,*fields);
                 if (includesUnprintable(t))
                     printable = FALSE;
                 fields++;
             }
             fields = fields_;
             if (!printable) {
                 appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
                 appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
             }
             appendcOFile(fp,':');
             while (*fields) {
                 VObject *t = isAPropertyOf(o,*fields);
                 i++;
                 if (t) n = i;
                 fields++;
             }
             fields = fields_;
             for (i=0;i<n;i++) {
                 writeValue(fp,isAPropertyOf(o,*fields),0);
                 fields++;
                 if (i<(n-1)) appendcOFile(fp,';');
             }
             }
         }
 
-        
+
     if (VALUE_TYPE(o)) {
             if ( includesUnprintable(o) ) {
             appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
             appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
         }
         unsigned long size = 0;
         VObject *p = isAPropertyOf(o,VCDataSizeProp);
         if (p) size = LONG_VALUE_OF(p);
         appendcOFile(fp,':');
         writeValue(fp,o,size);
         }
 
     appendcOFile(fp,'\n');
 }
 
 static void writeVObject_(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
 
         if (pi && ((pi->flags & PD_BEGIN) != 0)) {
             VObjectIterator t;
             const char *begin = NAME_OF(o);
             appendsOFile(fp,"BEGIN:");
             appendsOFile(fp,begin);
             appendcOFile(fp,'\n');
             initPropIterator(&t,o);
             while (moreIteration(&t)) {
                 VObject *eachProp = nextVObject(&t);
                 writeProp(fp, eachProp);
                 }
             appendsOFile(fp,"END:");
             appendsOFile(fp,begin);
             appendsOFile(fp,"\n\n");
             }
         }
 }
 
 void writeVObject(FILE *fp, VObject *o)
 {
     OFile ofp;
     // #####
     //_setmode(_fileno(fp), _O_BINARY);
     initOFile(&ofp,fp);
     writeVObject_(&ofp,o);
 }