Note Earl's regression fix for SSL_CTX_clear_options() on older OpenSSL.

[~andy/fetchmail] / rcfile_l.l

diff --git a/rcfile_l.l b/rcfile_l.l
index d40648d5c3762f08a3befa68652c2c46f0ff2dbc..c7e49fea6999c97e6a17982940f19a8255838937 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -9,6 +9,7 @@
 
 #include "config.h"
 #include "fetchmail.h"
+#include "xmalloc.h"
 #include "rcfile_y.h"
 
 int prc_lineno = 1;
@@ -31,39 +32,20 @@ int prc_lineno = 1;
 
 %%
 
-\"[^\"]*\"     {
-                       yytext[yyleng-1] = '\0';
-                       escapes(yytext+1, yytext);
-                       yyleng = strlen(yytext);
-                       yylval.sval = yytext;
-                        SETSTATE(0);
-                       return STRING;
-               }
+\"[^\"]*\"     |
 \'[^\']*\'     {
-                       yytext[yyleng-1] = '\0';
-                       escapes(yytext+1, yytext);
-                       yyleng = strlen(yytext);
-                       yylval.sval = yytext;
-                        SETSTATE(0);
+                       char *in = xstrndup(yytext+1, yyleng-2);
+                       escapes(in, in);
+                       yylval.sval = in;
+                       SETSTATE(0);
                        return STRING;
                }
 
-"*"            { BEGIN(0); return WILDCARD; }
-
 <NAME>[^=;:, \t\r\n]+  {
-                       static char *in;
-                       static size_t ins;
-
-                       if ((size_t)yyleng + 1 > ins) {
-                           ins = yyleng + 1;
-                           in = (char *)xrealloc(in, ins);
-                       }
-                       memcpy(in, yytext, yyleng);
-                       in[yyleng] = '\0';
+                       char *in = xstrdup(yytext);
                        escapes(in, in);
-                       yyleng = strlen(in);
                        yylval.sval = in;
-                        SETSTATE(0);
+                       SETSTATE(0);
                        return STRING;
                }
 
@@ -190,6 +172,7 @@ sslkey              { return SSLKEY; }
 sslcert                { return SSLCERT; }
 sslproto       { return SSLPROTO; }
 sslcertck      { return SSLCERTCK; }
+sslcertfile    { return SSLCERTFILE; }
 sslcertpath    { return SSLCERTPATH; }
 sslcommonname  { return SSLCOMMONNAME; }
 sslfingerprint { return SSLFINGERPRINT; }
@@ -220,9 +203,9 @@ options             {/* EMPTY */}
 -?[0-9]+       { yylval.number = atoi(yytext); return NUMBER; }
 
 [^=;:, \t\r\n]+        {
-                       escapes(yytext, yytext);
-                       yyleng = strlen(yytext);
-                       yylval.sval = yytext;
+                       char *in = xstrdup(yytext);
+                       escapes(in, in);
+                       yylval.sval = in;
                        return STRING;
                }