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
@@ -124,3 +124,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 //#else

-#include <qtopia/private/vobject_p.h>
+#include "vobject_p.h"

 //#endif

@@ -725,3 +725,3 @@ static char* lexGet1Value() {
     lexClearToken();

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

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

         if (c == '\\' ) {

@@ -730,7 +730,13 @@ static char* lexGet1Value() {
             a = lexLookahead();

-            if ( a != ';' ) {

-                lexAppendc('\\');

-            } else {

+            if ( a == ';' ) {

                 lexAppendc( ';' );

                 lexSkipLookahead();

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

+                lexAppendc( '\n' );

+                lexSkipLookahead();

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

+                lexAppendc( '\\' );

+                lexSkipLookahead();

+            } else {

+                lexAppendc('\\');

             }

@@ -963,2 +969,3 @@ static char* lexGetQuotedPrintable()
                 // should probably spit an error here

+                lexSkipLookahead(); 

                 c = lexLookahead();

@@ -980,2 +987,3 @@ static char* lexGetQuotedPrintable()
                 // should probably spit an error here

+                lexSkipLookahead(); 

                 c = lexLookahead();

@@ -1002,3 +1010,3 @@ static int yylex() {
         int c = lexGetc();

-        if (c == ';') {

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

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

@@ -1056,2 +1064,3 @@ static int yylex() {
                     /* ignoring linesep immediately after colon. */

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

                     c = lexLookahead();

@@ -1062,2 +1071,3 @@ static int yylex() {
                         }

+                    */

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