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 .. !

1 files changed, 73 insertions, 54 deletions

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
@@ -155,13 +155,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 */

@@ -740,22 +740,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') {

@@ -948,73 +954,84 @@ static int match_begin_end_name(int end) {
         }

     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

+

+    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;

                     }

-                if (i == 0) {

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

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

-                        ++mime_lineNum;

-                        }

-                    else {

-                        lexPushLookaheadc('=');

-                        goto EndString;

-                        }

+

+            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;

                     }

-                else if (i == 1) {

-                    lexPushLookaheadc(next[1]);

-                    lexPushLookaheadc(next[0]);

-                    lexAppendc('=');

+

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

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

+            lexAppendc(cur);

                 } else {

-                    lexAppendc(c);

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

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

                     }

-                break;

-                } /* '=' */

-            case '\n': {

-                lexPushLookaheadc('\n');

-                goto EndString;

+        c = lexLookahead();

                 }

-            case (int)EOF:

-                break;

-            default:

-                lexAppendc(cur);

-                break;

-            } /* switch */

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

-

-EndString:

     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;

             }

@@ -1062,18 +1079,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;

@@ -1214,13 +1233,13 @@ 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__)
@@ -1514,13 +1533,13 @@ 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)