/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.1 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");
#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);
}
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]);
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 */