]> Pileus Git - ~andy/fetchmail/blobdiff - rcfile_l.l
Cosmetic fix.
[~andy/fetchmail] / rcfile_l.l
index 4d19be5906e0d0bc58ee4d37af7b2c30cad39432..3957458615682b09f6b71385244d074b3956c5a1 100644 (file)
 #include "rcfile_y.h"
 
 int prc_lineno = 1;
+
+#ifdef LEXDEBUG
+#define SETSTATE(n)    do {BEGIN(n); if (yydebug) fprintf(stderr, "Entering lexer state %d\n", n);} while (0)
+#else
+#define SETSTATE(n)    BEGIN(n)
+#endif /* LEXDEBUG */
 %}
 
 /* this doesn't work with Linux lex, see the INSTALL file */
@@ -19,13 +25,52 @@ int prc_lineno = 1;
 %a 4000
 %p 3000
 
+%s NAME AUTH
+
 %%
 
+\"[^\"]*\"     {
+                       char buf[MSGBUFSIZE];
+
+                       yytext[strlen(yytext)-1] = '\0';
+                       escapes(yytext+1, buf);
+                       yylval.sval = (char *) xstrdup(buf);
+                        SETSTATE(0);
+                       return STRING;
+               }
+\'[^\']*\'     {
+                       char buf[MSGBUFSIZE];
+
+                       yytext[strlen(yytext)-1] = '\0';
+                       escapes(yytext+1, buf);
+                       yylval.sval = (char *) xstrdup(buf);
+                        SETSTATE(0);
+                       return STRING;
+               }
+
+"*"            { BEGIN(0); return WILDCARD; }
+
+<NAME>[^=;:, \t\r\n]+  {
+                       char buf[MSGBUFSIZE];
+
+                       escapes(yytext, buf);
+                       yylval.sval = (char *) xstrdup(buf);
+                        SETSTATE(0);
+                       return STRING;
+               }
+
 set            { return SET; }
 logfile                { return LOGFILE; }
+idfile         { return IDFILE; }
 daemon         { return DAEMON; }
 syslog         { return SYSLOG; }
 invisible      { return INVISIBLE; }
+showdots       { return SHOWDOTS; }
+postmaster     { return POSTMASTER; }
+bouncemail     { return BOUNCEMAIL; }
+spambounce     { return SPAMBOUNCE; }
+warnings       { return WARNINGS; }
+tracepolls     { return TRACEPOLLS; }
 
 defaults       { return DEFAULTS; }
 server                 { return POLL; }
@@ -38,36 +83,73 @@ proto(col)?         { return PROTOCOL; }
 service                { return SERVICE; }
 port           { return PORT; }
 interval       { return INTERVAL; }
-auth(enticate)?        { return AUTHENTICATE; }
-kerberos_v4    { return KERBEROS4; }
-kerberos       { return KERBEROS4; }
+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;}
+ssh            { SETSTATE(0); yylval.proto = A_SSH; return AUTHTYPE;}
+cram(-md5)?    { SETSTATE(0); yylval.proto = A_CRAM_MD5; return AUTHTYPE;}
+ntlm           { SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;}
+<AUTH>password { SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;}
 timeout                { return TIMEOUT;}
 envelope       { return ENVELOPE; }
 qvirtual       { return QVIRTUAL; }
+principal      { return PRINCIPAL; }
 
-user(name)?    { return USERNAME; }
-pass(word)?    { return PASSWORD; }
+user(name)?    {SETSTATE(NAME); return USERNAME; }
+<INITIAL,NAME>pass(word)?      {SETSTATE(NAME); return PASSWORD; }
 folder(s)?     { return FOLDER; }
 smtp(host)?    { return SMTPHOST; }
+fetchdomains   { return FETCHDOMAINS; }
 smtpaddress    { return SMTPADDRESS; }
+smtpname       { return SMTPNAME; }
+antispam       { return SPAMRESPONSE; }
 mda            { return MDA; }
+bsmtp          { return BSMTP; }
+lmtp           { return LMTP; }
 pre(connect)?  { return PRECONNECT; }
 post(connect)? { return POSTCONNECT; }
 netsec         { return NETSEC; }
 interface      { return INTERFACE; }
 monitor                { return MONITOR; }
+plugin         { return PLUGIN; }
+plugout                { return PLUGOUT; }
 batchlimit     { return BATCHLIMIT; }
 fetchlimit     { return FETCHLIMIT; }
 expunge                { return EXPUNGE; }
