/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
#include "rrd_xport.h"
#include "rrd_i18n.h"
-#ifdef HAVE_LOCALE_H
#include <locale.h>
-#endif
+
void PrintUsage(
char *cmd);
int CreateArgs(
char *,
char *,
- int,
char **);
int HandleInputLine(
int,
const char *help_main =
N_("RRDtool %s"
- " Copyright 1997-2008 by Tobias Oetiker <tobi@oetiker.ch>\n"
+ " Copyright 1997-2009 by Tobias Oetiker <tobi@oetiker.ch>\n"
" Compiled %s %s\n\n"
"Usage: rrdtool [options] command command_options\n\n");
N_
("Valid commands: create, update, updatev, graph, graphv, dump, restore,\n"
"\t\tlast, lastupdate, first, info, fetch, tune,\n"
- "\t\tresize, xport, flush\n\n");
+ "\t\tresize, xport, flushcached\n\n");
const char *help_listremote =
N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n\n");
"\t\t[-s|--start start] [-e|--end end]\n"
"\t\t[--daemon <address>]\n\n");
- const char *help_flush =
- N_("* flush - flush cached data out to an RRD file\n\n"
- "\trrdtool flush filename.rrd\n"
+ const char *help_flushcached =
+ N_("* flushcached - flush cached data out to an RRD file\n\n"
+ "\trrdtool flushcached filename.rrd\n"
"\t\t[--daemon <address>]\n\n");
/* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/
"\t\t[-Y|--alt-y-grid] [--full-size-mode]\n"
"\t\t[-y|--y-grid y-axis grid and label]\n"
"\t\t[-v|--vertical-label string] [-w|--width pixels]\n"
+ "\t\t[--right-axis scale:shift] [--right-axis-label label]\n"
+ "\t\t[--right-axis-format format]\n"
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
"\t\t[-m|--zoom factor]\n"
"\t\t[-A|--alt-autoscale]\n"
"\t\t[-M|--alt-autoscale-max]\n"
+ "\t\t[-G|--graph-render-mode {normal,mono}]\n"
"\t\t[-R|--font-render-mode {normal,light,mono}]\n"
"\t\t[-B|--font-smoothing-threshold size]\n"
"\t\t[-T|--tabwidth width]\n"
"\t\t[-S|--step seconds]\n"
"\t\t[-f|--imginfo printfstr]\n"
"\t\t[-a|--imgformat PNG]\n"
- "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"
+ "\t\t[-c|--color COLORTAG#rrggbb[aa]]\n"
+ "\t\t[--border width\n"
+ "\t\t[-t|--title string]\n"
"\t\t[-W|--watermark string]\n"
"\t\t[DEF:vname=rrd:ds-name:CF]\n");
const char *help_graph3 =
"\t\t[--window-length integer]\n"
"\t\t[--alpha adaptation-parameter]\n");
const char *help_tune2 =
- N_(" * tune - Modify some basic properties of an RRD\n\n"
- "\t\t[--beta adaptation-parameter]\n"
+ N_("\t\t[--beta adaptation-parameter]\n"
"\t\t[--gamma adaptation-parameter]\n"
"\t\t[--gamma-deviation adaptation-parameter]\n"
"\t\t[--aberrant-reset ds-name]\n\n");
C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_GRAPHV,
C_TUNE,
C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD,
- C_UPDATEV, C_FLUSH
+ C_UPDATEV, C_FLUSHCACHED
};
int help_cmd = C_NONE;
help_cmd = C_UPDATEV;
else if (!strcmp(cmd, "fetch"))
help_cmd = C_FETCH;
- else if (!strcmp(cmd, "flush"))
- help_cmd = C_FLUSH;
+ else if (!strcmp(cmd, "flushcached"))
+ help_cmd = C_FLUSHCACHED;
else if (!strcmp(cmd, "graph"))
help_cmd = C_GRAPH;
else if (!strcmp(cmd, "graphv"))
case C_FETCH:
fputs(_(help_fetch), stdout);
break;
- case C_FLUSH:
- fputs(_(help_flush), stdout);
+ case C_FLUSHCACHED:
+ fputs(_(help_flushcached), stdout);
break;
case C_GRAPH:
fputs(_(help_graph0), stdout);
#ifdef MUST_DISABLE_FPMASK
fpsetmask(0);
#endif
-#ifdef HAVE_LOCALE_H
+
+ /* initialize locale settings
+ according to localeconv(3) */
setlocale(LC_ALL, "");
-#endif
#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL)
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(GETTEXT_PACKAGE);
#endif
if (argc == 1) {
}
while (fgetslong(&aLine, stdin)) {
+ char *aLineOrig = aLine;
if ((argc = CountArgs(aLine)) == 0) {
free(aLine);
printf("ERROR: not enough arguments\n");
+ continue;
}
if ((myargv = (char **) malloc((argc + 1) *
sizeof(char *))) == NULL) {
perror("malloc");
exit(1);
}
- if ((argc = CreateArgs(argv[0], aLine, argc, myargv)) < 0) {
- free(aLine);
- free(myargv);
+ if ((argc = CreateArgs(argv[0], aLine, myargv)) < 0) {
printf("ERROR: creating arguments\n");
} else {
- int ret = HandleInputLine(argc, myargv, stdout);
-
- free(myargv);
- if (ret == 0) {
+ if ( HandleInputLine(argc, myargv, stdout) == 0 ){
#if HAVE_GETRUSAGE
getrusage(RUSAGE_SELF, &myusage);
gettimeofday(¤ttime, NULL);
}
}
fflush(stdout); /* this is important for pipes to work */
- free(aLine);
+ free(myargv);
+ free(aLineOrig);
}
} else if (argc == 2) {
PrintUsage(argv[1]);
#if defined(HAVE_SYS_STAT_H)
struct stat st;
#endif
- char *cwd; /* To hold current working dir on call to pwd */
/* Reset errno to 0 before we start.
*/
return (0);
}
if (argc > 1 && strcmp("pwd", argv[1]) == 0) {
+ char *cwd; /* To hold current working dir on call to pwd */
if (argc > 2) {
printf("ERROR: invalid parameter count for pwd\n");
return (1);
if (rrd_xport
(argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt,
&legend_v, &data) != -1) {
+ char *old_locale = setlocale(LC_NUMERIC, "C");
row_cnt = (end - start) / step;
ptr = data;
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n",
free(data);
printf(" </%s>\n", DATA_TAG);
printf("</%s>\n", ROOT_TAG);
+ setlocale(LC_NUMERIC, old_locale);
}
free(vtag);
} else if (strcmp("graph", argv[1]) == 0) {
} else if (strcmp("tune", argv[1]) == 0)
rrd_tune(argc - 1, &argv[1]);
- else if (strcmp("flush", argv[1]) == 0)
- rrd_cmd_flush(argc - 1, &argv[1]);
+ else if (strcmp("flushcached", argv[1]) == 0)
+ rrd_flushcached(argc - 1, &argv[1]);
else {
rrd_set_error("unknown function '%s'", argv[1]);
}
int CreateArgs(
char *pName,
char *aLine,
- int argc,
char **argv)
{
char *getP, *putP;
char Quote = 0;
int inArg = 0;
int len;
+ int argc = 1;
len = strlen(aLine);
/* remove trailing space and newlines */
projects / rrdtool.git / blobdiff