X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rcfile_l.l;h=7cbf12ed3c9beaedceb93cd161a85e192204b9f2;hb=87bcf29364c4640edb87cc2186b965d1a564d70c;hp=9246631697986c98ba3ec451b4c9bb1e3862432f;hpb=207f1d7aa75ebf4cd695fc1bc735dc98c49cc5f5;p=~andy%2Ffetchmail diff --git a/rcfile_l.l b/rcfile_l.l index 92466316..7cbf12ed 100644 --- a/rcfile_l.l +++ b/rcfile_l.l @@ -1,35 +1,69 @@ %{ /* - * 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 #include "config.h" #include "fetchmail.h" +#include "xmalloc.h" #include "rcfile_y.h" +#include + 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 */ + +#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 *in = xstrndup(yytext+1, yyleng-2); + escapes(in, in); + yylval.sval = in; + SETSTATE(0); + return STRING; + } + +[^=;:, \t\r\n]+ { + 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; } +showdots { return SHOWDOTS; } postmaster { return POSTMASTER; } bouncemail { return BOUNCEMAIL; } +spambounce { return SPAMBOUNCE; } +softbounce { return SOFTBOUNCE; } warnings { return WARNINGS; } +tracepolls { return TRACEPOLLS; } defaults { return DEFAULTS; } server { return POLL; } @@ -37,60 +71,119 @@ 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; } interval { return INTERVAL; } -auth(enticate)? { return AUTHENTICATE; } -kerberos(_v)?4 { return KERBEROS4; } -kerberos(_v)?5 { return KERBEROS5; } -kerberos { return KERBEROS; } +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)?5 { SETSTATE(0); yylval.proto = A_KERBEROS_V5; 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;} +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;} +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)? { return USERNAME; } -pass(word)? { return PASSWORD; } +user(name)? {SETSTATE(NAME); return USERNAME; } +pwmd_socket { return PWMD_SOCKET; } +pwmd_file { return PWMD_FILE; } +pinentry_timeout { return PINENTRY_TIMEOUT; } +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 PLUGIN; } +plugout { return PLUGOUT; } batchlimit { return BATCHLIMIT; } fetchlimit { return FETCHLIMIT; } +fetchsizelimit { return FETCHSIZELIMIT; } +fastuidl { return FASTUIDL; } 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; } +to { SETSTATE(NAME); return TO; } += { SETSTATE(NAME); return MAP; } -no/[kfrsduc \t].* { return NO;} +nobouncemail | +nouidl | +nocheckalias | +nodns | +noenvelope | +nokeep | +noflush | +nolimitflush | +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; } +limitflush { return LIMITFLUSH; } fetchall { return FETCHALL; } 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; } +sslcertfile { return SSLCERTFILE; } +sslcertpath { return SSLCERTPATH; } +sslcommonname { return SSLCOMMONNAME; } +sslfingerprint { return SSLFINGERPRINT; } checkalias { return CHECKALIAS; } limit { return LIMIT; } @@ -103,47 +196,21 @@ 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-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; } +(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]+ { 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; - } -\'[^\']*\' { - 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]; - - escapes(yytext, buf); - yylval.sval = (char *) xstrdup(buf); + char *in = xstrdup(yytext); + escapes(in, in); + yylval.sval = in; return STRING; } @@ -151,35 +218,40 @@ remote(folder)? { %% -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; @@ -193,6 +265,6 @@ char *tp; /* target buffer for digested string */ cval = *cp++; *tp++ = cval; } +done: *tp = '\0'; } -