diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-01-09 10:22:39 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-01-09 10:22:39 +0200 |
commit | 7361c5a48968685f1ac6bb8561072b2dfe6a5a61 (patch) | |
tree | bd2d2a60d5470b3aa1ea827024df0661bf847ba7 | |
parent | 346535b7d14be92dd2b853058039bca67bb380dd (diff) | |
download | pies-7361c5a48968685f1ac6bb8561072b2dfe6a5a61.tar.gz pies-7361c5a48968685f1ac6bb8561072b2dfe6a5a61.tar.bz2 |
Bugfixes
* src/meta1gram.y: Translate "wait" mode to "exec".
* src/diag.c (logmsg_vprintf): Don't loose the last segment before \n.
-rw-r--r-- | src/diag.c | 1 | ||||
-rw-r--r-- | src/meta1gram.y | 13 |
2 files changed, 13 insertions, 1 deletions
@@ -129,6 +129,7 @@ logmsg_vprintf (int prio, const char *fmt, va_list ap) *p++ = 0; if (!*p) p = NULL; + grecs_txtacc_grow_string (log_acc, str); grecs_txtacc_grow_char (log_acc, 0); t = grecs_txtacc_finish (log_acc, 0); logmsg (prio, "%s", t); diff --git a/src/meta1gram.y b/src/meta1gram.y index 44751f3..3e19a12 100644 --- a/src/meta1gram.y +++ b/src/meta1gram.y @@ -338,10 +338,21 @@ xlat_listen_socket (struct meta1_stmt *stmt, struct component *comp) return 0; } +static int +xlat_start_action (struct meta1_stmt *stmt, struct component *comp) +{ + if (strcmp (stmt->v.value->v.string, "wait") == 0) + { + meta1_line_begin (); + meta1_line_add ("exec", 4); + stmt->v.value->v.string = meta1_line_finish (); + } + return 0; +} static struct node_trans root_node_trans[] = { { "listen_socket", "socket", xlat_listen_socket }, - { "start_action", "mode" }, + { "start_action", "mode", xlat_start_action }, { "pass_fd_socket", "pass-fd-socket" }, { "user", "user" }, { "path", "program" }, |