Attempt merging from 6.3.24.

[~andy/fetchmail] / rcfile_l.l

diff --git a/rcfile_l.l b/rcfile_l.l
index 4b0b0fed0b4ce198e65dad6cdca3f0438c371748..7cbf12ed3c9beaedceb93cd161a85e192204b9f2 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -1,16 +1,18 @@
 %{
 
 /*
- * rcfile_l.l -- lexer for the run control file
+ * rcfile_l.l -- lexer for the run control file, to be used with GNU flex.
  *
  * For license terms, see the file COPYING in this directory.
  */
-#include <string.h>
 
 #include "config.h"
 #include "fetchmail.h"
+#include "xmalloc.h"
 #include "rcfile_y.h"
 
+#include <string.h>
+
 int prc_lineno = 1;
 
 #ifdef LEXDEBUG
@@ -18,51 +20,33 @@ int prc_lineno = 1;
 #else
 #define SETSTATE(n)    BEGIN(n)
 #endif /* LEXDEBUG */
+
+#define YY_NO_INPUT
+
 %}
 
-/* this doesn't work with Linux lex, see the INSTALL file */
-%o 7000
-%a 4000
-%p 3000
 %option nounput noyywrap
+%option warn nodefault
+%option 8bit batch
 
 %s NAME AUTH
 
 %%
 
-\"[^\"]*\"     {
-                       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 = 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;
                }
 
@@ -77,6 +61,7 @@ showdots      { return SHOWDOTS; }
 postmaster     { return POSTMASTER; }
 bouncemail     { return BOUNCEMAIL; }
 spambounce     { return SPAMBOUNCE; }
+softbounce     { return SOFTBOUNCE; }
 warnings       { return WARNINGS; }
 tracepolls     { return TRACEPOLLS; }
 
@@ -86,7 +71,7 @@ poll          { return POLL; }
 skip           { return SKIP; }
 via            { return VIA; }
 aka            { return AKA; }
-local(domains) { return LOCALDOMAINS; }
+local(domains)?        { return LOCALDOMAINS; }
 proto(col)?    { return PROTOCOL; }
 service                { return SERVICE; }
 port           { return PORT; }
@@ -95,9 +80,8 @@ preauth(enticate)?    { SETSTATE(AUTH); return AUTHENTICATE; }
 auth(enticate)?        { SETSTATE(AUTH); return AUTHENTICATE; }
 any            { SETSTATE(0); yylval.proto = A_ANY; return AUTHTYPE;}
 gssapi         { SETSTATE(0); yylval.proto = A_GSSAPI; return AUTHTYPE;}
-kerberos(_v)?4 { SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
 kerberos(_v)?5 { SETSTATE(0); yylval.proto = A_KERBEROS_V5; return AUTHTYPE;}
-kerberos       { SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
+kerberos       { SETSTATE(0); yylval.proto = A_KERBEROS_V5; return AUTHTYPE;}
 ssh            { SETSTATE(0); yylval.proto = A_SSH; return AUTHTYPE;}
 external       { SETSTATE(0); yylval.proto = A_EXTERNAL; return AUTHTYPE;}
 (otp|opie)     { SETSTATE(0); yylval.proto = A_OTP; return AUTHTYPE;}
@@ -105,15 +89,25 @@ cram(-md5)?        { SETSTATE(0); yylval.proto = A_CRAM_MD5; return AUTHTYPE;}
 msn            { SETSTATE(0); yylval.proto = A_MSN; return AUTHTYPE;}
 ntlm           { SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;}
 <AUTH>password { SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;}
+apop           { SETSTATE(0); yylval.proto = A_APOP; return AUTHTYPE;}
 timeout                { return TIMEOUT;}
 envelope       { return ENVELOPE; }
 qvirtual       { return QVIRTUAL; }
 principal      { return PRINCIPAL; }
 esmtpname      { return ESMTPNAME; }
 esmtppassword  { return ESMTPPASSWORD; }
-
+bad-header     { return BADHEADER; }
+accept         { return ACCEPT; }
+reject         { return REJECT_; }
+retrieve-error { return RETRIEVEERROR; }
+abort          { return ABORT; }
+continue       { return CONTINUE; }
+markseen       { return MARKSEEN; }
 
 user(name)?    {SETSTATE(NAME); return USERNAME; }
+pwmd_socket    { return PWMD_SOCKET; }
+pwmd_file      { return PWMD_FILE; }
+pinentry_timeout       { return PINENTRY_TIMEOUT; }
 <INITIAL,NAME>pass(word)?      {SETSTATE(NAME); return PASSWORD; }
 folder(s)?     { return FOLDER; }
 smtp(host)?    { return SMTPHOST; }
@@ -186,7 +180,9 @@ sslkey              { return SSLKEY; }
 sslcert                { return SSLCERT; }
 sslproto       { return SSLPROTO; }
 sslcertck      { return SSLCERTCK; }
+sslcertfile    { return SSLCERTFILE; }
 sslcertpath    { return SSLCERTPATH; }
+sslcommonname  { return SSLCOMMONNAME; }
 sslfingerprint { return SSLFINGERPRINT; }
 checkalias     { return CHECKALIAS; }
 
@@ -200,14 +196,11 @@ options           {/* EMPTY */}
 [;:,]          {/* EMPTY */}
 
 (auto)|(AUTO)  { yylval.proto = P_AUTO;  return PROTO; }
-(pop2)|(POP2)  { yylval.proto = P_POP2;  return PROTO; }
-(sdps)|(SDPS)   { return SDPS; }
+(sdps)|(SDPS)  { return SDPS; }
 (pop3)|(POP3)  { yylval.proto = P_POP3;  return PROTO; }
 (imap)|(IMAP)  { yylval.proto = P_IMAP;  return PROTO; }
-(apop)|(APOP)   { yylval.proto = P_APOP;  return PROTO; }
-(rpop)|(RPOP)   { yylval.proto = P_RPOP;  return PROTO; }
-(etrn)|(ETRN)   { yylval.proto = P_ETRN;  return PROTO; }
-(odmr)|(ODMR)   { yylval.proto = P_ODMR;  return PROTO; }
+(etrn)|(ETRN)  { yylval.proto = P_ETRN;  return PROTO; }
+(odmr)|(ODMR)  { yylval.proto = P_ODMR;  return PROTO; }
 (kpop)|(KPOP)  { return KPOP; }
 
 (#.*)?\\?\n    { prc_lineno++; }   /* newline is ignored */
@@ -215,9 +208,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;
                }
 
@@ -239,7 +232,7 @@ void escapes(const char *cp /** source string with escapes */,
         * always succeed! */
        if (*cp == '\\' && cp[1] && strchr("0123456789xX", cp[1]))
        {
-           char *dp;
+           const char *dp;
            const char *hex = "00112233445566778899aAbBcCdDeEfF";
            int dcount = 0;