using releases from qtopia-free-1.6.0-snapshot-20030324 which fixes the

following bugs #776 and #490:
Now, we could successfully parse vcards from palm 4 + 5 and
quoted-printable encoded lines .. !

4 files changed, 251 insertions, 214 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index 6781312..94a8fea 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -109,33 +109,33 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #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 <qtopia/private/vobject_p.h>
+#include "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;

@@ -710,42 +710,48 @@ static void handleMoreRFC822LineBreak(int c) {
 	    else {

 		lexPushLookaheadc('\n');

 		lexPushLookaheadc(';');

 		}

 	    }

 	else {

 	    lexPushLookaheadc(';');

 	    }

 	}

     }

 

 static char* lexGet1Value() {

     int c;

     lexSkipWhite();

     c = lexLookahead();

     lexClearToken();

-    while (c != EOF && c != ';') {

+    while (c != EOF && (c != ';' || !fieldedProp)) {

 	if (c == '\\' ) {

 	    int a;

 	    lexSkipLookahead();

 	    a = lexLookahead();

-	    if ( a != ';' ) {

-		lexAppendc('\\');

-	    } else {

+	    if ( a == ';' ) {

 		lexAppendc( ';' );

 		lexSkipLookahead();

+	    } else if ( a == '\n' ) {

+		lexAppendc( '\n' );

+		lexSkipLookahead();

+	    } else if ( a == '\\' ) {

+		lexAppendc( '\\' );

+		lexSkipLookahead();

+	    } else {

+		lexAppendc('\\');

 	    }

 	} else if (c == '\n') {

 	    int a;

 	    lexSkipLookahead();

 	    a  = lexLookahead();

 	    if (a == ' ' || a == '\t') {

 		lexAppendc(' ');

 		lexSkipLookahead();

 		}

 	    else {

 		lexPushLookaheadc('\n');

 		break;

 		}

 	    }

 	else {

 	    lexAppendc(c);

@@ -948,72 +954,74 @@ static char* lexGetQuotedPrintable()
 	    next = lexLookahead();

 

 	    if (next == '\n') {

 		// skip and only skip the \n

 		lexSkipLookahead(); 

 		c = lexLookahead();

 		++mime_lineNum; // aid in error reporting

 		continue;

 	    } else if (next >= '0' && next <= '9') {

 		cur = next - '0';

 	    } else if (next >= 'A' && next <= 'F') {

 		cur = next - 'A' + 10;

 	    } else {

 		// we have been sent buggy stuff. doesn't matter

 		// what we do so long as we keep going.

 		// should probably spit an error here

+		lexSkipLookahead(); 

 		c = lexLookahead();

 		continue;

 	    }

 

 	    lexSkipLookahead(); // skip A-Z0-9

 	    next = lexLookahead();

 

 	    cur = cur * 16;

 	    // this time really just expecting 0-9A-F

 	    if (next >= '0' && next <= '9') {

 		cur += next - '0';

 	    } else if (next >= 'A' && next <= 'F') {

 		cur += next - 'A' + 10;

 	    } else {

 		// we have been sent buggy stuff. doesn't matter

 		// what we do so long as we keep going.

 		// should probably spit an error here

+		lexSkipLookahead(); 

 		c = lexLookahead();

 		continue;

 	    }

 

 	    // got a valid escaped =.  append it.

 	    lexSkipLookahead(); // skip second 0-9A-F

 	    lexAppendc(cur);

 	} else {

 	    lexSkipLookahead(); // skip whatever we just read.

 	    lexAppendc(c); // and append it.

 	}

 	c = lexLookahead();

     }

     lexAppendc(0);

     return c==EOF?0:lexStr();

 }

 

 static int yylex() {

 

     int lexmode = LEXMODE();

     if (lexmode == L_VALUES) {

 	int c = lexGetc();

-	if (c == ';') {

+	if (c == ';' && fieldedProp) {

 	    DBG_(("db: SEMICOLON\n"));

 	    lexPushLookaheadc(c);

 	    handleMoreRFC822LineBreak(c);

 	    lexSkipLookahead();

 	    return SEMICOLON;

 	    }

 	else if (strchr("\n",c)) {

 	    ++mime_lineNum;

 	    /* consume all line separator(s) adjacent to each other */

 	    c = lexLookahead();

 	    while (strchr("\n",c)) {

 		lexSkipLookahead();

 		c = lexLookahead();

 		++mime_lineNum;

 		}

 	    DBG_(("db: LINESEP\n"));

@@ -1041,38 +1049,40 @@ static int yylex() {
 	    if (p) {

 		DBG_(("db: STRING: '%s'\n", p));

 		yylval.str = p;

 		return STRING;

 		}

 	    else return 0;

 	    }

 	}

     else {

 	/* normal mode */

 	while (1) {

 	    int c = lexGetc();

 	    switch(c) {

 		case ':': {

 		    /* consume all line separator(s) adjacent to each other */

 		    /* ignoring linesep immediately after colon. */

+		    /* I don't see this in the spec, and it breaks null values -- WA

 		    c = lexLookahead();

 		    while (strchr("\n",c)) {

 			lexSkipLookahead();

 			c = lexLookahead();

 			++mime_lineNum;

 			}

+		    */

 		    DBG_(("db: COLON\n"));

 		    return COLON;

 		    }

 		case ';':

 		    DBG_(("db: SEMICOLON\n"));

 		    return SEMICOLON;

 		case '=':

 		    DBG_(("db: EQ\n"));

 		    return EQ;

 		/* ignore whitespace in this mode */

 		case '\t':

 		case ' ': continue;

 		case '\n': {

 		    ++mime_lineNum;

 		    continue;

 		    }

diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index b2b0c14..5649522 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -145,33 +145,33 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #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 <qtopia/private/vobject_p.h>
+#include "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;

@@ -730,42 +730,48 @@ static void handleMoreRFC822LineBreak(int c) {
 	    else {

 		lexPushLookaheadc('\n');

 		lexPushLookaheadc(';');

 		}

 	    }

 	else {

 	    lexPushLookaheadc(';');

 	    }

 	}

     }

 

 static char* lexGet1Value() {

     int c;

     lexSkipWhite();

     c = lexLookahead();

     lexClearToken();

-    while (c != EOF && c != ';') {

+    while (c != EOF && (c != ';' || !fieldedProp)) {

 	if (c == '\\' ) {

 	    int a;

 	    lexSkipLookahead();

 	    a = lexLookahead();

-	    if ( a != ';' ) {

-		lexAppendc('\\');

-	    } else {

+	    if ( a == ';' ) {

 		lexAppendc( ';' );

 		lexSkipLookahead();

+	    } else if ( a == '\n' ) {

+		lexAppendc( '\n' );

+		lexSkipLookahead();

+	    } else if ( a == '\\' ) {

+		lexAppendc( '\\' );

+		lexSkipLookahead();

+	    } else {

+		lexAppendc('\\');

 	    }

 	} else if (c == '\n') {

 	    int a;

 	    lexSkipLookahead();

 	    a  = lexLookahead();

 	    if (a == ' ' || a == '\t') {

 		lexAppendc(' ');

 		lexSkipLookahead();

 		}

 	    else {

 		lexPushLookaheadc('\n');

 		break;

 		}

 	    }

 	else {

 	    lexAppendc(c);

@@ -937,94 +943,105 @@ static int match_begin_end_name(int end) {
     token = match_begin_name(end);

     if (token == ID) {

 	lexPushLookaheadc(':');

 	DBG_(("db: ID '%s'\n", yylval.str));

 	return ID;

 	}

     else if (token != 0) {

 	lexSkipLookaheadWord();

 	deleteStr(yylval.str);

 	DBG_(("db: begin/end %d\n", token));

 	return token;

 	}

     return 0;

     }

 

 static char* lexGetQuotedPrintable()

-    {

-    int cur;

-

+{

+    int c;

+    lexSkipWhite();

+    c = lexLookahead();

     lexClearToken();

-    do {

-	cur = lexGetc();

-	switch (cur) {

-	    case '=': {

-		int c = 0;

-		int next[2];

-		int i;

-		for (i = 0; i < 2; i++) {

-		    next[i] = lexGetc();

-		    if (next[i] >= '0' && next[i] <= '9')

-			c = c * 16 + next[i] - '0';

-		    else if (next[i] >= 'A' && next[i] <= 'F')

-			c = c * 16 + next[i] - 'A' + 10;

-		    else

-			break;

-		    }

-		if (i == 0) {

-		    /* single '=' follow by LINESEP is continuation sign? */

-		    if (next[0] == '\n') {

-			++mime_lineNum;

-			}

-		    else {

-			lexPushLookaheadc('=');

-			goto EndString;

-			}

-		    }

-		else if (i == 1) {

-		    lexPushLookaheadc(next[1]);

-		    lexPushLookaheadc(next[0]);

-		    lexAppendc('=');

-		} else {

-		    lexAppendc(c);

-		    }

-		break;

-		} /* '=' */

-	    case '\n': {

-		lexPushLookaheadc('\n');

-		goto EndString;

-		}

-	    case (int)EOF:

-		break;

-	    default:

-		lexAppendc(cur);

-		break;

-	    } /* switch */

-	} while (cur != (int)EOF);

 

-EndString:

+    while (c != EOF && c != ';') {

+	if (c == '\n') {

+	    // break, leave '\n' on remaining chars.

+	    break;

+	} else if (c == '=') {

+	    int cur = 0;

+	    int next;

+

+	    lexSkipLookahead(); // skip '='

+	    next = lexLookahead();

+

+	    if (next == '\n') {

+		// skip and only skip the \n

+		lexSkipLookahead(); 

+		c = lexLookahead();

+		++mime_lineNum; // aid in error reporting

+		continue;

+	    } else if (next >= '0' && next <= '9') {

+		cur = next - '0';

+	    } else if (next >= 'A' && next <= 'F') {

+		cur = next - 'A' + 10;

+	    } else {

+		// we have been sent buggy stuff. doesn't matter

+		// what we do so long as we keep going.

+		// should probably spit an error here

+		lexSkipLookahead(); 

+		c = lexLookahead();

+		continue;

+	    }

+

+	    lexSkipLookahead(); // skip A-Z0-9

+	    next = lexLookahead();

+

+	    cur = cur * 16;

+	    // this time really just expecting 0-9A-F

+	    if (next >= '0' && next <= '9') {

+		cur += next - '0';

+	    } else if (next >= 'A' && next <= 'F') {

+		cur += next - 'A' + 10;

+	    } else {

+		// we have been sent buggy stuff. doesn't matter

+		// what we do so long as we keep going.

+		// should probably spit an error here

+		lexSkipLookahead(); 

+		c = lexLookahead();

+		continue;

+	    }

+

+	    // got a valid escaped =.  append it.

+	    lexSkipLookahead(); // skip second 0-9A-F

+	    lexAppendc(cur);

+	} else {

+	    lexSkipLookahead(); // skip whatever we just read.

+	    lexAppendc(c); // and append it.

+	}

+	c = lexLookahead();

+    }

     lexAppendc(0);

-    return lexStr();

-    } /* LexQuotedPrintable */

+    return c==EOF?0:lexStr();

+}

 

 static int yylex() {

 

     int lexmode = LEXMODE();

     if (lexmode == L_VALUES) {

 	int c = lexGetc();

-	if (c == ';') {

+	if (c == ';' && fieldedProp) {

 	    DBG_(("db: SEMICOLON\n"));

 	    lexPushLookaheadc(c);

 	    handleMoreRFC822LineBreak(c);

 	    lexSkipLookahead();

 	    return SEMICOLON;

 	    }

 	else if (strchr("\n",c)) {

 	    ++mime_lineNum;

 	    /* consume all line separator(s) adjacent to each other */

 	    c = lexLookahead();

 	    while (strchr("\n",c)) {

 		lexSkipLookahead();

 		c = lexLookahead();

 		++mime_lineNum;

 		}

 	    DBG_(("db: LINESEP\n"));

@@ -1052,38 +1069,40 @@ static int yylex() {
 	    if (p) {

 		DBG_(("db: STRING: '%s'\n", p));

 		yylval.str = p;

 		return STRING;

 		}

 	    else return 0;

 	    }

 	}

     else {

 	/* normal mode */

 	while (1) {

 	    int c = lexGetc();

 	    switch(c) {

 		case ':': {

 		    /* consume all line separator(s) adjacent to each other */

 		    /* ignoring linesep immediately after colon. */

+		    /* I don't see this in the spec, and it breaks null values -- WA

 		    c = lexLookahead();

 		    while (strchr("\n",c)) {

 			lexSkipLookahead();

 			c = lexLookahead();

 			++mime_lineNum;

 			}

+		    */

 		    DBG_(("db: COLON\n"));

 		    return COLON;

 		    }

 		case ';':

 		    DBG_(("db: SEMICOLON\n"));

 		    return SEMICOLON;

 		case '=':

 		    DBG_(("db: EQ\n"));

 		    return EQ;

 		/* ignore whitespace in this mode */

 		case '\t':

 		case ' ': continue;

 		case '\n': {

 		    ++mime_lineNum;

 		    continue;

 		    }

@@ -1204,33 +1223,33 @@ DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)
 void mime_error(char *s)

     {

     char msg[256];

     if (mimeErrorHandler) {

 	sprintf(msg,"%s at line %d", s, mime_lineNum);

 	mimeErrorHandler(msg);

 	}

     }

 

 void mime_error_(char *s)

     {

     if (mimeErrorHandler) {

 	mimeErrorHandler(s);

 	}

     }

 

-#line 1221 "y.tab.c"
+#line 1240 "y.tab.c"
 #define YYABORT goto yyabort
 #define YYREJECT goto yyabort
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
 int
 #if defined(__STDC__)
 yyparse(void)
 #else
 yyparse()
 #endif
 {
     register int yym, yyn, yystate;
 #if YYDEBUG
     register char *yys;
     extern char *getenv();
 
@@ -1504,33 +1523,33 @@ case 43:
 	}
 break;
 case 44:
 #line 371 "backend/vcc.y"
 {

 	lexPushMode(L_VTODO);

 	if (!pushVObject(VCTodoProp)) YYERROR;

 	}
 break;
 case 45:
 #line 376 "backend/vcc.y"
 {

 	lexPopMode(0);

 	popVObject();

 	}
 break;
-#line 1521 "y.tab.c"
+#line 1540 "y.tab.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
     yyvsp -= yym;
     yym = yylhs[yyn];
     if (yystate == 0 && yym == 0)
     {
 #if YYDEBUG
         if (yydebug)
             printf("%sdebug: after reduction, shifting from state 0 to\
  state %d\n", YYPREFIX, YYFINAL);
 #endif
         yystate = YYFINAL;
         *++yyssp = YYFINAL;
         *++yyvsp = yyval;
         if (yychar < 0)
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index 2c5b577..b6d17dc 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1,105 +1,110 @@
 /***************************************************************************
-(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 <qtopia/private/vobject_p.h>
-#include <qtopia/private/qfiledirect_p.h>
+#include <qtopia/config.h>
+#include "vobject_p.h"
+#include "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
 
+static char vobj_cs[10];
+static enum { EightBit, QuotedPrintable, Base64 } vobj_enc=EightBit;
+static const char *vobj_enc_s=0;
+
 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;
+DLLEXPORT(const char**) fieldedProp;
 
 
 
 /*----------------------------------------------------------------------
    The following functions involve with memory allocation:
 	newVObject
 	deleteVObject
 	dupStr
 	deleteStr
 	newStrItem
 	deleteStrItem
    ----------------------------------------------------------------------*/
 
 DLLEXPORT(VObject*) newVObject_(const char *id)
 {
     VObject *p = (VObject*)malloc(sizeof(VObject));
@@ -314,44 +319,44 @@ DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int siz
 {
     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;
@@ -390,33 +395,33 @@ DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
 	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)
@@ -786,60 +791,60 @@ static struct PreDefProp propNames[] = {
     { 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
@@ -940,32 +945,43 @@ static void appendcOFile(OFile *fp, char c)
 	}
     else
 	appendcOFile_(fp,c);
 }
 
 static void appendsOFile(OFile *fp, const char *s)
 {
     int i, slen;
     slen  = strlen(s);
     for (i=0; i<slen; i++) {
 	appendcOFile(fp,s[i]);
 	}
 }
 
 #endif
 
+static void appendsOFileEncCs(OFile *fp)
+{
+    if ( vobj_enc_s ) {
+	appendsOFile(fp, ";" VCEncodingProp "=");
+	appendsOFile(fp, vobj_enc_s);
+    }
+    appendsOFile(fp, ";" VCCharSetProp "=");
+    appendsOFile(fp, vobj_cs);
+}
+
+
 static void initOFile(OFile *fp, FILE *ofp)
 {
     fp->fp = ofp;
     fp->s = 0;
     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;
@@ -992,200 +1008,185 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
 	    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 *qpReplaceChar(unsigned char c) 
 {
     if (c == '\n') {
 	return "=0A=\n";
     } else if (
-	    (c >= 'A' && c <= 'Z')
-	    ||
-	    (c >= 'a' && c <= 'z')
-	    ||
-	    (c >= '0' && c <= '9')
-	    ||
-	    (c >= '\'' && c <= ')')
-	    ||
-	    (c >= '+' && c <= '-')
-	    ||
-	    (c == '/')
-	    ||
-	    (c == '?')
+	    // RFC 1521
+	    (c >= 32 && c <= 60) // Note: " " not allowed at EOL
 	    ||
-	    (c == ' '))
-    {
+	    (c >= 62 && c <= 126)
+	)
+    { 
 	return 0;
     }
 
-#warning "Bug-Workaround must be fixed !"
-	// IF THIS FUNCTION RETURNES TRUE, THE DATA IS EXPORTED
-	// AS QUOTED PRINTABLE. 
-	// BUT THE PARSER IS UNABLE TO IMPORT THIS, THEREFORE 
-	// I DECIDED TO DISABLE IT UNTIL TROLLTECH FIXES THIS BUG
-        // SEE ALSO includesUnprintable(VObject *o)
-	// (se)
-
-    return 0;
-
-#if 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;
-#endif
 }
 
-static void writeQPString(OFile *fp, const char *s)
+static void writeEncString(OFile *fp, const char *s, bool nosemi)
 {
     /*
-	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++;
+    switch ( vobj_enc ) {
+	case EightBit:
+	    while (*p) {
+		if ( *p == '\n' || nosemi && ( *p == '\\' || *p == ';' ) )
+		    appendcOFile(fp, '\\');
+		appendcOFile(fp, *p);
+		p++;
+	    }
+	    break;
+	case QuotedPrintable:
+	    while (*p) {
+		const char *rep = qpReplaceChar(*p);
+		if (rep)
+		    appendsOFile(fp, rep);
+		else if ( *p == ';' && nosemi )
+		    appendsOFile(fp, "=3B");
+		else if ( *p == ' ' ) {
+		    if ( !p[1] || p[1] == '\n' ) // RFC 1521
+			appendsOFile(fp, "=20");
+		    else
+			appendcOFile(fp, *p);
+		} else
+		    appendcOFile(fp, *p);
+		p++;
+	    }
+	    break;
+	case Base64:
+	    writeBase64(fp, (unsigned char*)p, strlen(p));
+	    break;
     }
 }
 
 static bool includesUnprintable(VObject *o)
 {
-
-#if 0
-
-	// IF THIS FUNCTION RETURNES TRUE, THE DATA IS EXPORTED
-	// AS QUOTED PRINTABLE. 
-	// BUT THE PARSER IS UNABLE TO IMPORT THIS, THEREFORE 
-	// I DECIDED TO DISABLE IT UNTIL TROLLTECH FIXES THIS BUG
-	// SEE ALSO *replaceChar(unsigned char c)
-	// (se)
-
     if (o) {
 	if (VALUE_TYPE(o) == VCVT_STRINGZ) {
 	    const char *p = STRINGZ_VALUE_OF(o);
 	    if (p) {
 		while (*p) {
-		    if (replaceChar(*p))
+		    if (*p==' ' && (!p[1] || p[1]=='\n') // RFC 1521: spaces at ends need quoting
+			     || qpReplaceChar(*p) )
 			return TRUE;
 		    p++;
 		}
 	    }
 	}
     }
-
-#endif
-#warning "Bug-Workaround must be fixed !"
-
     return FALSE;
 }
-
+	    
 static void writeVObject_(OFile *fp, VObject *o);
 
-static void writeValue(OFile *fp, VObject *o, unsigned long size)
+static void writeValue(OFile *fp, VObject *o, unsigned long size, bool nosemi)
 {
     if (o == 0) return;
     switch (VALUE_TYPE(o)) {
 	case VCVT_STRINGZ: {
-	    writeQPString(fp, STRINGZ_VALUE_OF(o));
+	    writeEncString(fp, STRINGZ_VALUE_OF(o), nosemi);
 	    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");
-	}
+	if ( includesUnprintable(o) )
+	    appendsOFileEncCs(fp);
 	appendcOFile(fp,';');
 	appendsOFile(fp,NAME_OF(o));
-	}
-    else
+    } else {
 	appendcOFile(fp,';');
+    }
     if (VALUE_TYPE(o)) {
 	appendcOFile(fp,'=');
-	writeValue(fp,o,0);
-	}
+	writeValue(fp,o,0,TRUE);
+    }
 }
 
 static void writeGroup(OFile *fp, VObject *o)
 {
     char buf1[256];
     char buf2[256];
     strcpy(buf1,NAME_OF(o));
     while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
 	strcpy(buf2,STRINGZ_VALUE_OF(o));
 	strcat(buf2,".");
 	strcat(buf2,buf1);
 	strcpy(buf1,buf2);
 	}
     appendsOFile(fp,buf1);
 }
 
@@ -1222,125 +1223,143 @@ static void writeProp(OFile *fp, VObject *o)
 	    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");
-	    }
+	    if (!printable)
+		appendsOFileEncCs(fp);
 	    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);
+		writeValue(fp,isAPropertyOf(o,*fields),0,TRUE);
 		fields++;
 		if (i<(n-1)) appendcOFile(fp,';');
 	    }
 	    }
 	}
 
-
+	
     if (VALUE_TYPE(o)) {
-	    if ( includesUnprintable(o) ) {
-	    appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
-	    appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
-	}
+	    if ( includesUnprintable(o) )
+			appendsOFileEncCs(fp);
 	unsigned long size = 0;
         VObject *p = isAPropertyOf(o,VCDataSizeProp);
 	if (p) size = LONG_VALUE_OF(p);
 	appendcOFile(fp,':');
-	writeValue(fp,o,size);
+	writeValue(fp,o,size,FALSE);
 	}
 
     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");
 	    }
 	}
 }
 
+static void initVObjectEncoding()
+{
+    Config pimConfig( "Beam" );
+    pimConfig.setGroup("Send");
+    Config devcfg(pimConfig.readEntry("DeviceConfig"),Config::File);
+    QString enc = "QP";
+    QString cs = "UTF-8";
+    if ( devcfg.isValid() ) {
+	devcfg.setGroup("Send");
+	enc = devcfg.readEntry("Encoding","QP"); 
+	cs = devcfg.readEntry("CharSet","UTF-8"); 
+    }
+    strncpy(vobj_cs,cs.latin1(),10);
+    if ( enc == "QP" ) {
+	vobj_enc = QuotedPrintable;
+	vobj_enc_s = VCQuotedPrintableProp;
+    } else if ( enc == "B64" ) {
+	vobj_enc = Base64;
+	vobj_enc_s = VCBase64Prop;
+    } else {
+	vobj_enc = EightBit;
+	vobj_enc_s = 0;
+    }
+}
+
 void writeVObject(FILE *fp, VObject *o)
 {
+    initVObjectEncoding();
+
     OFile ofp;
     // #####
     //_setmode(_fileno(fp), _O_BINARY);
     initOFile(&ofp,fp);
     writeVObject_(&ofp,o);
 }
 
 DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
 {
 	QFileDirect f( fname);
 	if ( !f.open( IO_WriteOnly ) ) {
 		qWarning("Unable to open vobject write %s", fname);
 		return;
 	}
 
     writeVObject( f.directHandle(),o );
 }
 
 DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
 {
 	QFileDirect f( fname);
 	if ( !f.open( IO_WriteOnly ) ) {
 		qWarning("Unable to open vobject write %s", fname);
 		return;
 	}
 
 	while (list) {
 	    writeVObject(f.directHandle(),list);
 	    list = nextVObjectInList(list);
 	    }
 }
 
-#ifndef __SHARP_COMP_
-
-// This function is not available in the Sharp ROM for SL 5500 !
-// Therefore I have to move it into the header file.. (se)
-
 DLLEXPORT(const char *) vObjectTypeInfo(VObject *o)
 {
     const char *type = vObjectName( o );
     if ( strcmp( type, "TYPE" ) == 0 )
 	type = vObjectStringZValue( o );
     return type;
 }
-#endif
+
 
 // end of source file vobject.c
diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index bab22bb..f969898 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -86,37 +86,41 @@ which accompanied this distribution.
 #define	vCalendarClipboardFormat	"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
 
 /* The above strings vCardClipboardFormat and vCalendarClipboardFormat
 are globally unique IDs which can be used to generate clipboard format
 ID's as per the requirements of a specific platform. For example, in
 Windows they are used as the parameter in a call to RegisterClipboardFormat.
 For example:
 
   CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
 
 */
 
 #define vCardMimeType		"text/x-vCard"
 #define vCalendarMimeType	"text/x-vCalendar"
 
 #undef DLLEXPORT
+	//#include <qtopia/qpeglobal.h>
 #include <qglobal.h>
-#if defined(Q_WS_WIN)
+
+#if defined(QTOPIA_MAKEDLL)
 #define DLLEXPORT(t)   __declspec(dllexport) t
+#elif defined(QTOPIA_DLL)
+#define DLLEXPORT(t)   __declspec(dllimport) t
 #else
-#define DLLEXPORT(t)   t
+#define DLLEXPORT(t) t
 #endif
 
 #ifndef FALSE
 #define FALSE	0
 #endif
 #ifndef TRUE
 #define TRUE	1
 #endif
 
 #include <stdlib.h>
 #include <stdio.h>
 
 
 #define VC7bitProp				"7BIT"
 #define VC8bitProp				"8BIT"
 #define VCAAlarmProp			"AALARM"
@@ -338,84 +342,69 @@ extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
 extern DLLEXPORT(int) vObjectValueType(VObject *o);
 
 /* return type of vObjectValueType: */
 #define VCVT_NOVALUE	0
 	/* if the VObject has no value associated with it. */
 #define VCVT_STRINGZ	1
 	/* if the VObject has value set by setVObjectStringZValue. */
 #define VCVT_UINT		2
 	/* if the VObject has value set by setVObjectIntegerValue. */
 #define VCVT_ULONG	       	3
 	/* if the VObject has value set by setVObjectLongValue. */
 #define VCVT_RAW		4
 	/* if the VObject has value set by setVObjectAnyValue. */
 #define VCVT_VOBJECT	5
 	/* if the VObject has value set by setVObjectVObjectValue. */
 
-extern const char** fieldedProp;
+extern  DLLEXPORT(const char**) fieldedProp;
 
 /***************************************************
  * The methods below are implemented in vcc.c (generated from vcc.y )
  ***************************************************/
 
 /* NOTE regarding printVObject and writeVObject
 
 The functions below are not exported from the DLL because they
 take a FILE* as a parameter, which cannot be passed across a DLL
 interface (at least that is my experience). Instead you can use
 their companion functions which take file names or pointers
 to memory. However, if you are linking this code into
 your build directly then you may find them a more convenient API
 and you can go ahead and use them. If you try to use them with
 the DLL LIB you will get a link error.
 */
-extern void writeVObject(FILE *fp, VObject *o);
+extern DLLEXPORT(void) writeVObject(FILE *fp, VObject *o);
 
 
 
 typedef void (*MimeErrorHandler)(char *);
 
 extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
 
 extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
 extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
 
 
 /* NOTE regarding Parse_MIME_FromFile
 The function above, Parse_MIME_FromFile, comes in two flavors,
 neither of which is exported from the DLL. Each version takes
 a CFile or FILE* as a parameter, neither of which can be
 passed across a DLL interface (at least that is my experience).
 If you are linking this code into your build directly then
 you may find them a more convenient API that the other flavors
 that take a file name. If you use them with the DLL LIB you
 will get a link error.
 */
 
 
 #if INCLUDEMFC
-extern VObject* Parse_MIME_FromFile(CFile *file);
+extern DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file);
 #else
-extern VObject* Parse_MIME_FromFile(FILE *file);
+extern DLLEXPORT(VObject*) Parse_MIME_FromFile(FILE *file);
 #endif
 
-#define __SHARP_COMP_
-
-#ifndef __SHARP_COMP_
 extern DLLEXPORT(const char *) vObjectTypeInfo(VObject *o);
 
-#else
-// This function is not available in the Sharp ROM for SL 5500 !
-// Therefore I have to move it into the header file.. (se)
-
-inline const char*  vObjectTypeInfo(VObject *o)
-{
-    const char *type = vObjectName( o );
-    if ( strcmp( type, "TYPE" ) == 0 )
-	type = vObjectStringZValue( o );
-    return type;
-}
-#endif
 
 #endif /* __VOBJECT_H__ */