mirror of
https://github.com/tmux/tmux.git
synced 2024-11-12 23:28:52 +00:00
723010ba72
parser using yacc(1). This is a major change but is clearer and simpler
and allows some edge cases to be made more consistent, as well as
tidying up how aliases are handled. It will also allow some further
improvements later.
Entirely the same parser is now used for parsing the configuration file
and for string commands. This means that constructs previously only
available in .tmux.conf, such as %if, can now be used in string commands
(for example, those given to if-shell - not commands invoked from the
shell, they are still parsed by the shell itself).
The only syntax change I am aware of is that #{} outside quotes or a
comment is now considered a format and not a comment, so #{ is now a
syntax error (notably, if it is at the start of a line).
This also adds two new sections to the man page documenting the syntax
and outlining how parsing and command execution works.
Thanks to everyone who sent me test configs (they still all parse
without errors - but this doesn't mean they still work as intended!).
Thanks to Avi Halachmi for testing and man page improvements, also to
jmc@ for reviewing the man page changes.
107 lines
2.7 KiB
C
107 lines
2.7 KiB
C
/* $OpenBSD$ */
|
|
|
|
/*
|
|
* Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
|
|
* Copyright (c) 2012 George Nachman <tmux@georgester.com>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
|
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <event.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#include "tmux.h"
|
|
|
|
/* Write a line. */
|
|
void
|
|
control_write(struct client *c, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
evbuffer_add_vprintf(c->stdout_data, fmt, ap);
|
|
va_end(ap);
|
|
|
|
evbuffer_add(c->stdout_data, "\n", 1);
|
|
server_client_push_stdout(c);
|
|
}
|
|
|
|
/* Write a buffer, adding a terminal newline. Empties buffer. */
|
|
void
|
|
control_write_buffer(struct client *c, struct evbuffer *buffer)
|
|
{
|
|
evbuffer_add_buffer(c->stdout_data, buffer);
|
|
evbuffer_add(c->stdout_data, "\n", 1);
|
|
server_client_push_stdout(c);
|
|
}
|
|
|
|
/* Control error callback. */
|
|
static enum cmd_retval
|
|
control_error(struct cmdq_item *item, void *data)
|
|
{
|
|
struct client *c = item->client;
|
|
char *error = data;
|
|
|
|
cmdq_guard(item, "begin", 1);
|
|
control_write(c, "parse error: %s", error);
|
|
cmdq_guard(item, "error", 1);
|
|
|
|
free(error);
|
|
return (CMD_RETURN_NORMAL);
|
|
}
|
|
|
|
/* Control input callback. Read lines and fire commands. */
|
|
void
|
|
control_callback(struct client *c, int closed, __unused void *data)
|
|
{
|
|
char *line;
|
|
struct cmdq_item *item;
|
|
struct cmd_parse_result *pr;
|
|
|
|
if (closed)
|
|
c->flags |= CLIENT_EXIT;
|
|
|
|
for (;;) {
|
|
line = evbuffer_readln(c->stdin_data, NULL, EVBUFFER_EOL_LF);
|
|
if (line == NULL)
|
|
break;
|
|
if (*line == '\0') { /* empty line exit */
|
|
c->flags |= CLIENT_EXIT;
|
|
break;
|
|
}
|
|
|
|
pr = cmd_parse_from_string(line, NULL);
|
|
switch (pr->status) {
|
|
case CMD_PARSE_EMPTY:
|
|
break;
|
|
case CMD_PARSE_ERROR:
|
|
item = cmdq_get_callback(control_error, pr->error);
|
|
cmdq_append(c, item);
|
|
free(pr->error);
|
|
break;
|
|
case CMD_PARSE_SUCCESS:
|
|
item = cmdq_get_command(pr->cmdlist, NULL, NULL, 0);
|
|
item->shared->flags |= CMDQ_SHARED_CONTROL;
|
|
cmdq_append(c, item);
|
|
cmd_list_free(pr->cmdlist);
|
|
break;
|
|
}
|
|
|
|
free(line);
|
|
}
|
|
}
|