From 390a5a0c332c8c6fb380c1ed4cd6adae3e544a08 Mon Sep 17 00:00:00 2001 From: eilers Date: Thu, 27 Mar 2003 16:17:48 +0000 Subject: 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 .. ! --- (limited to 'library/backend') 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 @@ -122,7 +122,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. //#ifdef PALMTOPCENTER //#include //#else -#include +#include "vobject_p.h" //#endif /**** Types, Constants ****/ @@ -723,16 +723,22 @@ static char* lexGet1Value() { 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; @@ -961,6 +967,7 @@ static char* lexGetQuotedPrintable() // 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; } @@ -978,6 +985,7 @@ static char* lexGetQuotedPrintable() // 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; } @@ -1000,7 +1008,7 @@ 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); @@ -1054,12 +1062,14 @@ static int yylex() { 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; } 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 @@ -158,7 +158,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. /*#ifdef PALMTOPCENTER */ /*#include */ /*#else */ -#include +#include "vobject_p.h" /*#endif */ /**** Types, Constants ****/ @@ -743,16 +743,22 @@ static char* lexGet1Value() { 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; @@ -950,68 +956,79 @@ static int match_begin_end_name(int end) { } 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); @@ -1065,12 +1082,14 @@ static int yylex() { 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; } @@ -1217,7 +1236,7 @@ void mime_error_(char *s) } } -#line 1221 "y.tab.c" +#line 1240 "y.tab.c" #define YYABORT goto yyabort #define YYREJECT goto yyabort #define YYACCEPT goto yyaccept @@ -1517,7 +1536,7 @@ case 45: popVObject(); } break; -#line 1521 "y.tab.c" +#line 1540 "y.tab.c" } yyssp -= yym; yystate = *yyssp; 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,44 +1,44 @@ /*************************************************************************** -(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. */ @@ -46,8 +46,9 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. #include #endif -#include -#include +#include +#include "vobject_p.h" +#include "qfiledirect_p.h" #include #include #include @@ -62,6 +63,10 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. #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; @@ -86,7 +91,7 @@ struct StrItem { unsigned int refCnt; }; -const char** fieldedProp; +DLLEXPORT(const char**) fieldedProp; @@ -327,18 +332,18 @@ DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size 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)); } @@ -403,7 +408,7 @@ DLLEXPORT(VObject*) addGroup(VObject *o, const char *g) t = addProp(t,VCGroupingProp); setVObjectStringZValue(t,lookupProp_(n)); } while (n != gs); - deleteStr(gs); + deleteStr(gs); return p; } else @@ -799,12 +804,12 @@ 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; } @@ -812,7 +817,7 @@ static struct PreDefProp* lookupPropInfo(const char* 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; @@ -826,7 +831,7 @@ DLLEXPORT(const char*) lookupProp_(const char* 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; @@ -953,6 +958,17 @@ static void appendsOFile(OFile *fp, const char *s) #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; @@ -1005,41 +1021,20 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) 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'; @@ -1057,13 +1052,12 @@ static const char *replaceChar(unsigned char c) 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) @@ -1072,62 +1066,71 @@ static void writeQPString(OFile *fp, const char *s) "-" (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: { @@ -1160,19 +1163,17 @@ static void writeAttrValue(OFile *fp, VObject *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) @@ -1235,10 +1236,8 @@ static void writeProp(OFile *fp, VObject *o) 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); @@ -1248,24 +1247,22 @@ static void writeProp(OFile *fp, VObject *o) } fields = fields_; for (i=0;i #include -#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 @@ -351,7 +355,7 @@ extern DLLEXPORT(int) vObjectValueType(VObject *o); #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 ) @@ -368,7 +372,7 @@ 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); @@ -393,28 +397,13 @@ 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__ */ -- cgit v0.9.0.2