From f679b4d22a4dbca440bcba76066c216248b53e8d Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Tue, 5 Oct 2010 12:26:52 -0700 Subject: [PATCH] Allow method to pass execgraph arguments containing spaces. --- doc/variables.xml | 6 +++++- src/specials.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/variables.xml b/doc/variables.xml index 38168c1c..158167de 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -1000,7 +1000,11 @@ use a temperature gradient, which makes the gradient values change depending on the amplitude of a particular graph value (try it and see). If -t or -l is your first argument, - you may need to preceed it by a space (' '). + you may need to preceed it by a space (' '). You may also use + double-quotes around the exec argument should you need to execute a + command with spaces. For example, ${execgraph "date +'%S'"} to execute + `date +'%S'` and graph the result. Without quotes, it would simply + print the result of `date`. diff --git a/src/specials.c b/src/specials.c index 3fa6e0b4..fc7e9f43 100644 --- a/src/specials.c +++ b/src/specials.c @@ -214,6 +214,19 @@ char *scan_graph(struct text_object *obj, const char *args, int defscale) //TODO: check the return value and throw an error? sscanf(args, "%1023s %d,%d", buf, &g->height, &g->width); } + + /* escape quotes at end in case of execgraph */ + if (*buf == '"') { + char *_ptr; + size_t _size; + if (_ptr = strrchr(args, '"')) { + _size = _ptr - args - 1; + } + _size = _size < 1024 ? _size : 1023; + strncpy(buf, args + 1, _size); + buf[_size] = 0; + } + #undef g return strndup(buf, text_buffer_size);