Code

fix for --font bug (font names wer not being picked up at all). Bug reported by ...
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Fri, 6 Jun 2008 16:38:25 +0000 (16:38 +0000)
committeroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Fri, 6 Jun 2008 16:38:25 +0000 (16:38 +0000)
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1403 a5681a0c-68f1-0310-ab6d-d61299d08faa

program/src/rrd_graph.c

index 3ee158254aec58c97e5890322d03fd2a9b92b2e4..4d747d08bc41b71514fa92cfc2d5c12116f7fe61 100644 (file)
@@ -3508,15 +3508,17 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
                         if (size > 0){
                               im->text_prop[propidx].size=size;              
                       }        
-                       if (strlen(prop) > end){
-                          if (prop[end] == ':'){
-                             strncpy(im->text_prop[propidx].font,prop+end+1,255);
+                       if (strlen(optarg) > end){
+                          if (optarg[end] == ':'){
+                             strncpy(im->text_prop[propidx].font,optarg+end+1,255);
                              im->text_prop[propidx].font[255] = '\0';
                           } else {
-                             rrd_set_error("expected after font size in '%s'",prop);
+                             rrd_set_error("expected : after font size in '%s'",optarg);
                             return;
                           }
                       }
+                      /* only run the for loop for DEFAULT (0) for
+                         all others, we break here. woodo programming */
                       if (propidx==sindex && sindex != 0) break;
                   }
                 } else {