X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_create.c;h=378f6369f3cd45f91415a1b8215b6a0670b4be01;hb=3882bb0c2d15f97298aaa7602d6353a1888f5547;hp=2134db78963d5002496fbc564cb69b44da9daa52;hpb=5a7eb5b62b485b61ddb80a40ef22f4337cf2289f;p=rrdtool.git

diff --git a/src/rrd_create.c b/src/rrd_create.c
index 2134db7..378f636 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.5  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.16  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,6 +99,7 @@ rrd_create_r(char *filename,
     long              i;
     int               offset;
     char *token;
+    char dummychar1[2], dummychar2[2];
     unsigned short token_idx, error_flag, period=0;
     unsigned long hashed_name;
 
@@ -146,19 +150,31 @@ rrd_create_r(char *filename,
 	    }
 	    memset(&rrd.ds_def[rrd.stat_head->ds_cnt], 0, sizeof(ds_def_t));
             /* extract the name and type */
-	    if (sscanf(&argv[i][3],
-		       DS_NAM_FMT ":" DST_FMT ":%n",
-		       rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
-		       rrd.ds_def[rrd.stat_head->ds_cnt].dst,&offset) == 2)
-            {
-                /* check for duplicate datasource names */
-                for(ii=0;ii<rrd.stat_head->ds_cnt;ii++)
-                    if(strcmp(rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
-                              rrd.ds_def[ii].ds_nam) == 0){
-                        rrd_set_error("Duplicate DS name: %s",rrd.ds_def[ii].ds_nam);
-                    }				                                
-            } else {
-                rrd_set_error("invalid DS format");
+	    switch (sscanf(&argv[i][3],
+			DS_NAM_FMT "%1[:]" DST_FMT "%1[:]%n",
+			rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
+			dummychar1,
+			rrd.ds_def[rrd.stat_head->ds_cnt].dst,
+			dummychar2,
+			&offset)) {
+		case 0:
+		case 1:	rrd_set_error("Invalid DS name"); break;
+		case 2:
+		case 3: rrd_set_error("Invalid DS type"); break;
+		case 4: /* (%n may or may not be counted) */
+		case 5: /* check for duplicate datasource names */
+		    for (ii=0;ii<rrd.stat_head->ds_cnt;ii++)
+			if(strcmp(rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
+				rrd.ds_def[ii].ds_nam) == 0)
+			    rrd_set_error("Duplicate DS name: %s",
+					rrd.ds_def[ii].ds_nam);
+		    /* DS_type may be valid or not. Checked later */
+		    break;
+		default: rrd_set_error("invalid DS format");
+            }
+	    if (rrd_test_error()) {
+                rrd_free(&rrd);
+                return -1;
             }
             
             /* parse the remainder of the arguments */
@@ -541,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);
     }