prepare for the release of rrdtool-1.2.19

[rrdtool.git] / src / rrd_graph.c

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 4abacc7..9be24e8 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.15  Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.19  Copyright by Tobi Oetiker, 1997-2007
  ****************************************************************************
  * rrd__graph.c  produce graphs from data in rrdfiles
  ****************************************************************************/
@@ -1448,9 +1448,11 @@ leg_place(image_desc_t *im)
        }
        /* only valid control codes */
         if (prt_fctn != 'l' && 
+           prt_fctn != 'n' && /* a synonym for l */
            prt_fctn != 'r' &&
            prt_fctn != 'j' &&
            prt_fctn != 'c' &&
+           prt_fctn != 's' &&
             prt_fctn != 't' &&
             prt_fctn != '\0' &&
             prt_fctn != 'g' ) {
@@ -1459,7 +1461,12 @@ leg_place(image_desc_t *im)
                       return -1;
 
        }
+
         /* remove exess space */
+        if ( prt_fctn == 'n' ){
+            prt_fctn='l';
+        }
+
         while (prt_fctn=='g' && 
               leg_cc > 0 && 
               im->gdes[i].legend[leg_cc-1]==' '){
@@ -3519,7 +3526,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 
         case 'W':
             strncpy(im->watermark,optarg,100);
-            im->watermark[100]='\0';
+            im->watermark[99]='\0';
             break;
 
        case '?':