X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rcfile_l.l;h=c7e49fea6999c97e6a17982940f19a8255838937;hb=d31db10231e9ed89f64fdf6e0fb7cae182aa377e;hp=bf7a663f3c441c18458cec4549dae3b4b85b11d6;hpb=a016460027f89e7c81106a0560d1d495f727c182;p=~andy%2Ffetchmail diff --git a/rcfile_l.l b/rcfile_l.l index bf7a663f..c7e49fea 100644 --- a/rcfile_l.l +++ b/rcfile_l.l @@ -1,7 +1,7 @@ %{ /* - * 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. */ @@ -9,6 +9,7 @@ #include "config.h" #include "fetchmail.h" +#include "xmalloc.h" #include "rcfile_y.h" int prc_lineno = 1; @@ -18,50 +19,40 @@ 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 %% -\"[^\"]*\" { - 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); + char *in = xstrndup(yytext+1, yyleng-2); + escapes(in, in); + yylval.sval = in; + SETSTATE(0); return STRING; } -"*" { BEGIN(0); return WILDCARD; } - [^=;:, \t\r\n]+ { - char buf[MSGBUFSIZE]; - - escapes(yytext, buf); - yylval.sval = (char *) xstrdup(buf); - SETSTATE(0); + char *in = xstrdup(yytext); + escapes(in, in); + yylval.sval = in; + SETSTATE(0); return STRING; } set { return SET; } logfile { return LOGFILE; } idfile { return IDFILE; } +pidfile { return PIDFILE; } daemon { return DAEMON; } syslog { return SYSLOG; } invisible { return INVISIBLE; } @@ -69,6 +60,7 @@ showdots { return SHOWDOTS; } postmaster { return POSTMASTER; } bouncemail { return BOUNCEMAIL; } spambounce { return SPAMBOUNCE; } +softbounce { return SOFTBOUNCE; } warnings { return WARNINGS; } tracepolls { return TRACEPOLLS; } @@ -78,7 +70,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; } @@ -91,7 +83,10 @@ 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;} +external { SETSTATE(0); yylval.proto = A_EXTERNAL; return AUTHTYPE;} +(otp|opie) { SETSTATE(0); yylval.proto = A_OTP; return AUTHTYPE;} 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;} password { SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;} timeout { return TIMEOUT;} @@ -100,7 +95,9 @@ qvirtual { return QVIRTUAL; } principal { return PRINCIPAL; } esmtpname { return ESMTPNAME; } esmtppassword { return ESMTPPASSWORD; } - +bad-header { return BADHEADER; } +accept { return ACCEPT; } +reject { return REJECT_; } user(name)? {SETSTATE(NAME); return USERNAME; } pass(word)? {SETSTATE(NAME); return PASSWORD; } @@ -115,13 +112,14 @@ 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; } +fetchsizelimit { return FETCHSIZELIMIT; } +fastuidl { return FASTUIDL; } expunge { return EXPUNGE; } properties { return PROPERTIES; } @@ -138,6 +136,7 @@ nodns | noenvelope | nokeep | noflush | +nolimitflush | nofetchall | norewrite | noforcecr | @@ -156,6 +155,7 @@ no {return NO;} keep { return KEEP; } flush { return FLUSH; } +limitflush { return LIMITFLUSH; } fetchall { return FETCHALL; } rewrite { return REWRITE; } forcecr { return FORCECR; } @@ -172,7 +172,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; } @@ -191,19 +193,19 @@ options {/* EMPTY */} (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; } (kpop)|(KPOP) { return KPOP; } (#.*)?\\?\n { prc_lineno++; } /* newline is ignored */ --?[0-9]+/[^a-zA-Z] { yylval.number = atoi(yytext); return NUMBER; } +-?[0-9]+ { yylval.number = atoi(yytext); return NUMBER; } [^=;:, \t\r\n]+ { - char buf[MSGBUFSIZE]; - - escapes(yytext, buf); - yylval.sval = (char *) xstrdup(buf); + char *in = xstrdup(yytext); + escapes(in, in); + yylval.sval = in; return STRING; } @@ -211,35 +213,40 @@ options {/* EMPTY */} %% -void escapes(cp, tp) -/* process standard C-style escape sequences in a string */ -const char *cp; /* source string with escapes */ -char *tp; /* target buffer for digested string */ +/** process standard C-style escape sequences in a string, + * this can never lengthen the output, so cp and tp may overlap as long + * as cp >= tp. */ +void escapes(const char *cp /** source string with escapes */, + char *tp /** target buffer for digested string */) { while (*cp) { int cval = 0; - if (*cp == '\\' && strchr("0123456789xX", cp[1])) + /* we MUST check for NUL explicitly, as strchr(string, 0) will + * always succeed! */ + if (*cp == '\\' && cp[1] && strchr("0123456789xX", cp[1])) { - char *dp; + const char *dp; const char *hex = "00112233445566778899aAbBcCdDeEfF"; int dcount = 0; if (*++cp == 'x' || *cp == 'X') - for (++cp; (dp = strchr(hex, *cp)) && (dcount++ < 2); cp++) + for (++cp; *cp && (dp = strchr(hex, *cp)) && (dcount++ < 2); cp++) cval = (cval * 16) + (dp - hex) / 2; else if (*cp == '0') - while (strchr("01234567",*cp) != (char*)NULL && (dcount++ < 3)) + while (*cp && strchr("01234567",*cp) != (char*)NULL && (dcount++ < 3)) cval = (cval * 8) + (*cp++ - '0'); else - while ((strchr("0123456789",*cp)!=(char*)NULL)&&(dcount++ < 3)) + while (*cp && (strchr("0123456789",*cp)!=(char*)NULL)&&(dcount++ < 3)) cval = (cval * 10) + (*cp++ - '0'); } else if (*cp == '\\') /* C-style character escapes */ { switch (*++cp) { + case '\n': cp++; continue; /* backslash before LF to join lines */ + case '\0': goto done; /* ignore backslash at file end */ case '\\': cval = '\\'; break; case 'n': cval = '\n'; break; case 't': cval = '\t'; break; @@ -253,6 +260,6 @@ char *tp; /* target buffer for digested string */ cval = *cp++; *tp++ = cval; } +done: *tp = '\0'; } -