added a nop control for string formating, so that strings ending in /x are possible...

fix for #331

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2262 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/doc/rrdgraph_graph.pod b/doc/rrdgraph_graph.pod
index 693b1edd9ff6cc34285c25c90b6d73f6993a026a..6d764a36b8dbabb676fed67a1b9e89fd9cf14638 100644 (file)
--- a/doc/rrdgraph_graph.pod
+++ b/doc/rrdgraph_graph.pod
@@ -380,6 +380,11 @@ to go one line back like this:
  COMMENT:\u
  COMMENT:right\r
 
+There is also a 'nop' control for situations where you want a string to
+actually end in a backslash character sequence B<\.>
+
+ COMMENT:OS\2\.
+
 When using a proportional font in your graph, the tab
 characters or the sequence B<\t> will line-up legend elements. Note that
 the tabs inserted are relative to the start of the current legend

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index aa4be90d0cc92148bb2362e3555a20ba1441b93c..8417291bc2f05a5691cc44a906215e609cccc81a 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1790,6 +1790,7 @@ int leg_place(
                 prt_fctn != 'j' &&
                 prt_fctn != 'c' &&
                 prt_fctn != 'u' &&
+                prt_fctn != '.' &&
                 prt_fctn != 's' && prt_fctn != '\0' && prt_fctn != 'g') {
                 free(legspace);
                 rrd_set_error
@@ -1801,6 +1802,10 @@ int leg_place(
             if (prt_fctn == 'n') {
                 prt_fctn = 'l';
             }
+            /* \. is a null operation to allow strings ending in \x */
+            if (prt_fctn == '.') {
+                prt_fctn = '\0';
+            }
 
             /* remove exess space from the end of the legend for \g */
             while (prt_fctn == 'g' &&