X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=898b6ff9c8e7dce2eecb3a2359e4615ba135d7b2;hp=323fec6dcfc1ba3d0d79c455961915e8f16e9ba0;hb=1f472620354603bd3bf2fdee30e2dd70dea7a4f1;hpb=8d46034bf5b28b3c5ec94baf7d526c6a3a95fb8b diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 323fec6..898b6ff 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 **************************************************************************** * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ @@ -25,12 +25,12 @@ #include #endif -#ifdef HAVE_TIME_H #include -#endif -#ifdef HAVE_LOCALE_H #include + +#ifdef HAVE_LANGINFO_H +#include #endif #include "rrd_graph.h" @@ -56,7 +56,7 @@ text_prop_t text_prop[] = { , /* unit */ {8.0, RRD_DEFAULT_FONT,NULL} /* legend */ , - {5.5, RRD_DEFAULT_FONT,NULL} /* watermark */ + {5.5, RRD_DEFAULT_FONT,NULL} /* watermark */ }; xlab_t xlab[] = { @@ -234,6 +234,7 @@ enum gf_en gf_conv( conv_if(VRULE, GF_VRULE); conv_if(LINE, GF_LINE); conv_if(AREA, GF_AREA); + conv_if(GRAD, GF_GRAD); conv_if(STACK, GF_STACK); conv_if(TICK, GF_TICK); conv_if(TEXTALIGN, GF_TEXTALIGN); @@ -336,6 +337,12 @@ int im_free( free(im->gdes[i].rpnp); } free(im->gdes); + + for (i = 0; i < DIM(text_prop);i++){ + pango_font_description_free(im->text_prop[i].font_desc); + im->text_prop[i].font_desc = NULL; + } + if (im->font_options) cairo_font_options_destroy(im->font_options); @@ -343,6 +350,8 @@ int im_free( status = cairo_status(im->cr); cairo_destroy(im->cr); } + + if (im->rendered_image) { free(im->rendered_image); } @@ -357,7 +366,7 @@ int im_free( if (status) fprintf(stderr, "OOPS: Cairo has issues it can't even die: %s\n", cairo_status_to_string(status)); - + return 0; } @@ -581,8 +590,8 @@ void apply_gridfit( ytr(im, DNAN); /* reset precalc */ log10_range = log10(im->maxval) - log10(im->minval); } - /* make sure first y=10^x gridline is located on - integer pixel position by moving scale slightly + /* make sure first y=10^x gridline is located on + integer pixel position by moving scale slightly downwards (sub-pixel movement) */ ypix = ytr(im, ya) + im->ysize; /* add im->ysize so it always is positive */ ypixfrac = ypix - floor(ypix); @@ -802,7 +811,7 @@ void reduce_data( } -/* get the data required for the graphs from the +/* get the data required for the graphs from the relevant rrds ... */ int data_fetch( @@ -845,46 +854,48 @@ int data_fetch( } if (!skip) { unsigned long ft_step = im->gdes[i].step; /* ft_step will record what we got from fetch */ + const char *rrd_daemon; + int status; - /* Flush the file if - * - a connection to the daemon has been established - * - this is the first occurrence of that RRD file - */ - if (rrdc_is_connected(im->daemon_addr)) + if (im->gdes[i].daemon[0] != 0) + rrd_daemon = im->gdes[i].daemon; + else + rrd_daemon = im->daemon_addr; + + /* "daemon" may be NULL. ENV_RRDCACHED_ADDRESS is evaluated in that + * case. If "daemon" holds the same value as in the previous + * iteration, no actual new connection is established - the + * existing connection is re-used. */ + rrdc_connect (rrd_daemon); + + /* If connecting was successfull, use the daemon to query the data. + * If there is no connection, for example because no daemon address + * was specified, (try to) use the local file directly. */ + if (rrdc_is_connected (rrd_daemon)) { - int status; - - status = 0; - for (ii = 0; ii < i; ii++) - { - if (strcmp (im->gdes[i].rrd, im->gdes[ii].rrd) == 0) - { - status = 1; - break; - } - } - - if (status == 0) - { - status = rrdc_flush (im->gdes[i].rrd); - if (status != 0) - { - rrd_set_error ("rrdc_flush (%s) failed with status %i.", - im->gdes[i].rrd, status); - return (-1); - } + status = rrdc_fetch (im->gdes[i].rrd, + cf_to_string (im->gdes[i].cf), + &im->gdes[i].start, + &im->gdes[i].end, + &ft_step, + &im->gdes[i].ds_cnt, + &im->gdes[i].ds_namv, + &im->gdes[i].data); + if (status != 0) + return (status); + } + else + { + if ((rrd_fetch_fn(im->gdes[i].rrd, + im->gdes[i].cf, + &im->gdes[i].start, + &im->gdes[i].end, + &ft_step, + &im->gdes[i].ds_cnt, + &im->gdes[i].ds_namv, + &im->gdes[i].data)) == -1) { + return -1; } - } /* if (rrdc_is_connected()) */ - - if ((rrd_fetch_fn(im->gdes[i].rrd, - im->gdes[i].cf, - &im->gdes[i].start, - &im->gdes[i].end, - &ft_step, - &im->gdes[i].ds_cnt, - &im->gdes[i].ds_namv, - &im->gdes[i].data)) == -1) { - return -1; } im->gdes[i].data_first = 1; @@ -919,7 +930,7 @@ int data_fetch( /* evaluate the expressions in the CDEF functions */ /************************************************************* - * CDEF stuff + * CDEF stuff *************************************************************/ long find_var_wrapper( @@ -1207,7 +1218,7 @@ int data_proc( { long i, ii; double pixstep = (double) (im->end - im->start) - / (double) im->xsize; /* how much time + / (double) im->xsize; /* how much time passes in one pixel */ double paintval; double minval = DNAN, maxval = DNAN; @@ -1216,8 +1227,11 @@ int data_proc( /* memory for the processed data */ for (i = 0; i < im->gdes_c; i++) { - if ((im->gdes[i].gf == GF_LINE) || - (im->gdes[i].gf == GF_AREA) || (im->gdes[i].gf == GF_TICK)) { + if ((im->gdes[i].gf == GF_LINE) + || (im->gdes[i].gf == GF_AREA) + || (im->gdes[i].gf == GF_TICK) + || (im->gdes[i].gf == GF_GRAD) + ) { if ((im->gdes[i].p_data = (rrd_value_t*)malloc((im->xsize + 1) * sizeof(rrd_value_t))) == NULL) { rrd_set_error("malloc data_proc"); @@ -1238,6 +1252,7 @@ int data_proc( switch (im->gdes[ii].gf) { case GF_LINE: case GF_AREA: + case GF_GRAD: case GF_TICK: if (!im->gdes[ii].stack) paintval = 0.0; @@ -1252,7 +1267,7 @@ int data_proc( } else if (((long int) gr_time >= (long int) im->gdes[vidx].start) - && ((long int) gr_time <= + && ((long int) gr_time < (long int) im->gdes[vidx].end)) { value = im->gdes[vidx].data[(unsigned long) floor((double) @@ -1305,7 +1320,7 @@ int data_proc( minval = 0.0; /* catching this right away below */ maxval = 5.1; } - /* in logarithm mode, where minval is smaller or equal + /* in logarithm mode, where minval is smaller or equal to 0 make the beast just way smaller than maxval */ if (minval <= 0) { minval = maxval / 10e8; @@ -1359,7 +1374,21 @@ int data_proc( return 0; } - +static int find_first_weekday(void){ + static int first_weekday = -1; + if (first_weekday == -1){ +#ifdef HAVE__NL_TIME_WEEK_1STDAY + /* according to http://sourceware.org/ml/libc-locales/2009-q1/msg00011.html */ + long week_1stday_l = (long) nl_langinfo (_NL_TIME_WEEK_1STDAY); + if (week_1stday_l == 19971130) first_weekday = 0; /* Sun */ + else if (week_1stday_l == 19971201) first_weekday = 1; /* Mon */ + else first_weekday = 1; /* we go for a monday default */ +#else + first_weekday = 1; +#endif + } + return first_weekday; +} /* identify the point where the first gridline, label ... gets placed */ @@ -1401,10 +1430,10 @@ time_t find_first_time( tm. tm_sec = 0; tm. tm_min = 0; tm. tm_hour = 0; - tm. tm_mday -= tm.tm_wday - 1; /* -1 because we want the monday */ + tm. tm_mday -= tm.tm_wday - find_first_weekday(); - if (tm.tm_wday == 0) - tm. tm_mday -= 7; /* we want the *previous* monday */ + if (tm.tm_wday == 0 && find_first_weekday() > 0) + tm. tm_mday -= 7; /* we want the *previous* week */ break; case TMT_MONTH: @@ -1576,8 +1605,12 @@ int print_calc( if (im->gdes[i].strftm) { prline.u_str = (char*)malloc((FMT_LEG_LEN + 2) * sizeof(char)); - strftime(prline.u_str, - FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + if (im->gdes[vidx].vf.never == 1) { + time_clean(prline.u_str, im->gdes[i].format); + } else { + strftime(prline.u_str, + FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + } } else if (bad_format(im->gdes[i].format)) { rrd_set_error ("bad format for PRINT in '%s'", im->gdes[i].format); @@ -1594,8 +1627,12 @@ int print_calc( /* GF_GPRINT */ if (im->gdes[i].strftm) { - strftime(im->gdes[i].legend, - FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + if (im->gdes[vidx].vf.never == 1) { + time_clean(im->gdes[i].legend, im->gdes[i].format); + } else { + strftime(im->gdes[i].legend, + FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + } } else { if (bad_format(im->gdes[i].format)) { rrd_set_error @@ -1617,6 +1654,7 @@ int print_calc( break; case GF_LINE: case GF_AREA: + case GF_GRAD: case GF_TICK: graphelement = 1; break; @@ -1685,7 +1723,7 @@ int leg_place( } - if (!(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH)) { + if (!(im->extra_flags & NOLEGEND) && !(im->extra_flags & ONLY_GRAPH)) { if ((legspace = (int*)malloc(im->gdes_c * sizeof(int))) == NULL) { rrd_set_error("malloc for legspace"); return -1; @@ -1734,6 +1772,7 @@ int leg_place( prt_fctn != 'r' && prt_fctn != 'j' && prt_fctn != 'c' && + prt_fctn != 'u' && prt_fctn != 's' && prt_fctn != '\0' && prt_fctn != 'g') { free(legspace); rrd_set_error @@ -1822,7 +1861,7 @@ int leg_place( if (prt_fctn == 'c') leg_x = (double)(legendwidth - fill) / 2.0; if (prt_fctn == 'r') - leg_x = legendwidth - fill - border; + leg_x = legendwidth - fill + border; for (ii = mark; ii <= i; ii++) { if (im->gdes[ii].legend[0] == '\0') continue; /* skip empty legends */ @@ -1843,6 +1882,8 @@ int leg_place( leg_y += im->text_prop[TEXT_PROP_LEGEND].size * 1.8; if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size; + if (prt_fctn == 'u') + leg_y -= im->text_prop[TEXT_PROP_LEGEND].size *1.8; if(calc_width && (fill > legendwidth)){ legendwidth = fill; @@ -1987,7 +2028,7 @@ int draw_horizontal_grid( double MaxY; double second_axis_magfact = 0; char *second_axis_symb = ""; - + scaledstep = im->ygrid_scale.gridstep / (double) im->magfact * (double) im->viewfactor; @@ -2047,8 +2088,8 @@ int draw_horizontal_grid( auto_scale(im,&dummy,&second_axis_symb,&second_axis_magfact); } sval /= second_axis_magfact; - - if(MaxY < 10) { + + if(MaxY < 10) { sprintf(graph_label_right,"%5.1f %s",sval,second_axis_symb); } else { sprintf(graph_label_right,"%5.0f %s",sval,second_axis_symb); @@ -2056,7 +2097,7 @@ int draw_horizontal_grid( } else { sprintf(graph_label_right,im->second_axis_format,sval); - } + } gfx_text ( im, X1+7, Y0, im->graph_col[GRC_FONT], @@ -2064,7 +2105,7 @@ int draw_horizontal_grid( im->tabwidth,0.0, GFX_H_LEFT, GFX_V_CENTER, graph_label_right ); } - + gfx_text(im, X0 - im-> @@ -2242,7 +2283,7 @@ int horizontal_log_grid( else symbol = '?'; sprintf(graph_label, "%3.0f %c", pvalue, symbol); - } else { + } else { sprintf(graph_label, "%3.0e", value); } if (im->second_axis_scale != 0){ @@ -2255,14 +2296,14 @@ int horizontal_log_grid( auto_scale(im,&sval,&symb,&mfac); sprintf(graph_label_right,"%4.0f %s", sval,symb); } - else { + else { sprintf(graph_label_right,"%3.0e", sval); } } else { - sprintf(graph_label_right,im->second_axis_format,sval); - } - + sprintf(graph_label_right,im->second_axis_format,sval,""); + } + gfx_text ( im, X1+7, Y0, im->graph_col[GRC_FONT], @@ -2270,7 +2311,7 @@ int horizontal_log_grid( im->tabwidth,0.0, GFX_H_LEFT, GFX_V_CENTER, graph_label_right ); } - + gfx_text(im, X0 - im-> @@ -2588,7 +2629,7 @@ void axis_paint( gfx_line ( im, im->xorigin+im->xsize,im->yorigin+4, im->xorigin+im->xsize,im->yorigin-im->ysize-4, MGRIDWIDTH, im->graph_col[GRC_AXIS]); - gfx_new_area ( im, + gfx_new_area ( im, im->xorigin+im->xsize-2, im->yorigin-im->ysize-2, im->xorigin+im->xsize+3, im->yorigin-im->ysize-2, im->xorigin+im->xsize, im->yorigin-im->ysize-7, /* LINEOFFSET */ @@ -2606,20 +2647,23 @@ void grid_paint( double X0, Y0; /* points for filled graph and more */ struct gfx_color_t water_color; - /* draw 3d border */ - gfx_new_area(im, 0, im->yimg, - 2, im->yimg - 2, 2, 2, im->graph_col[GRC_SHADEA]); - gfx_add_point(im, im->ximg - 2, 2); - gfx_add_point(im, im->ximg, 0); - gfx_add_point(im, 0, 0); - gfx_close_path(im); - gfx_new_area(im, 2, im->yimg - 2, - im->ximg - 2, - im->yimg - 2, im->ximg - 2, 2, im->graph_col[GRC_SHADEB]); - gfx_add_point(im, im->ximg, 0); - gfx_add_point(im, im->ximg, im->yimg); - gfx_add_point(im, 0, im->yimg); - gfx_close_path(im); + if (im->draw_3d_border > 0) { + /* draw 3d border */ + i = im->draw_3d_border; + gfx_new_area(im, 0, im->yimg, + i, im->yimg - i, i, i, im->graph_col[GRC_SHADEA]); + gfx_add_point(im, im->ximg - i, i); + gfx_add_point(im, im->ximg, 0); + gfx_add_point(im, 0, 0); + gfx_close_path(im); + gfx_new_area(im, i, im->yimg - i, + im->ximg - i, + im->yimg - i, im->ximg - i, i, im->graph_col[GRC_SHADEB]); + gfx_add_point(im, im->ximg, 0); + gfx_add_point(im, im->ximg, im->yimg); + gfx_add_point(im, 0, im->yimg); + gfx_close_path(im); + } if (im->draw_x_grid == 1) vertical_grid(im); if (im->draw_y_grid == 1) { @@ -2660,16 +2704,16 @@ void grid_paint( } if (im->second_axis_legend[0] != '\0'){ gfx_text( im, - im->xOriginLegendY2+10, + im->xOriginLegendY2+10, im->yOriginLegendY2, im->graph_col[GRC_FONT], im->text_prop[TEXT_PROP_UNIT].font_desc, - im->tabwidth, + im->tabwidth, RRDGRAPH_YLEGEND_ANGLE, GFX_H_CENTER, GFX_V_CENTER, im->second_axis_legend); - } - + } + /* graph title */ gfx_text(im, im->xOriginTitle, im->yOriginTitle+6, @@ -2689,7 +2733,7 @@ void grid_paint( text_prop[TEXT_PROP_WATERMARK]. font_desc, im->tabwidth, -90, GFX_H_LEFT, GFX_V_TOP, "RRDTOOL / TOBI OETIKER"); - } + } /* graph watermark */ if (im->watermark[0] != '\0') { water_color = im->graph_col[GRC_FONT]; @@ -2704,7 +2748,7 @@ void grid_paint( } /* graph labels */ - if (!(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH)) { + if (!(im->extra_flags & NOLEGEND) && !(im->extra_flags & ONLY_GRAPH)) { for (i = 0; i < im->gdes_c; i++) { if (im->gdes[i].legend[0] == '\0') continue; @@ -2734,41 +2778,63 @@ void grid_paint( boxV = boxH; /* shift the box up a bit */ Y0 -= boxV * 0.4; - /* make sure transparent colors show up the same way as in the graph */ - gfx_new_area(im, - X0, Y0 - boxV, - X0, Y0, X0 + boxH, Y0, im->graph_col[GRC_BACK]); - gfx_add_point(im, X0 + boxH, Y0 - boxV); - gfx_close_path(im); - gfx_new_area(im, X0, Y0 - boxV, X0, - Y0, X0 + boxH, Y0, im->gdes[i].col); - gfx_add_point(im, X0 + boxH, Y0 - boxV); - gfx_close_path(im); - cairo_save(im->cr); - cairo_new_path(im->cr); - cairo_set_line_width(im->cr, 1.0); - X1 = X0 + boxH; - Y1 = Y0 - boxV; - gfx_line_fit(im, &X0, &Y0); - gfx_line_fit(im, &X1, &Y1); - cairo_move_to(im->cr, X0, Y0); - cairo_line_to(im->cr, X1, Y0); - cairo_line_to(im->cr, X1, Y1); - cairo_line_to(im->cr, X0, Y1); - cairo_close_path(im->cr); - cairo_set_source_rgba(im->cr, - im-> - graph_col - [GRC_FRAME]. - red, - im-> - graph_col - [GRC_FRAME]. - green, - im-> - graph_col - [GRC_FRAME]. - blue, im->graph_col[GRC_FRAME].alpha); + + if (im->dynamic_labels && im->gdes[i].gf == GF_HRULE) { /* [-] */ + cairo_save(im->cr); + cairo_new_path(im->cr); + cairo_set_line_width(im->cr, 1.0); + gfx_line(im, + X0, Y0 - boxV / 2, + X0 + boxH, Y0 - boxV / 2, + 1.0, im->gdes[i].col); + gfx_close_path(im); + } else if (im->dynamic_labels && im->gdes[i].gf == GF_VRULE) { /* [|] */ + cairo_save(im->cr); + cairo_new_path(im->cr); + cairo_set_line_width(im->cr, 1.0); + gfx_line(im, + X0 + boxH / 2, Y0, + X0 + boxH / 2, Y0 - boxV, + 1.0, im->gdes[i].col); + gfx_close_path(im); + } else if (im->dynamic_labels && im->gdes[i].gf == GF_LINE) { /* [/] */ + cairo_save(im->cr); + cairo_new_path(im->cr); + cairo_set_line_width(im->cr, im->gdes[i].linewidth); + gfx_line(im, + X0, Y0, + X0 + boxH, Y0 - boxV, + im->gdes[i].linewidth, im->gdes[i].col); + gfx_close_path(im); + } else { + /* make sure transparent colors show up the same way as in the graph */ + gfx_new_area(im, + X0, Y0 - boxV, + X0, Y0, X0 + boxH, Y0, im->graph_col[GRC_BACK]); + gfx_add_point(im, X0 + boxH, Y0 - boxV); + gfx_close_path(im); + gfx_new_area(im, X0, Y0 - boxV, X0, + Y0, X0 + boxH, Y0, im->gdes[i].col); + gfx_add_point(im, X0 + boxH, Y0 - boxV); + gfx_close_path(im); + cairo_save(im->cr); + cairo_new_path(im->cr); + cairo_set_line_width(im->cr, 1.0); + X1 = X0 + boxH; + Y1 = Y0 - boxV; + gfx_line_fit(im, &X0, &Y0); + gfx_line_fit(im, &X1, &Y1); + cairo_move_to(im->cr, X0, Y0); + cairo_line_to(im->cr, X1, Y0); + cairo_line_to(im->cr, X1, Y1); + cairo_line_to(im->cr, X0, Y1); + cairo_close_path(im->cr); + cairo_set_source_rgba(im->cr, + im->graph_col[GRC_FRAME].red, + im->graph_col[GRC_FRAME].green, + im->graph_col[GRC_FRAME].blue, + im->graph_col[GRC_FRAME].alpha); + } if (im->gdes[i].dash) { /* make box borders in legend dashed if the graph is dashed */ double dashes[] = { @@ -2827,9 +2893,9 @@ int graph_size_location( /* The actual size of the image to draw is determined from ** several sources. The size given on the command line is ** the graph area but we need more as we have to draw labels - ** and other things outside the graph area. If the option - ** --full-size-mode is selected the size defines the total - ** image size and the size available for the graph is + ** and other things outside the graph area. If the option + ** --full-size-mode is selected the size defines the total + ** image size and the size available for the graph is ** calculated. */ @@ -2838,7 +2904,7 @@ int graph_size_location( ** | +---+-------------------------------+ ** | a | y | | ** | x | | | - ** | i | a | | + ** | i | a | | ** | s | x | main graph area | ** | | i | | ** | t | s | | @@ -2915,8 +2981,8 @@ int graph_size_location( Xylabel += Xspacing; /* If the legend is printed besides the graph the width has to be - ** calculated first. Placing the legend north or south of the - ** graph requires the width calculation first, so the legend is + ** calculated first. Placing the legend north or south of the + ** graph requires the width calculation first, so the legend is ** skipped for the moment. */ im->legendheight = 0; @@ -2982,7 +3048,7 @@ int graph_size_location( else{ Ymain -= Yxlabel; } - + /* reserve space for the title *or* some padding above the graph */ Ymain -= Ytitle; @@ -3034,12 +3100,12 @@ int graph_size_location( } } } - + im->yimg = Ymain + Yxlabel; if( (im->legendposition == NORTH || im->legendposition == SOUTH) && !(im->extra_flags & NOLEGEND) ){ im->yimg += im->legendheight; } - + /* reserve space for the title *or* some padding above the graph */ if (Ytitle) { im->yimg += Ytitle; @@ -3057,9 +3123,9 @@ int graph_size_location( } - /* In case of putting the legend in west or east position the first - ** legend calculation might lead to wrong positions if some items - ** are not aligned on the left hand side (e.g. centered) as the + /* In case of putting the legend in west or east position the first + ** legend calculation might lead to wrong positions if some items + ** are not aligned on the left hand side (e.g. centered) as the ** legendwidth wight have been increased after the item was placed. ** In this case the positions have to be recalculated. */ @@ -3072,7 +3138,7 @@ int graph_size_location( } /* After calculating all dimensions - ** it is now possible to calculate + ** it is now possible to calculate ** all offsets. */ switch(im->legendposition){ @@ -3213,8 +3279,8 @@ int graph_paint( return -1; /* calculate and PRINT and GPRINT definitions. We have to do it at * this point because it will affect the length of the legends - * if there are no graph elements (i==0) we stop here ... - * if we are lazy, try to quit ... + * if there are no graph elements (i==0) we stop here ... + * if we are lazy, try to quit ... */ i = print_calc(im); if (i < 0) @@ -3382,6 +3448,7 @@ int graph_paint( break; case GF_LINE: case GF_AREA: + case GF_GRAD: /* fix data points at oo and -oo */ for (ii = 0; ii < im->xsize; ii++) { if (isinf(im->gdes[i].p_data[ii])) { @@ -3395,13 +3462,13 @@ int graph_paint( } /* for */ /* ******************************************************* - a ___. (a,t) + a ___. (a,t) | | ___ ____| | | | | |___| - -------|--t-1--t-------------------------------- + -------|--t-1--t-------------------------------- - if we know the value at time t was a then + if we know the value at time t was a then we draw a square from t-1 to t with the value a. ********************************************************* */ @@ -3480,6 +3547,8 @@ int graph_paint( cairo_stroke(im->cr); cairo_restore(im->cr); } else { + double lastx=0; + double lasty=0; int idxI = -1; double *foreY = (double *) malloc(sizeof(double) * im->xsize * 2); @@ -3510,12 +3579,17 @@ int graph_paint( [cntI + 1], 4)) { cntI++; } - gfx_new_area(im, - backX[0], backY[0], - foreX[0], foreY[0], - foreX[cntI], - foreY[cntI], im->gdes[i].col); - while (cntI < idxI) { + if (im->gdes[i].gf != GF_GRAD) { + gfx_new_area(im, + backX[0], backY[0], + foreX[0], foreY[0], + foreX[cntI], + foreY[cntI], im->gdes[i].col); + } else { + lastx = foreX[cntI]; + lasty = foreY[cntI]; + } + while (cntI < idxI) { lastI = cntI; cntI++; while (cntI < idxI @@ -3531,9 +3605,32 @@ int graph_paint( + 1], 4)) { cntI++; } - gfx_add_point(im, foreX[cntI], foreY[cntI]); + if (im->gdes[i].gf != GF_GRAD) { + gfx_add_point(im, foreX[cntI], foreY[cntI]); + } else { + gfx_add_rect_fadey(im, + lastx, foreY[0], + foreX[cntI], foreY[cntI], lasty, + im->gdes[i].col, + im->gdes[i].col2, + im->gdes[i].gradheight + ); + lastx = foreX[cntI]; + lasty = foreY[cntI]; + } } - gfx_add_point(im, backX[idxI], backY[idxI]); + if (im->gdes[i].gf != GF_GRAD) { + gfx_add_point(im, backX[idxI], backY[idxI]); + } else { + gfx_add_rect_fadey(im, + lastx, foreY[0], + backX[idxI], backY[idxI], lasty, + im->gdes[i].col, + im->gdes[i].col2, + im->gdes[i].gradheight); + lastx = backX[idxI]; + lasty = backY[idxI]; + } while (idxI > 1) { lastI = idxI; idxI--; @@ -3550,11 +3647,23 @@ int graph_paint( - 1], 4)) { idxI--; } - gfx_add_point(im, backX[idxI], backY[idxI]); + if (im->gdes[i].gf != GF_GRAD) { + gfx_add_point(im, backX[idxI], backY[idxI]); + } else { + gfx_add_rect_fadey(im, + lastx, foreY[0], + backX[idxI], backY[idxI], lasty, + im->gdes[i].col, + im->gdes[i].col2, + im->gdes[i].gradheight); + lastx = backX[idxI]; + lasty = backY[idxI]; + } } idxI = -1; drawem = 0; - gfx_close_path(im); + if (im->gdes[i].gf != GF_GRAD) + gfx_close_path(im); } if (drawem != 0) { drawem = 0; @@ -3708,7 +3817,7 @@ int graph_paint( /***************************************************** - * graph stuff + * graph stuff *****************************************************/ int gdes_alloc( @@ -3748,6 +3857,11 @@ int gdes_alloc( im->gdes[im->gdes_c - 1].col.green = 0.0; im->gdes[im->gdes_c - 1].col.blue = 0.0; im->gdes[im->gdes_c - 1].col.alpha = 0.0; + im->gdes[im->gdes_c - 1].col2.red = 0.0; + im->gdes[im->gdes_c - 1].col2.green = 0.0; + im->gdes[im->gdes_c - 1].col2.blue = 0.0; + im->gdes[im->gdes_c - 1].col2.alpha = 0.0; + im->gdes[im->gdes_c - 1].gradheight = 50.0; im->gdes[im->gdes_c - 1].legend[0] = '\0'; im->gdes[im->gdes_c - 1].format[0] = '\0'; im->gdes[im->gdes_c - 1].strftm = 0; @@ -3757,6 +3871,7 @@ int gdes_alloc( im->gdes[im->gdes_c - 1].cf = CF_AVERAGE; im->gdes[im->gdes_c - 1].yrule = DNAN; im->gdes[im->gdes_c - 1].xrule = 0; + im->gdes[im->gdes_c - 1].daemon[0] = 0; return 0; } @@ -3873,17 +3988,21 @@ rrd_info_t *rrd_graph_v( { image_desc_t im; rrd_info_t *grinfo; + char *old_locale; rrd_graph_init(&im); /* a dummy surface so that we can measure text sizes for placements */ - + old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); rrd_graph_options(argc, argv, &im); if (rrd_test_error()) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_info_free(im.grinfo); im_free(&im); return NULL; } if (optind >= argc) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_info_free(im.grinfo); im_free(&im); rrd_set_error("missing filename"); @@ -3891,6 +4010,7 @@ rrd_info_t *rrd_graph_v( } if (strlen(argv[optind]) >= MAXPATH) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_set_error("filename (including path) too long"); rrd_info_free(im.grinfo); im_free(&im); @@ -3905,6 +4025,8 @@ rrd_info_t *rrd_graph_v( } rrd_graph_script(argc, argv, &im, 1); + setlocale(LC_NUMERIC, old_locale); /* reenable locale for rendering the graph */ + if (rrd_test_error()) { rrd_info_free(im.grinfo); im_free(&im); @@ -3952,15 +4074,17 @@ rrd_info_t *rrd_graph_v( return grinfo; } -static void +static void rrd_set_font_desc ( image_desc_t *im,int prop,char *font, double size ){ if (font){ - strncpy(im->text_prop[prop].font, font, sizeof(text_prop[prop].font) - 1); - im->text_prop[prop].font[sizeof(text_prop[prop].font) - 1] = '\0'; - im->text_prop[prop].font_desc = pango_font_description_from_string( font ); + strncpy(im->text_prop[prop].font, font, sizeof(text_prop[prop].font) - 1); + im->text_prop[prop].font[sizeof(text_prop[prop].font) - 1] = '\0'; + /* if we already got one, drop it first */ + pango_font_description_free(im->text_prop[prop].font_desc); + im->text_prop[prop].font_desc = pango_font_description_from_string( font ); }; - if (size > 0){ + if (size > 0){ im->text_prop[prop].size = size; }; if (im->text_prop[prop].font_desc && im->text_prop[prop].size ){ @@ -3980,16 +4104,13 @@ void rrd_graph_init( #ifdef HAVE_TZSET tzset(); #endif -#ifdef HAVE_SETLOCALE - setlocale(LC_TIME, ""); -#ifdef HAVE_MBSTOWCS - setlocale(LC_CTYPE, ""); -#endif -#endif + im->base = 1000; im->daemon_addr = NULL; im->draw_x_grid = 1; im->draw_y_grid = 1; + im->draw_3d_border = 2; + im->dynamic_labels = 0; im->extra_flags = 0; im->font_options = cairo_font_options_create(); im->forceleftspace = 0; @@ -4040,7 +4161,7 @@ void rrd_graph_init( im->second_axis_scale = 0; /* 0 disables it */ im->second_axis_shift = 0; /* no shift by default */ im->second_axis_legend[0] = '\0'; - im->second_axis_format[0] = '\0'; + im->second_axis_format[0] = '\0'; im->yorigin = 0; im->yOriginLegend = 0; im->yOriginLegendY = 0; @@ -4049,11 +4170,12 @@ void rrd_graph_init( im->ysize = 100; im->zoom = 1; - im->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 10, 10); + im->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 10, 10); im->cr = cairo_create(im->surface); for (i = 0; i < DIM(text_prop); i++) { im->text_prop[i].size = -1; + im->text_prop[i].font_desc = NULL; rrd_set_font_desc(im,i, deffont ? deffont : text_prop[i].font,text_prop[i].size); } @@ -4068,6 +4190,7 @@ void rrd_graph_init( pango_cairo_update_context(im->cr,context); im->layout = pango_layout_new(context); + g_object_unref (context); // im->layout = pango_cairo_create_layout(im->cr); @@ -4100,7 +4223,6 @@ void rrd_graph_options( long long_tmp; rrd_time_value_t start_tv, end_tv; long unsigned int color; - char *old_locale = ""; /* defines for long options without a short equivalent. should be bytes, and may not collide with (the ASCII value of) short options */ @@ -4108,55 +4230,58 @@ void rrd_graph_options( /* *INDENT-OFF* */ struct option long_options[] = { - { "start", required_argument, 0, 's'}, - { "end", required_argument, 0, 'e'}, - { "x-grid", required_argument, 0, 'x'}, - { "y-grid", required_argument, 0, 'y'}, - { "vertical-label", required_argument, 0, 'v'}, - { "width", required_argument, 0, 'w'}, - { "height", required_argument, 0, 'h'}, - { "full-size-mode", no_argument, 0, 'D'}, - { "interlaced", no_argument, 0, 'i'}, - { "upper-limit", required_argument, 0, 'u'}, - { "lower-limit", required_argument, 0, 'l'}, - { "rigid", no_argument, 0, 'r'}, + { "alt-autoscale", no_argument, 0, 'A'}, + { "imgformat", required_argument, 0, 'a'}, + { "font-smoothing-threshold", required_argument, 0, 'B'}, { "base", required_argument, 0, 'b'}, - { "logarithmic", no_argument, 0, 'o'}, { "color", required_argument, 0, 'c'}, - { "font", required_argument, 0, 'n'}, - { "title", required_argument, 0, 't'}, + { "full-size-mode", no_argument, 0, 'D'}, + { "daemon", required_argument, 0, 'd'}, + { "slope-mode", no_argument, 0, 'E'}, + { "end", required_argument, 0, 'e'}, + { "force-rules-legend", no_argument, 0, 'F'}, { "imginfo", required_argument, 0, 'f'}, - { "imgformat", required_argument, 0, 'a'}, - { "lazy", no_argument, 0, 'z'}, - { "zoom", required_argument, 0, 'm'}, + { "graph-render-mode", required_argument, 0, 'G'}, { "no-legend", no_argument, 0, 'g'}, - { "legend-position", required_argument, 0, 1005}, - { "legend-direction", required_argument, 0, 1006}, - { "force-rules-legend", no_argument, 0, 'F'}, - { "only-graph", no_argument, 0, 'j'}, - { "alt-y-grid", no_argument, 0, 'Y'}, - {"disable-rrdtool-tag", no_argument, 0, 1001}, - {"right-axis", required_argument, 0, 1002}, - {"right-axis-label", required_argument, 0, 1003}, - {"right-axis-format", required_argument, 0, 1004}, - { "no-minor", no_argument, 0, 'I'}, - { "slope-mode", no_argument, 0, 'E'}, - { "alt-autoscale", no_argument, 0, 'A'}, + { "height", required_argument, 0, 'h'}, + { "no-minor", no_argument, 0, 'I'}, + { "interlaced", no_argument, 0, 'i'}, { "alt-autoscale-min", no_argument, 0, 'J'}, + { "only-graph", no_argument, 0, 'j'}, + { "units-length", required_argument, 0, 'L'}, + { "lower-limit", required_argument, 0, 'l'}, { "alt-autoscale-max", no_argument, 0, 'M'}, + { "zoom", required_argument, 0, 'm'}, { "no-gridfit", no_argument, 0, 'N'}, - { "units-exponent", required_argument, 0, 'X'}, - { "units-length", required_argument, 0, 'L'}, - { "units", required_argument, 0, LONGOPT_UNITS_SI}, + { "font", required_argument, 0, 'n'}, + { "logarithmic", no_argument, 0, 'o'}, + { "pango-markup", no_argument, 0, 'P'}, + { "font-render-mode", required_argument, 0, 'R'}, + { "rigid", no_argument, 0, 'r'}, { "step", required_argument, 0, 'S'}, + { "start", required_argument, 0, 's'}, { "tabwidth", required_argument, 0, 'T'}, - { "font-render-mode", required_argument, 0, 'R'}, - { "graph-render-mode", required_argument, 0, 'G'}, - { "font-smoothing-threshold", required_argument, 0, 'B'}, + { "title", required_argument, 0, 't'}, + { "upper-limit", required_argument, 0, 'u'}, + { "vertical-label", required_argument, 0, 'v'}, { "watermark", required_argument, 0, 'W'}, + { "width", required_argument, 0, 'w'}, + { "units-exponent", required_argument, 0, 'X'}, + { "x-grid", required_argument, 0, 'x'}, + { "alt-y-grid", no_argument, 0, 'Y'}, + { "y-grid", required_argument, 0, 'y'}, + { "lazy", no_argument, 0, 'z'}, + { "units", required_argument, 0, LONGOPT_UNITS_SI}, { "alt-y-mrtg", no_argument, 0, 1000}, /* this has no effect it is just here to save old apps from crashing when they use it */ - { "pango-markup", no_argument, 0, 'P'}, - { "daemon", required_argument, 0, 'd'}, + { "disable-rrdtool-tag",no_argument, 0, 1001}, + { "right-axis", required_argument, 0, 1002}, + { "right-axis-label", required_argument, 0, 1003}, + { "right-axis-format", required_argument, 0, 1004}, + { "legend-position", required_argument, 0, 1005}, + { "legend-direction", required_argument, 0, 1006}, + { "border", required_argument, 0, 1007}, + { "grid-dash", required_argument, 0, 1008}, + { "dynamic-labels", no_argument, 0, 1009}, { 0, 0, 0, 0} }; /* *INDENT-ON* */ @@ -4171,7 +4296,7 @@ void rrd_graph_options( int col_start, col_end; opt = getopt_long(argc, argv, - "s:e:x:y:v:w:h:D:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMEX:L:S:T:NR:B:W:kPd:", + "Aa:B:b:c:Dd:Ee:Ff:G:gh:IiJjL:l:Mm:Nn:oPR:rS:s:T:t:u:v:W:w:X:x:Yy:z", long_options, &option_index); if (opt == EOF) break; @@ -4226,11 +4351,10 @@ void rrd_graph_options( break; case 1001: im->extra_flags |= NO_RRDTOOL_TAG; - break; + break; case LONGOPT_UNITS_SI: if (im->extra_flags & FORCE_UNITS) { rrd_set_error("--units can only be used once!"); - setlocale(LC_NUMERIC, old_locale); return; } if (strcmp(optarg, "si") == 0) @@ -4248,14 +4372,10 @@ void rrd_graph_options( im->forceleftspace = 1; break; case 'T': - old_locale = setlocale(LC_NUMERIC, "C"); im->tabwidth = atof(optarg); - setlocale(LC_NUMERIC, old_locale); break; case 'S': - old_locale = setlocale(LC_NUMERIC, "C"); im->step = atoi(optarg); - setlocale(LC_NUMERIC, old_locale); break; case 'N': im->gridfit = 0; @@ -4319,9 +4439,7 @@ void rrd_graph_options( im->draw_y_grid = 0; break; }; - old_locale = setlocale(LC_NUMERIC, "C"); if (sscanf(optarg, "%lf:%d", &im->ygridstep, &im->ylabfact) == 2) { - setlocale(LC_NUMERIC, old_locale); if (im->ygridstep <= 0) { rrd_set_error("grid step must be > 0"); return; @@ -4330,11 +4448,25 @@ void rrd_graph_options( return; } } else { - setlocale(LC_NUMERIC, old_locale); rrd_set_error("invalid y-grid format"); return; } break; + case 1007: + im->draw_3d_border = atoi(optarg); + break; + case 1008: /* grid-dash */ + if(sscanf(optarg, + "%lf:%lf", + &im->grid_dash_on, + &im->grid_dash_off) != 2) { + rrd_set_error("expected grid-dash format float:float"); + return; + } + break; + case 1009: /* enable dynamic labels */ + im->dynamic_labels = 1; + break; case 1002: /* right y axis */ if(sscanf(optarg, @@ -4367,14 +4499,10 @@ void rrd_graph_options( im->ylegend[150] = '\0'; break; case 'u': - old_locale = setlocale(LC_NUMERIC, "C"); im->maxval = atof(optarg); - setlocale(LC_NUMERIC, old_locale); break; case 'l': - old_locale = setlocale(LC_NUMERIC, "C"); im->minval = atof(optarg); - setlocale(LC_NUMERIC, old_locale); break; case 'b': im->base = atol(optarg); @@ -4479,20 +4607,18 @@ void rrd_graph_options( double size = 1; int end; - old_locale = setlocale(LC_NUMERIC, "C"); if (sscanf(optarg, "%10[A-Z]:%lf%n", prop, &size, &end) >= 2) { int sindex, propidx; - setlocale(LC_NUMERIC, old_locale); if ((sindex = text_prop_conv(prop)) != -1) { for (propidx = sindex; propidx < TEXT_PROP_LAST; propidx++) { if (size > 0) { - rrd_set_font_desc(im,propidx,NULL,size); + rrd_set_font_desc(im,propidx,NULL,size); } if ((int) strlen(optarg) > end+2) { if (optarg[end] == ':') { - rrd_set_font_desc(im,propidx,optarg + end + 1,0); + rrd_set_font_desc(im,propidx,optarg + end + 1,0); } else { rrd_set_error ("expected : after font size in '%s'", @@ -4510,16 +4636,13 @@ void rrd_graph_options( return; } } else { - setlocale(LC_NUMERIC, old_locale); rrd_set_error("invalid text property format"); return; } break; } case 'm': - old_locale = setlocale(LC_NUMERIC, "C"); im->zoom = atof(optarg); - setlocale(LC_NUMERIC, old_locale); if (im->zoom <= 0.0) { rrd_set_error("zoom factor must be > 0"); return; @@ -4594,11 +4717,6 @@ void rrd_graph_options( } } /* while (1) */ - { /* try to connect to rrdcached */ - int status = rrdc_connect(im->daemon_addr); - if (status != 0) return; - } - pango_cairo_context_set_font_options(pango_layout_get_context(im->layout), im->font_options); pango_layout_context_changed(im->layout); @@ -4742,12 +4860,9 @@ int vdef_parse( double param; char func[30]; int n; - char *old_locale; n = 0; - old_locale = setlocale(LC_NUMERIC, "C"); sscanf(str, "%le,%29[A-Z]%n", ¶m, func, &n); - setlocale(LC_NUMERIC, old_locale); if (n == (int) strlen(str)) { /* matched */ ; } else { @@ -4804,6 +4919,7 @@ int vdef_parse( gdes->vf.param = param; gdes->vf.val = DNAN; /* undefined */ gdes->vf.when = 0; /* undefined */ + gdes->vf.never = 1; } else { rrd_set_error ("Parameter '%f' out of range in VDEF '%s'\n", @@ -4825,6 +4941,7 @@ int vdef_parse( gdes->vf.param = DNAN; gdes->vf.val = DNAN; gdes->vf.when = 0; + gdes->vf.never = 1; } else { rrd_set_error ("Function '%s' needs no parameter in VDEF '%s'\n", @@ -4870,6 +4987,7 @@ int vdef_calc( field = round((dst->vf.param * (double)(steps - 1)) / 100.0); dst->vf.val = array[field]; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; free(array); #if 0 for (step = 0; step < steps; step++) @@ -4903,6 +5021,7 @@ int vdef_calc( field = round( dst->vf.param * (double)(nancount - 1) / 100.0); dst->vf.val = array[field]; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; free(array); } break; @@ -4913,15 +5032,18 @@ int vdef_calc( if (step == steps) { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } while (step != steps) { if (finite(data[step * src->ds_cnt])) { if (data[step * src->ds_cnt] > dst->vf.val) { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } } step++; @@ -4944,9 +5066,11 @@ int vdef_calc( if (dst->vf.op == VDEF_TOTAL) { dst->vf.val = sum * src->step; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; } else if (dst->vf.op == VDEF_AVERAGE) { dst->vf.val = sum / cnt; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; } else { average = sum / cnt; sum = 0.0; @@ -4957,10 +5081,12 @@ int vdef_calc( } dst->vf.val = pow(sum / cnt, 0.5); dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; }; } else { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } } break; @@ -4971,15 +5097,18 @@ int vdef_calc( if (step == steps) { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } while (step != steps) { if (finite(data[step * src->ds_cnt])) { if (data[step * src->ds_cnt] < dst->vf.val) { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } } step++; @@ -4996,9 +5125,11 @@ int vdef_calc( if (step == steps) { /* all entries were NaN */ dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + step * src->step; + dst->vf.never = 0; } break; case VDEF_LAST: @@ -5012,9 +5143,11 @@ int vdef_calc( if (step < 0) { /* all entries were NaN */ dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } break; case VDEF_LSLSLOPE: @@ -5052,16 +5185,20 @@ int vdef_calc( if (dst->vf.op == VDEF_LSLSLOPE) { dst->vf.val = slope; dst->vf.when = 0; + dst->vf.never = 1; } else if (dst->vf.op == VDEF_LSLINT) { dst->vf.val = y_intercept; dst->vf.when = 0; + dst->vf.never = 1; } else if (dst->vf.op == VDEF_LSLCORREL) { dst->vf.val = correl; dst->vf.when = 0; + dst->vf.never = 1; }; } else { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } } break; @@ -5110,3 +5247,156 @@ void grinfo_push( im->grinfo = im->grinfo_current; } } + + +void time_clean( + char *result, + char *format) +{ + int j, jj; + +/* Handling based on + - ANSI C99 Specifications http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1124.pdf + - Single UNIX Specification version 2 http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html + - POSIX:2001/Single UNIX Specification version 3 http://www.opengroup.org/onlinepubs/009695399/functions/strftime.html + - POSIX:2008 Specifications http://www.opengroup.org/onlinepubs/9699919799/functions/strftime.html + Specifications tells + "If a conversion specifier is not one of the above, the behavior is undefined." + + C99 tells + "A conversion specifier consists of a % character, possibly followed by an E or O modifier character (described below), followed by a character that determines the behavior of the conversion specifier. + + POSIX:2001 tells + "A conversion specification consists of a '%' character, possibly followed by an E or O modifier, and a terminating conversion specifier character that determines the conversion specification's behavior." + + POSIX:2008 introduce more complexe behavior that are not handled here. + + According to this, this code will replace: + - % followed by @ by a %@ + - % followed by by a %SPACE + - % followed by . by a %. + - % followed by % by a % + - % followed by t by a TAB + - % followed by E then anything by '-' + - % followed by O then anything by '-' + - % followed by anything else by at least one '-'. More characters may be added to better fit expected output length +*/ + + jj = 0; + for(j = 0; (j < FMT_LEG_LEN - 1) && (jj < FMT_LEG_LEN); j++) { /* we don't need to parse the last char */ + if (format[j] == '%') { + if ((format[j+1] == 'E') || (format[j+1] == 'O')) { + result[jj++] = '-'; + j+=2; /* We skip next 2 following char */ + } else if ((format[j+1] == 'C') || (format[j+1] == 'd') || + (format[j+1] == 'g') || (format[j+1] == 'H') || + (format[j+1] == 'I') || (format[j+1] == 'm') || + (format[j+1] == 'M') || (format[j+1] == 'S') || + (format[j+1] == 'U') || (format[j+1] == 'V') || + (format[j+1] == 'W') || (format[j+1] == 'y')) { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN) { + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'j') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if ((format[j+1] == 'G') || (format[j+1] == 'Y')) { + /* Assuming Year on 4 digit */ + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 2) { + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'R') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 3) { + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'T') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 6) { + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'F') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 8) { + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'D') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 6) { + result[jj++] = '-'; + result[jj++] = '/'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '/'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'n') { + result[jj++] = '\r'; + result[jj++] = '\n'; + j++; /* We skip the following char */ + } else if (format[j+1] == 't') { + result[jj++] = '\t'; + j++; /* We skip the following char */ + } else if (format[j+1] == '%') { + result[jj++] = '%'; + j++; /* We skip the following char */ + } else if (format[j+1] == ' ') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = ' '; + } + j++; /* We skip the following char */ + } else if (format[j+1] == '.') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = '.'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == '@') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = '@'; + } + j++; /* We skip the following char */ + } else { + result[jj++] = '-'; + j++; /* We skip the following char */ + } + } else { + result[jj++] = format[j]; + } + } + result[jj] = '\0'; /* We must force the end of the string */ +}