diff options
| -rw-r--r-- | rcfile_l.l | 11 | ||||
| -rw-r--r-- | rcfile_y.y | 5 |
2 files changed, 12 insertions, 4 deletions
@@ -26,12 +26,16 @@ int prc_lineno = 1; defaults { return DEFAULTS; } server { return SERVER; } proto(col)? { return PROTOCOL; } -is { return LOCALNAME; } +port { return PORT; } + user(name)? { return USERNAME; } pass(word)? { return PASSWORD; } remote(folder)? { return FOLDER; } smtp(host)? { return SMTPHOST; } mda { return MDA; } +is { return IS; } +here { return HERE; } + keep { yylval.flag = FLAG_TRUE; return KEEP; } flush { yylval.flag = FLAG_TRUE; return FLUSH; } fetchall { yylval.flag = FLAG_TRUE; return FETCHALL; } @@ -42,7 +46,10 @@ noflush { yylval.flag = FLAG_FALSE; return FLUSH; } nofetchall { yylval.flag = FLAG_FALSE; return FETCHALL; } norewrite { yylval.flag = FLAG_TRUE; return REWRITE; } noskip { yylval.flag = FLAG_FALSE; return SKIP; } -port { return PORT; } + +with {/* EMPTY */} +and {/* EMPTY */} +options {/* EMPTY */} (auto)|(AUTO) { yylval.proto = P_AUTO; return PROTO; } (pop2)|(POP2) { yylval.proto = P_POP2; return PROTO; } @@ -29,7 +29,7 @@ int yydebug; /* in case we didn't generate with -- debug */ char *sval; } -%token SERVER PROTOCOL LOCALNAME USERNAME PASSWORD FOLDER SMTPHOST MDA DEFAULTS +%token SERVER PROTOCOL USERNAME PASSWORD FOLDER SMTPHOST MDA DEFAULTS IS HERE %token <proto> PROTO %token <sval> STRING %token <flag> KEEP FLUSH FETCHALL REWRITE PORT SKIP @@ -84,7 +84,8 @@ user1opts : user_option | user1opts user_option ; -user_option : LOCALNAME STRING {prc_setlocal($2);} +user_option : IS STRING {prc_setlocal($2);} + | IS STRING HERE {prc_setlocal($2);} | PASSWORD STRING {prc_setpassword($2);} | FOLDER STRING {prc_setfolder($2);} | SMTPHOST STRING {prc_setsmtphost($2);} |