diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2010-06-01 23:06:26 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2010-06-01 23:06:26 +0000 |
| commit | e4fa6c1a72d6955515ed921d46e9551c550ef257 (patch) | |
| tree | 8720dab55e68292502b6e946bc49b8417747963d /usr.sbin/smtpd/parser.c | |
| parent | 98969c9e21deea8c51f1865d89b9e1e694cc033a (diff) | |
new queue, again; gcc2 compile tested by deraadt
Diffstat (limited to 'usr.sbin/smtpd/parser.c')
| -rw-r--r-- | usr.sbin/smtpd/parser.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/parser.c b/usr.sbin/smtpd/parser.c index 1826e230b53..1c1eb941d6a 100644 --- a/usr.sbin/smtpd/parser.c +++ b/usr.sbin/smtpd/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.13 2010/06/01 19:47:09 jacekm Exp $ */ +/* $OpenBSD: parser.c,v 1.14 2010/06/01 23:06:23 jacekm Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -58,6 +58,7 @@ struct token { static const struct token t_main[]; static const struct token t_show[]; +static const struct token t_show_queue[]; static const struct token t_pause[]; static const struct token t_resume[]; static const struct token t_schedule[]; @@ -78,12 +79,18 @@ static const struct token t_main[] = { }; static const struct token t_show[] = { - {KEYWORD, "queue", SHOW_QUEUE, NULL}, + {KEYWORD, "queue", SHOW_QUEUE, t_show_queue}, {KEYWORD, "runqueue", SHOW_RUNQUEUE, NULL}, {KEYWORD, "stats", SHOW_STATS, NULL}, {ENDTOKEN, "", NONE, NULL} }; +static const struct token t_show_queue[] = { + {NOTOKEN, "", NONE, NULL}, + {KEYWORD, "raw", SHOW_QUEUE_RAW, NULL}, + {ENDTOKEN, "", NONE, NULL} +}; + static const struct token t_pause[] = { {KEYWORD, "local", PAUSE_MDA, NULL}, {KEYWORD, "outgoing", PAUSE_MTA, NULL}, @@ -99,12 +106,12 @@ static const struct token t_resume[] = { }; static const struct token t_schedule[] = { - {VARIABLE, "message id/uid", SCHEDULE, NULL}, + {VARIABLE, "message", SCHEDULE, NULL}, {ENDTOKEN, "", NONE, NULL} }; static const struct token t_remove[] = { - {VARIABLE, "message id/uid", REMOVE, NULL}, + {VARIABLE, "message", REMOVE, NULL}, {ENDTOKEN, "", NONE, NULL} }; |