+properties     { return PROPERTIES; }
 
-is             { return IS; }
+is             { SETSTATE(NAME); return IS; }
 here           { return HERE; }
 there          { return THERE; }
-to             { return TO; }
-=              { return MAP; }
-"*"            { return WILDCARD; }
-
-no/[kfrsdu \t].*       { return NO;}
+to             { SETSTATE(NAME); return TO; }
+=              { SETSTATE(NAME); return MAP; }
+
+nobouncemail   |
+nouidl         |
+nocheckalias   |
+nodns          |
+noenvelope     |
+nokeep         |
+noflush                |
+nofetchall     |
+norewrite      |
+noforcecr      |
+nostripcr      |
+nopass8(bits)? |
+nodropstatus   |
+nodropdelivered        |
+nomimedec(ode)? |
+nospambounce   |
+noidle         {
+                   yyless(2);
+                   return NO;
+                }
+
+no             {return NO;}
 
 keep           { return KEEP; }
 flush          { return FLUSH; }
@@ -76,9 +158,20 @@ rewrite             { return REWRITE; }
 forcecr                { return FORCECR; }
 stripcr                { return STRIPCR; }
 pass8(bits)?   { return PASS8BITS; }
-dropstatus?    { return DROPSTATUS; }
+dropstatus     { return DROPSTATUS; }
+dropdelivered   { return DROPDELIVERED; }
+mimedec(ode)?   { return MIMEDECODE; }
+idle           { return IDLE; }
 dns            { return DNS; }
 uidl           { return UIDL; }
+ssl            { return SSL; }
+sslkey         { return SSLKEY; }
+sslcert                { return SSLCERT; }
+sslproto       { return SSLPROTO; }
+sslcertck      { return SSLCERTCK; }
+sslcertpath    { return SSLCERTPATH; }
+sslfingerprint { return SSLFINGERPRINT; }
+checkalias     { return CHECKALIAS; }
 
 limit          { return LIMIT; }
 
@@ -91,32 +184,18 @@ options            {/* EMPTY */}
 
 (auto)|(AUTO)  { yylval.proto = P_AUTO;  return PROTO; }
 (pop2)|(POP2)  { yylval.proto = P_POP2;  return PROTO; }
+(sdps)|(SDPS)   { return SDPS; }
 (pop3)|(POP3)  { yylval.proto = P_POP3;  return PROTO; }
-(imap-k4)|(IMAP-K4)   { yylval.proto = P_IMAP_K4;  return PROTO; }
-(imap-gss)|(IMAP-GSS) { yylval.proto = P_IMAP_GSS;  return PROTO; }
 (imap)|(IMAP)  { yylval.proto = P_IMAP;  return PROTO; }
 (apop)|(APOP)   { yylval.proto = P_APOP;  return PROTO; }
 (etrn)|(ETRN)   { yylval.proto = P_ETRN;  return PROTO; }
+(odmr)|(ODMR)   { yylval.proto = P_ODMR;  return PROTO; }
 (kpop)|(KPOP)  { return KPOP; }
 
-remote(folder)? {
-               fprintf(stderr, 
-                       "fetchmail: `remote' keyword is gone, use `folder'\n");
-               }
-
-
 (#.*)?\\?\n    { prc_lineno++; }   /* newline is ignored */
 
-[0-9]+         { yylval.number = atoi(yytext); return NUMBER; }
+-?[0-9]+/[^a-zA-Z]     { yylval.number = atoi(yytext); return NUMBER; }
 
-\"[^\"]*\"     {
-                       char buf[MSGBUFSIZE];
-
-                       yytext[strlen(yytext)-1] = '\0';
-                       escapes(yytext+1, buf);
-                       yylval.sval = (char *) xstrdup(buf);
-                       return STRING;
-               }
 [^=;:, \t\r\n]+        {
                        char buf[MSGBUFSIZE];
 
@@ -140,7 +219,8 @@ char                *tp;    /* target buffer for digested string */
 
        if (*cp == '\\' && strchr("0123456789xX", cp[1]))
        {
-           char *dp, *hex = "00112233445566778899aAbBcCdDeEfF";
+           char *dp;
+           const char *hex = "00112233445566778899aAbBcCdDeEfF";
            int dcount = 0;
 
            if (*++cp == 'x' || *cp == 'X')