1 files changed, 16 insertions, 6 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
@@ -119,13 +119,13 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #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 */

@@ -720,22 +720,28 @@ static void handleMoreRFC822LineBreak(int c) {
 

 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') {

@@ -958,12 +964,13 @@ static char* lexGetQuotedPrintable()
             } 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();

@@ -975,12 +982,13 @@ static char* lexGetQuotedPrintable()
             } 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

@@ -997,13 +1005,13 @@ static char* lexGetQuotedPrintable()
 

 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;

             }

@@ -1051,18 +1059,20 @@ static int yylex() {
         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;