X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_create.c;h=8fb74919b03a7708cba40d8c4719c78c65897a59;hb=674dee5af23a9cf9488f11880368c64a5ad70026;hp=3e9c68c79f286e788e61542036254ae13b29e22d;hpb=0dc5d6d50c0d95ba4f04b656358b26518d4ce854;p=rrdtool.git

diff --git a/src/rrd_create.c b/src/rrd_create.c
index 3e9c68c..8fb7491 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.9  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.18  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * rrd_create.c  creates new rrds
  *****************************************************************************/
@@ -78,7 +78,10 @@ rrd_create(int argc, char **argv)
 	    return(-1);
 	}
     }
-
+    if (optind == argc) {
+         rrd_set_error("what is the name of the rrd file you want to create?");
+         return -1;
+    }
     rc = rrd_create_r(argv[optind],
 		      pdp_step, last_up,
 		      argc - optind - 1, argv + optind + 1);
@@ -96,7 +99,7 @@ rrd_create_r(char *filename,
     long              i;
     int               offset;
     char *token;
-    unsigned short dummychar1,dummychar2;
+    char dummychar1[2], dummychar2[2];
     unsigned short token_idx, error_flag, period=0;
     unsigned long hashed_name;
 
@@ -150,9 +153,9 @@ rrd_create_r(char *filename,
 	    switch (sscanf(&argv[i][3],
 			DS_NAM_FMT "%1[:]" DST_FMT "%1[:]%n",
 			rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
-			&dummychar1,
+			dummychar1,
 			rrd.ds_def[rrd.stat_head->ds_cnt].dst,
-			&dummychar2,
+			dummychar2,
 			&offset)) {
 		case 0:
 		case 1:	rrd_set_error("Invalid DS name"); break;
@@ -554,8 +557,11 @@ rrd_create_fn(char *file_name, rrd_t *rrd)
     if ((rrd_file = fopen(file_name,"wb")) == NULL ) {
 	rrd_set_error("creating '%s': %s",file_name, rrd_strerror(errno));
 	free(rrd->stat_head);
+        rrd->stat_head = NULL; 
 	free(rrd->ds_def);
+        rrd->ds_def = NULL; 
 	free(rrd->rra_def);
+        rrd->rra_def = NULL;
 	return(-1);
     }