Merged branches from BRANCH_1_0

3 files changed, 5 insertions, 0 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index 94a8fea..4c79368 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -988,98 +988,100 @@ static char* lexGetQuotedPrintable()
 		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 == ';' && 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"));

 	    return LINESEP;

 	    }

 	else {

 	    char *p = 0;

 	    lexPushLookaheadc(c);

 	    if (lexWithinMode(L_BASE64)) {

 		/* get each char and convert to bin on the fly... */

 		p = lexGetDataFromBase64();

+#if 0		
 		yylval.str = p;

 		return STRING;

+#endif		
 		}

 	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {

 		p = lexGetQuotedPrintable();

 		}

 	    else {

 #ifdef _SUPPORT_LINE_FOLDING

 		p = lexGet1Value();

 #else

 		p = lexGetStrUntil(";\n");

 #endif

 		}

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

diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 5649522..5f53aef 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -1008,98 +1008,100 @@ static char* lexGetQuotedPrintable()
 		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 == ';' && 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"));

 	    return LINESEP;

 	    }

 	else {

 	    char *p = 0;

 	    lexPushLookaheadc(c);

 	    if (lexWithinMode(L_BASE64)) {

 		/* get each char and convert to bin on the fly... */

 		p = lexGetDataFromBase64();

+#if 0
 		yylval.str = p;

 		return STRING;

+#endif		
 		}

 	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {

 		p = lexGetQuotedPrintable();

 		}

 	    else {

 #ifdef _SUPPORT_LINE_FOLDING

 		p = lexGet1Value();

 #else

 		p = lexGetStrUntil(";\n");

 #endif

 		}

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

diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index b6d17dc..4c8de70 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -712,96 +712,97 @@ static struct PreDefProp propNames[] = {
     { VCJPEGProp, 0, 0, 0 },
     { VCLanguageProp, 0, 0, 0 },
     { VCLastModifiedProp, 0, 0, 0 },
     { VCLastRevisedProp, 0, 0, 0 },
     { VCLocationProp, 0, 0, 0 },
     { VCLogoProp, 0, 0, 0 },
     { VCMailerProp, 0, 0, 0 },
     { VCMAlarmProp, 0, MAlarmFields, 0 },
     { VCMCIMailProp, 0, 0, 0 },
     { VCMessageProp, 0, 0, 0 },
     { VCMETProp, 0, 0, 0 },
     { VCModemProp, 0, 0, 0 },
     { VCMPEG2Prop, 0, 0, 0 },
     { VCMPEGProp, 0, 0, 0 },
     { VCMSNProp, 0, 0, 0 },
     { VCNamePrefixesProp, 0, 0, 0 },
     { VCNameProp, 0, nameFields, 0 },
     { VCNameSuffixesProp, 0, 0, 0 },
     { VCNoteProp, 0, 0, 0 },
     { VCOrgNameProp, 0, 0, 0 },
     { VCOrgProp, 0, orgFields, 0 },
     { VCOrgUnit2Prop, 0, 0, 0 },
     { VCOrgUnit3Prop, 0, 0, 0 },
     { VCOrgUnit4Prop, 0, 0, 0 },
     { VCOrgUnitProp, 0, 0, 0 },
     { VCPagerProp, 0, 0, 0 },
     { VCPAlarmProp, 0, PAlarmFields, 0 },
     { VCParcelProp, 0, 0, 0 },
     { VCPartProp, 0, 0, 0 },
     { VCPCMProp, 0, 0, 0 },
     { VCPDFProp, 0, 0, 0 },
     { VCPGPProp, 0, 0, 0 },
     { VCPhotoProp, 0, 0, 0 },
     { VCPICTProp, 0, 0, 0 },
     { VCPMBProp, 0, 0, 0 },
     { VCPostalBoxProp, 0, 0, 0 },
     { VCPostalCodeProp, 0, 0, 0 },
     { VCPostalProp, 0, 0, 0 },
     { VCPowerShareProp, 0, 0, 0 },
     { VCPreferredProp, 0, 0, 0 },
     { VCPriorityProp, 0, 0, 0 },
     { VCProcedureNameProp, 0, 0, 0 },
     { VCProdIdProp, 0, 0, 0 },
     { VCProdigyProp, 0, 0, 0 },
     { VCPronunciationProp, 0, 0, 0 },
     { VCPSProp, 0, 0, 0 },
     { VCPublicKeyProp, 0, 0, 0 },
     { VCQPProp, VCQuotedPrintableProp, 0, 0 },
+    { VCQPProp, VCBase64Prop, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
     { VCRegionProp, 0, 0, 0 },
     { VCRelatedToProp, 0, 0, 0 },
     { VCRepeatCountProp, 0, 0, 0 },
     { VCResourcesProp, 0, 0, 0 },
     { VCRNumProp, 0, 0, 0 },
     { VCRoleProp, 0, 0, 0 },
     { VCRRuleProp, 0, 0, 0 },
     { VCRSVPProp, 0, 0, 0 },
     { VCRunTimeProp, 0, 0, 0 },
     { VCSequenceProp, 0, 0, 0 },
     { VCSnoozeTimeProp, 0, 0, 0 },
     { VCStartProp, 0, 0, 0 },
     { VCStatusProp, 0, 0, 0 },
     { VCStreetAddressProp, 0, 0, 0 },
     { VCSubTypeProp, 0, 0, 0 },
     { VCSummaryProp, 0, 0, 0 },
     { VCTelephoneProp, 0, 0, 0 },
     { VCTIFFProp, 0, 0, 0 },
     { VCTimeZoneProp, 0, 0, 0 },
     { VCTitleProp, 0, 0, 0 },
     { VCTLXProp, 0, 0, 0 },
     { VCTodoProp, 0, 0, PD_BEGIN },
     { VCTranspProp, 0, 0, 0 },
     { VCUniqueStringProp, 0, 0, 0 },
     { VCURLProp, 0, 0, 0 },
     { VCURLValueProp, 0, 0, 0 },
     { VCValueProp, 0, 0, 0 },
     { VCVersionProp, 0, 0, 0 },
     { 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;