See the patch, attached. It changes the default angle to 90, and

[rrdtool.git] / src / rrd_restore.c

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 4371d65..89f34c2 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -15,7 +15,7 @@ int skip(char **);
 int eat_tag(char **, char *);
 int read_tag(char **, char *, char *, void *);
 int xml2rrd(char*, rrd_t*, char);
-int rrd_write(char *, rrd_t *);
+int rrd_write(char *, rrd_t *, char);
 void parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index);
 void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
 void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
@@ -129,6 +129,12 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
     free(rrd -> stat_head);
     return -1;
   }
+  if (atoi(rrd -> stat_head -> version) < 2) 
+  {
+    rrd_set_error("Can only restore version >= 2 (Not %s). Dump your rrd using a current rrdtool dump.",  rrd -> stat_head -> version );
+    free(rrd -> stat_head);
+    return -1;
+  }
   rrd->stat_head->float_cookie = FLOAT_COOKIE;
   rrd->stat_head->ds_cnt = 0;
   rrd->stat_head->rra_cnt = 0;
@@ -399,15 +405,25 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
 /* create and empty rrd file according to the specs given */
 
 int
-rrd_write(char *file_name, rrd_t *rrd)
+rrd_write(char *file_name, rrd_t *rrd, char force_overwrite)
 {
     unsigned long    i,ii,val_cnt;
     FILE             *rrd_file=NULL;
+    int                        fdflags;
+    int                        fd;
 
     if (strcmp("-",file_name)==0){
       rrd_file= stdout;
     } else {
-      int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL,0666);
+#ifdef WIN32
+      fdflags = O_RDWR|O_BINARY|O_CREAT|O_EXCL;
+#else
+      fdflags = O_WRONLY|O_CREAT|O_EXCL;
+#endif            
+      if (force_overwrite == 0) {
+       fdflags |= O_EXCL;
+      }
+      fd = open(file_name,fdflags,0666);
       if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
        rrd_set_error("creating '%s': %s",file_name,rrd_strerror(errno));
         if (fd != -1)
@@ -463,11 +479,12 @@ rrd_restore(int argc, char **argv)
     rrd_t          rrd;
     char          *buf;
        char                    rc = 0;
+       char                    force_overwrite = 0;    
 
     /* init rrd clean */
     rrd_init(&rrd);
     if (argc<3) {
-               rrd_set_error("usage rrdtool %s [--range-check/-r] file.xml file.rrd",argv[0]);
+               rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);
                return -1;
     }
        
@@ -475,13 +492,14 @@ rrd_restore(int argc, char **argv)
                static struct option long_options[] =
                {
                        {"range-check",      required_argument, 0,  'r'},
+                       {"force-overwrite",     required_argument, 0,   'f'},
                        {0,0,0,0}
                };
                int option_index = 0;
                int opt;
                
                
-               opt = getopt_long(argc, argv, "r", long_options, &option_index);
+               opt = getopt_long(argc, argv, "r:f", long_options, &option_index);
                
                if (opt == EOF)
                        break;
@@ -490,9 +508,12 @@ rrd_restore(int argc, char **argv)
                case 'r':
                        rc=1;
                        break;
+               case 'f':
+                       force_overwrite=1;
+                       break;
                default:
-                       rrd_set_error("usage rrdtool %s [--range-check|-r] file.xml file.rrd",argv[0]);
-       return -1;
+                       rrd_set_error("usage rrdtool %s [--range-check|-r] [--force-overwrite/-f]  file.xml file.rrd",argv[0]);
+                       return -1;
                        break;
                }
     }
@@ -506,7 +527,7 @@ rrd_restore(int argc, char **argv)
        return -1;
     }
     free(buf);
-    if(rrd_write(argv[optind+1],&rrd)==-1){
+    if(rrd_write(argv[optind+1],&rrd,force_overwrite)==-1){
        rrd_free(&rrd); 
        return -1;      
     };