projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not die upon wront input when in remote mode
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
c8a3383
..
bfae7cf
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2
rc8
Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2
.1
Copyright by Tobi Oetiker, 1997-2005
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
@@
-22,7
+22,7
@@
void PrintUsage(char *cmd)
{
char help_main[] =
{
char help_main[] =
- "RRDtool 1.2
rc8
Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
+ "RRDtool 1.2
.1
Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
" Compiled " __DATE__ " " __TIME__ "\n\n"
#else
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
" Compiled " __DATE__ " " __TIME__ "\n\n"
#else
@@
-356,7
+356,7
@@
int main(int argc, char *argv[])
while (fgets(aLine, sizeof(aLine)-1, stdin)){
if ((argc = CountArgs(aLine)) == 0) {
while (fgets(aLine, sizeof(aLine)-1, stdin)){
if ((argc = CountArgs(aLine)) == 0) {
- fprintf(stderr,"ERROR: not enough arguments\n");
+ fprintf(stderr,"ERROR: not enough arguments\n");
}
if ((myargv = (char **) malloc((argc+1) *
sizeof(char *))) == NULL) {
}
if ((myargv = (char **) malloc((argc+1) *
sizeof(char *))) == NULL) {
@@
-368,8
+368,7
@@
int main(int argc, char *argv[])
exit(1);
}
exit(1);
}
- if (HandleInputLine(argc, myargv, stdout))
- exit(1);
+ HandleInputLine(argc, myargv, stdout);
free(myargv);
#if HAVE_GETRUSAGE
free(myargv);
#if HAVE_GETRUSAGE
@@
-416,8
+415,6
@@
int HandleInputLine(int argc, char **argv, FILE* out)
#if defined(HAVE_SYS_STAT_H)
struct stat st;
#endif
#if defined(HAVE_SYS_STAT_H)
struct stat st;
#endif
- optind=0; /* reset gnu getopt */
- opterr=0; /* no error messages */
if (RemoteMode){
if (argc>1 && strcmp("quit", argv[1]) == 0){
if (RemoteMode){
if (argc>1 && strcmp("quit", argv[1]) == 0){
@@
-549,7
+546,7
@@
int HandleInputLine(int argc, char **argv, FILE* out)
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
- printf("RRDtool 1.2
rc8
Copyright by Tobi Oetiker, 1997-2005\n");
+ printf("RRDtool 1.2
.1
Copyright by Tobi Oetiker, 1997-2005\n");
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)