Fix typo.

[~andy/fetchmail] / rcfile_l.l

diff --git a/rcfile_l.l b/rcfile_l.l
index 18ac7278d69b4604723dfbcfe63e62de4a421058..21f05b4ec992226a3f83adf390f69fc1ea573bdf 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -24,26 +24,25 @@ int prc_lineno = 1;
 %o 7000
 %a 4000
 %p 3000
+%option nounput
 
 %s NAME AUTH
 
 %%
 
 \"[^\"]*\"     {
-                       char buf[MSGBUFSIZE];
-
-                       yytext[strlen(yytext)-1] = '\0';
-                       escapes(yytext+1, buf);
-                       yylval.sval = (char *) xstrdup(buf);
+                       yytext[yyleng-1] = '\0';
+                       escapes(yytext+1, yytext);
+                       yyleng = strlen(yytext);
+                       yylval.sval = yytext;
                         SETSTATE(0);
                        return STRING;
                }
 \'[^\']*\'     {
-                       char buf[MSGBUFSIZE];
-
-                       yytext[strlen(yytext)-1] = '\0';
-                       escapes(yytext+1, buf);
-                       yylval.sval = (char *) xstrdup(buf);
+                       yytext[yyleng-1] = '\0';
+                       escapes(yytext+1, yytext);
+                       yyleng = strlen(yytext);
+                       yylval.sval = yytext;
                         SETSTATE(0);
                        return STRING;
                }
@@ -51,10 +50,18 @@ int prc_lineno = 1;
 "*"            { BEGIN(0); return WILDCARD; }
 
 <NAME>[^=;:, \t\r\n]+  {
-                       char buf[MSGBUFSIZE];
-
-                       escapes(yytext, buf);
-                       yylval.sval = (char *) xstrdup(buf);
+                       static char *in;
+                       static size_t ins;
+
+                       if (yyleng + 1 > ins) {
+                           ins = yyleng + 1;
+                           in = xrealloc(in, ins);
+                       }
+                       memcpy(in, yytext, yyleng);
+                       in[yyleng] = '\0';
+                       escapes(in, in);
+                       yyleng = strlen(in);
+                       yylval.sval = in;
                         SETSTATE(0);
                        return STRING;
                }
@@ -70,6 +77,7 @@ postmaster    { return POSTMASTER; }
 bouncemail     { return BOUNCEMAIL; }
 spambounce     { return SPAMBOUNCE; }
 warnings       { return WARNINGS; }
+tracepolls     { return TRACEPOLLS; }
 
 defaults       { return DEFAULTS; }
 server                 { return POLL; }
@@ -90,6 +98,7 @@ 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;}
+(otp|opie)     { SETSTATE(0); yylval.proto = A_OTP; 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;}
@@ -97,11 +106,15 @@ timeout            { return TIMEOUT;}
 envelope       { return ENVELOPE; }
 qvirtual       { return QVIRTUAL; }
 principal      { return PRINCIPAL; }
+esmtpname      { return ESMTPNAME; }
+esmtppassword  { return ESMTPPASSWORD; }
+
 
 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; }
@@ -110,13 +123,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; }
 
@@ -186,19 +200,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);
+                       escapes(yytext, yytext);
+                       yyleng = strlen(yytext);
+                       yylval.sval = yytext;
                        return STRING;
                }
 
@@ -207,7 +221,9 @@ options             {/* EMPTY */}
 %%
 
 void escapes(cp, tp)
-/* process standard C-style escape sequences in a 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. */
 const char     *cp;    /* source string with escapes */
 char           *tp;    /* target buffer for digested string */
 {
@@ -250,4 +266,3 @@ char                *tp;    /* target buffer for digested string */
     }
     *tp = '\0';
 }
-