From: Brenden Matthews <brenden@diddyinc.com>
Date: Tue, 5 Oct 2010 19:26:52 +0000 (-0700)
Subject: Allow method to pass execgraph arguments containing spaces.
X-Git-Url: https://vcs.maemo.org/git/?p=monky;a=commitdiff_plain;h=f679b4d22a4dbca440bcba76066c216248b53e8d

Allow method to pass execgraph arguments containing spaces.
---

diff --git a/doc/variables.xml b/doc/variables.xml
index 38168c1..158167d 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`.
         <para /></listitem>
     </varlistentry>
     <varlistentry>
diff --git a/src/specials.c b/src/specials.c
index 3fa6e0b..fc7e9f4 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);