X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rcfile_l.l;h=559bd152d2d88e8c6c5b390fd2ac9dd27c485f9d;hb=6cbc54561450d2d14e6ac312a1f9882b3d4152e3;hp=58fe10a0b2fd21c42d7c01b597eaba9191b28e1e;hpb=703f7886706bd5a7fc34db647edb3fbea5553c0a;p=~andy%2Ffetchmail

diff --git a/rcfile_l.l b/rcfile_l.l
index 58fe10a0..559bd152 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -12,6 +12,12 @@
 #include "rcfile_y.h"
 
 int prc_lineno = 1;
+
+#ifdef LEXDEBUG
+#define SETSTATE(n)	if (yydebug) do {BEGIN(n); 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,14 +25,49 @@ int prc_lineno = 1;
 %a 4000
 %p 3000
 
+%s NAME PREAUTH
+
 %%
 
+\"[^\"]*\"	{
+			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; }
+postmaster	{ return POSTMASTER; }
+bouncemail	{ return BOUNCEMAIL; }
+warnings	{ return WARNINGS; }
 
 defaults 	{ return DEFAULTS; }
 server 		{ return POLL; }
@@ -39,38 +80,63 @@ proto(col)? 	{ return PROTOCOL; }
 service		{ return SERVICE; }
 port		{ return PORT; }
 interval	{ return INTERVAL; }
-auth(enticate)?	{ return AUTHENTICATE; }
-kerberos_v4	{ return KERBEROS4; }
-kerberos	{ return KERBEROS; }
-kerberos_v5     { return KERBEROS5; }
+preauth(enticate)?	{ SETSTATE(PREAUTH); return PREAUTHENTICATE; }
+kerberos(_v)?4	{ SETSTATE(0); return KERBEROS4; }
+kerberos(_v)?5	{ SETSTATE(0); return KERBEROS5; }
+kerberos	{ SETSTATE(0); return KERBEROS; }
+ssh		{ SETSTATE(0); return SSH; }
+<PREAUTH>password { SETSTATE(0); return PASSWORD; }
 timeout		{ return TIMEOUT;}
 envelope	{ return ENVELOPE; }
 qvirtual	{ return QVIRTUAL; }
 
-user(name)?	{ return USERNAME; }
-pass(word)?	{ return PASSWORD; }
+user(name)?	{SETSTATE(NAME); return USERNAME; }
+pass(word)?	{SETSTATE(NAME); return PASSWORD; }
 folder(s)? 	{ return FOLDER; }
 smtp(host)?	{ return SMTPHOST; }
 smtpaddress	{ return SMTPADDRESS; }
 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	|
+nomimedec(ode)? |
+noidle	        {
+                   yyless(2);
+                   return NO;
+                }
+
+no		{return NO;}
 
 keep		{ return KEEP; }
 flush		{ return FLUSH; }
@@ -79,10 +145,15 @@ rewrite		{ return REWRITE; }
 forcecr		{ return FORCECR; }
 stripcr		{ return STRIPCR; }
 pass8(bits)?	{ return PASS8BITS; }
-dropstatus?	{ return DROPSTATUS; }
+dropstatus	{ return DROPSTATUS; }
 mimedec(ode)?   { return MIMEDECODE; }
+idle		{ return IDLE; }
 dns		{ return DNS; }
 uidl		{ return UIDL; }
+ssl		{ return SSL; }
+sslkey		{ return SSLKEY; }
+sslcert		{ return SSLCERT; }
+checkalias	{ return CHECKALIAS; }
 
 limit		{ return LIMIT; }
 
@@ -95,32 +166,21 @@ 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-crammd5)|(IMAP-CRAMMD5) { yylval.proto = P_IMAP_CRAM_MD5;  return PROTO; }
+(imap-login)|(IMAP-LOGIN) { yylval.proto = P_IMAP_LOGIN;  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; }
 (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];
 
@@ -144,7 +204,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')