projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Win32 build. VC++ 6.0 and 7.0 now use the thread-safe code.
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
41cf3cd
..
0378940
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-22,7
+22,8
@@
void PrintUsage(char *cmd)
{
char help_main[] =
{
char help_main[] =
- "RRDtool 1.1.x Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
+ "RRDtool 1.1.x Copyright 1997-2003 by Tobias Oetiker <tobi@oetiker.ch>\n"
+ " Compiled " MAKE_TIMESTAMP "\n\n"
"Usage: rrdtool [options] command command_options\n\n";
char help_list[] =
"Usage: rrdtool [options] command command_options\n\n";
char help_list[] =
@@
-253,7
+254,9
@@
int main(int argc, char *argv[])
{
char **myargv;
char aLine[MAX_LENGTH];
{
char **myargv;
char aLine[MAX_LENGTH];
+#ifdef HAVE_CHROOT
char *firstdir="";
char *firstdir="";
+#endif
#ifdef MUST_DISABLE_SIGFPE
signal(SIGFPE,SIG_IGN);
#endif
#ifdef MUST_DISABLE_SIGFPE
signal(SIGFPE,SIG_IGN);
#endif
@@
-279,7
+282,7
@@
int main(int argc, char *argv[])
gettimeofday(&starttime,&tz);
#endif
RemoteMode=1;
gettimeofday(&starttime,&tz);
#endif
RemoteMode=1;
-#if
ndef WIN32
+#if
def HAVE_CHROOT
if ((argc == 3) && strcmp("",argv[2])){
if (getuid()==0){
chroot(argv[2]);
if ((argc == 3) && strcmp("",argv[2])){
if (getuid()==0){
chroot(argv[2]);
@@
-303,8
+306,8
@@
int main(int argc, char *argv[])
}
}
#else
}
}
#else
- fprintf(stderr,"ERROR: change root
only in unix
"
- "
enviroment posible
\n");
+ fprintf(stderr,"ERROR: change root
is not supported by your OS
"
+ "
or at least by this copy of rrdtool
\n");
exit(1);
#endif
exit(1);
#endif
@@
-358,11
+361,17
@@
int main(int argc, char *argv[])
return 0;
}
return 0;
}
+/* HandleInputLine is NOT thread safe - due to readdir issues,
+ resolving them portably is not really simple. */
int HandleInputLine(int argc, char **argv, FILE* out)
{
int HandleInputLine(int argc, char **argv, FILE* out)
{
+#if defined(HAVE_OPENDIR) && defined (HAVE_READDIR)
DIR *curdir; /* to read current dir with ls */
struct dirent *dent;
DIR *curdir; /* to read current dir with ls */
struct dirent *dent;
+#endif
+#if defined(HAVE_SYS_STAT_H)
struct stat st;
struct stat st;
+#endif
optind=0; /* reset gnu getopt */
opterr=0; /* no error messages */
optind=0; /* reset gnu getopt */
opterr=0; /* no error messages */
@@
-374,12
+383,13
@@
int HandleInputLine(int argc, char **argv, FILE* out)
}
exit(0);
}
}
exit(0);
}
+#if defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_CHDIR)
if (argc>1 && strcmp("cd", argv[1]) == 0){
if (argc>3){
printf("ERROR: invalid parameter count for cd\n");
return(0);
}
if (argc>1 && strcmp("cd", argv[1]) == 0){
if (argc>3){
printf("ERROR: invalid parameter count for cd\n");
return(0);
}
-#if
ndef WIN32
+#if
! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
if (getuid()==0 && ! ChangeRoot){
printf("ERROR: chdir security problem - rrdtool is runnig as "
"root an no chroot!\n");
if (getuid()==0 && ! ChangeRoot){
printf("ERROR: chdir security problem - rrdtool is runnig as "
"root an no chroot!\n");
@@
-397,7
+407,7
@@
int HandleInputLine(int argc, char **argv, FILE* out)
printf("ERROR: invalid parameter count for mkdir\n");
return(0);
}
printf("ERROR: invalid parameter count for mkdir\n");
return(0);
}
-#if
ndef WIN32
+#if
! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
if (getuid()==0 && ! ChangeRoot){
printf("ERROR: mkdir security problem - rrdtool is runnig as "
"root an no chroot!\n");
if (getuid()==0 && ! ChangeRoot){
printf("ERROR: mkdir security problem - rrdtool is runnig as "
"root an no chroot!\n");
@@
-422,8
+432,8
@@
int HandleInputLine(int argc, char **argv, FILE* out)
printf("d %s\n",dent->d_name);
}
if (strlen(dent->d_name)>4 && S_ISREG(st.st_mode)){
printf("d %s\n",dent->d_name);
}
if (strlen(dent->d_name)>4 && S_ISREG(st.st_mode)){
- if (!strcmp(dent->d_name+
strlen(dent->d_name
)-4,".rrd") ||
- !strcmp(dent->d_name+
strlen(dent->d_name
)-4,".RRD")){
+ if (!strcmp(dent->d_name+
NAMLEN(dent
)-4,".rrd") ||
+ !strcmp(dent->d_name+
NAMLEN(dent
)-4,".RRD")){
printf("- %s\n",dent->d_name);
}
}
printf("- %s\n",dent->d_name);
}
}
@@
-436,6
+446,8
@@
int HandleInputLine(int argc, char **argv, FILE* out)
}
return(0);
}
}
return(0);
}
+#endif /* opendir and readdir */
+
}
if (argc < 3
|| strcmp("help", argv[1]) == 0
}
if (argc < 3
|| strcmp("help", argv[1]) == 0
@@
-486,7
+498,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.1.x Copyright (C) 1997-200
1
by Tobias Oetiker <tobi@oetiker.ch>\n");
+ printf("RRDtool 1.1.x Copyright (C) 1997-200
3
by Tobias Oetiker <tobi@oetiker.ch>\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)
@@
-496,7
+508,7
@@
int HandleInputLine(int argc, char **argv, FILE* out)
else if (strcmp("update", argv[1]) == 0)
rrd_update(argc-1, &argv[1]);
else if (strcmp("fetch", argv[1]) == 0) {
else if (strcmp("update", argv[1]) == 0)
rrd_update(argc-1, &argv[1]);
else if (strcmp("fetch", argv[1]) == 0) {
- time_t start,end;
+ time_t start,end
, ti
;
unsigned long step, ds_cnt,i,ii;
rrd_value_t *data,*datai;
char **ds_namv;
unsigned long step, ds_cnt,i,ii;
rrd_value_t *data,*datai;
char **ds_namv;
@@
-506,8
+518,8
@@
int HandleInputLine(int argc, char **argv, FILE* out)
for (i = 0; i<ds_cnt;i++)
printf("%14s",ds_namv[i]);
printf ("\n\n");
for (i = 0; i<ds_cnt;i++)
printf("%14s",ds_namv[i]);
printf ("\n\n");
- for (
i = start+step; i <= end;
i += step){
- printf("%10lu:", i);
+ for (
ti = start+step; ti <= end; t
i += step){
+ printf("%10lu:",
t
i);
for (ii = 0; ii < ds_cnt; ii++)
printf(" %0.10e", *(datai++));
printf("\n");
for (ii = 0; ii < ds_cnt; ii++)
printf(" %0.10e", *(datai++));
printf("\n");
@@
-519,8
+531,8
@@
int HandleInputLine(int argc, char **argv, FILE* out)
}
} else if (strcmp("xport", argv[1]) == 0) {
int xxsize;
}
} else if (strcmp("xport", argv[1]) == 0) {
int xxsize;
-
int i = 0,
j = 0;
- time_t start,end;
+
unsigned long int
j = 0;
+ time_t start,end
, ti
;
unsigned long step, col_cnt,row_cnt;
rrd_value_t *data,*ptr;
char **legend_v;
unsigned long step, col_cnt,row_cnt;
rrd_value_t *data,*ptr;
char **legend_v;
@@
-546,9
+558,9
@@
int HandleInputLine(int argc, char **argv, FILE* out)
printf(" </%s>\n", LEGEND_TAG);
printf(" </%s>\n", META_TAG);
printf(" <%s>\n", DATA_TAG);
printf(" </%s>\n", LEGEND_TAG);
printf(" </%s>\n", META_TAG);
printf(" <%s>\n", DATA_TAG);
- for (
i = start+step; i <= end;
i += step) {
+ for (
ti = start+step; ti <= end; t
i += step) {
printf (" <%s>", DATA_ROW_TAG);
printf (" <%s>", DATA_ROW_TAG);
- printf ("<%s>%lu</%s>", COL_TIME_TAG, i, COL_TIME_TAG);
+ printf ("<%s>%lu</%s>", COL_TIME_TAG,
t
i, COL_TIME_TAG);
for (j = 0; j < col_cnt; j++) {
rrd_value_t newval = DNAN;
newval = *ptr;
for (j = 0; j < col_cnt; j++) {
rrd_value_t newval = DNAN;
newval = *ptr;
@@
-571,12
+583,13
@@
int HandleInputLine(int argc, char **argv, FILE* out)
const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
int xsize, ysize;
int i;
const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
int xsize, ysize;
int i;
+ int tostdout = (strcmp(argv[2],"-") == 0);
if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) {
if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) {
- if (
strcmp(imgfile,"-") != 0
)
+ if (
!tostdout
)
printf ("%dx%d\n",xsize,ysize);
if (calcpr) {
for(i=0;calcpr[i];i++){
printf ("%dx%d\n",xsize,ysize);
if (calcpr) {
for(i=0;calcpr[i];i++){
- if (
strcmp(imgfile,"-") != 0
)
+ if (
!tostdout
)
printf("%s\n",calcpr[i]);
free(calcpr[i]);
}
printf("%s\n",calcpr[i]);
free(calcpr[i]);
}