-rw-r--r-- | library/backend/vcc_yacc.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp index 5f53aef..4006bc2 100644 --- a/library/backend/vcc_yacc.cpp +++ b/library/backend/vcc_yacc.cpp | |||
@@ -463,3 +463,3 @@ static void enterAttr(const char *s1, const char *s2) | |||
463 | { | 463 | { |
464 | const char *p1, *p2; | 464 | const char *p1, *p2=0; |
465 | p1 = lookupProp_(s1); | 465 | p1 = lookupProp_(s1); |
@@ -835,3 +835,3 @@ static void finiLex() { | |||
835 | */ | 835 | */ |
836 | static char * lexGetDataFromBase64() | 836 | static int lexGetDataFromBase64() |
837 | { | 837 | { |
@@ -848,2 +848,3 @@ static char * lexGetDataFromBase64() | |||
848 | c = lexGetc(); | 848 | c = lexGetc(); |
849 | lexSkipWhite(); | ||
849 | if (c == '\n') { | 850 | if (c == '\n') { |
@@ -870,4 +871,2 @@ static char * lexGetDataFromBase64() | |||
870 | pad++; | 871 | pad++; |
871 | } else if ((c == ' ') || (c == '\t')) { | ||
872 | continue; | ||
873 | } else { /* error condition */ | 872 | } else { /* error condition */ |
@@ -880,3 +879,5 @@ static char * lexGetDataFromBase64() | |||
880 | while (c != EOF) { | 879 | while (c != EOF) { |
881 | if (c == '\n' && lexLookahead() == '\n') { | 880 | if (c == '\n') { |
881 | lexSkipWhite(); | ||
882 | if(lexLookahead() == '\n') { | ||
882 | ++mime_lineNum; | 883 | ++mime_lineNum; |
@@ -884,2 +885,3 @@ static char * lexGetDataFromBase64() | |||
884 | } | 885 | } |
886 | } | ||
885 | c = lexGetc(); | 887 | c = lexGetc(); |
@@ -887,3 +889,3 @@ static char * lexGetDataFromBase64() | |||
887 | } | 889 | } |
888 | return NULL; | 890 | return c != EOF; |
889 | } | 891 | } |
@@ -933,3 +935,3 @@ static char * lexGetDataFromBase64() | |||
933 | } | 935 | } |
934 | return 0; | 936 | return bytesLen; |
935 | } | 937 | } |
@@ -964,3 +966,3 @@ static char* lexGetQuotedPrintable() | |||
964 | 966 | ||
965 | while (c != EOF && c != ';') { | 967 | while (c != EOF && (c != ';' || !fieldedProp)) { |
966 | if (c == '\n') { | 968 | if (c == '\n') { |
@@ -1054,7 +1056,4 @@ static int yylex() { | |||
1054 | /* get each char and convert to bin on the fly... */ | 1056 | /* get each char and convert to bin on the fly... */ |
1055 | p = lexGetDataFromBase64(); | 1057 | yylval.str = NULL; |
1056 | #if 0 | 1058 | return lexGetDataFromBase64() ? STRING : 0; |
1057 | yylval.str = p; | ||
1058 | return STRING; | ||
1059 | #endif | ||
1060 | } | 1059 | } |
@@ -1240,3 +1239,3 @@ void mime_error_(char *s) | |||
1240 | 1239 | ||
1241 | #line 1240 "y.tab.c" | 1240 | #line 1241 "y.tab.c" |
1242 | #define YYABORT goto yyabort | 1241 | #define YYABORT goto yyabort |
@@ -1540,3 +1539,3 @@ case 45: | |||
1540 | break; | 1539 | break; |
1541 | #line 1540 "y.tab.c" | 1540 | #line 1541 "y.tab.c" |
1542 | } | 1541 | } |