X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Flib%2Fcmdline_parse_num.c;h=31ca78d2318bbb861d7b27091f1d48ea5a6627d3;hb=f32d30f48ddfb55b86efd695e0dd144e9d15401e;hp=8a394ac30adcb55704c70b0ad0d5a3594c13c2df;hpb=289e62983cdc8579a78be38f6b30545fe5a9f0bf;p=libcmdline.git

diff --git a/src/lib/cmdline_parse_num.c b/src/lib/cmdline_parse_num.c
index 8a394ac..31ca78d 100644
--- a/src/lib/cmdline_parse_num.c
+++ b/src/lib/cmdline_parse_num.c
@@ -71,14 +71,6 @@
 //#define debug_printf(args...) printf(args)
 #define debug_printf(args...) do {} while(0)
 
-struct cmdline_token_ops cmdline_token_num_ops = {
-	.parse = cmdline_parse_num,
-	.complete_get_nb = NULL,
-	.complete_get_elt = NULL,
-	.get_help = cmdline_get_help_num,
-};
-
-
 enum num_parse_state_t {
 	START,
 	DEC_NEG,
@@ -97,47 +89,89 @@ enum num_parse_state_t {
 	DEC_NEG_OK,
 	DEC_POS_OK,
 	FLOAT_POS_OK,
-	FLOAT_NEG_OK,
+	FLOAT_NEG_OK
 };
 
 /* Keep it sync with enum in .h */
 static const char * num_help[] = {
-	"UINT8", "UINT16", "UINT32",
-	"INT8", "INT16", "INT32",
-#ifndef CMDLINE_NO_FLOAT
+	"UINT8", "UINT16", "UINT32", "UINT64",
+	"INT8", "INT16", "INT32", "INT64",
+#ifdef CMDLINE_HAVE_FLOAT
 	"FLOAT",
 #endif
 };
 
-static inline int
-add_to_res(unsigned int c, unsigned int *res, unsigned int base)
+static int
+add_to_res(unsigned int c, uint64_t *res, unsigned int base)
 {
 	/* overflow */
-	if ( (UINT32_MAX - c) / base < *res ) {
+	if ( (UINT64_MAX - c) / base < *res ) {
 		return -1;
 	}
 
-	*res = *res * base + c ;
+	*res = (uint64_t) (*res * base + c);
 	return 0;
 }
 
+static int
+check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
+{
+	switch (nd->type) {
+		case INT8:
+		case UINT8:
+			if (ressize < sizeof(int8_t))
+				return -1;
+			break;
+		case INT16:
+		case UINT16:
+			if (ressize < sizeof(int16_t))
+				return -1;
+			break;
+		case INT32:
+		case UINT32:
+			if (ressize < sizeof(int32_t))
+				return -1;
+			break;
+		case INT64:
+		case UINT64:
+			if (ressize < sizeof(int64_t))
+				return -1;
+			break;
+#ifdef CMDLINE_HAVE_FLOAT
+		case FLOAT:
+			if (ressize < sizeof(float))
+				return -1;
+			break;
+#endif
+		default:
+			return -1;
+	}
+	return 0;
+}
 
 /* parse an int or a float */
-int
-cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
+static int
+cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
+		  void *res, unsigned ressize)
 {
 	struct cmdline_token_num_data nd;
 	enum num_parse_state_t st = START;
 	const char * buf = srcbuf;
 	char c = *buf;
-	uint32_t res1 = 0;
-#ifndef CMDLINE_NO_FLOAT
-	uint32_t res2 = 0, res3 = 1;
+	uint64_t res1 = 0;
+#ifdef CMDLINE_HAVE_FLOAT
+	uint64_t res2 = 0, res3 = 1;
 #endif
 
 	memcpy(&nd, &((struct cmdline_token_num *)tk)->num_data, sizeof(nd));
 
-	while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
+	/* check that we have enough room in res */
+	if (res) {
+		if (check_res_size(&nd, ressize) < 0)
+			return -1;
+	}
+
+	while (st != ERROR && c != '\0') {
 		debug_printf("%c %x -> ", c, c);
 		switch (st) {
 		case START:
@@ -147,7 +181,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 			else if (c == '0') {
 				st = ZERO_OK;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_POS;
 				res1 = 0;
@@ -171,7 +205,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 			else if (c == 'b') {
 				st = BIN;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_POS;
 				res1 = 0;
@@ -195,7 +229,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				else
 					st = DEC_NEG_OK;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				res1 = 0;
 				st = FLOAT_NEG;
@@ -211,7 +245,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				if (add_to_res(c - '0', &res1, 10) < 0)
 					st = ERROR;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_NEG;
 			}
@@ -226,7 +260,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				if (add_to_res(c - '0', &res1, 10) < 0)
 					st = ERROR;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_POS;
 			}
@@ -281,7 +315,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 			}
 			break;
 
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 		case FLOAT_POS:
 			if (c >= '0' && c <= '9') {
 				if (add_to_res(c - '0', &res2, 10) < 0)
@@ -338,11 +372,11 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 
 		}
 
-#ifdef CMDLINE_NO_FLOAT
-		debug_printf("(%"PRIu32")\n", res1);
-#else
+#ifdef CMDLINE_HAVE_FLOAT
 		debug_printf("(%"PRIu32")  (%"PRIu32")  (%"PRIu32")\n",
 			     res1, res2, res3);
+#else
+		debug_printf("(%"PRIu32")\n", res1);
 #endif
 
 		buf ++;
@@ -389,7 +423,12 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				*(uint32_t *)res = (uint32_t) res1;
 			return (buf-srcbuf);
 		}
-#ifndef CMDLINE_NO_FLOAT
+		else if ( nd.type == UINT64 ) {
+			if (res)
+				*(uint64_t *)res = res1;
+			return (buf-srcbuf);
+		}
+#ifdef CMDLINE_HAVE_FLOAT
 		else if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = (float)res1;
@@ -404,20 +443,20 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 	case DEC_NEG_OK:
 		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
 			if (res)
-				*(int8_t *)res = - (int8_t) res1;
+				*(int8_t *)res = (int8_t) (-res1);
 			return (buf-srcbuf);
 		}
 		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
 			if (res)
-				*(int16_t *)res = - (int16_t) res1;
+				*(int16_t *)res = (int16_t) (-res1);
 			return (buf-srcbuf);
 		}
 		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
 			if (res)
-				*(int32_t *)res = - (int32_t) res1;
+				*(int32_t *)res = (int32_t) (-res1);
 			return (buf-srcbuf);
 		}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 		else if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = - (float)res1;
@@ -429,7 +468,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 		}
 		break;
 
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 	case FLOAT_POS:
 	case FLOAT_POS_OK:
 		if ( nd.type == FLOAT ) {
@@ -460,13 +499,12 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 		debug_printf("error\n");
 		return -1;
 	}
-	return -1;
 }
 
 
 /* parse an int or a float */
-int
-cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
+static int
+cmdline_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
 {
 	struct cmdline_token_num_data nd;
 
@@ -480,3 +518,12 @@ cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int s
 	dstbuf[size-1] = '\0';
 	return 0;
 }
+
+
+struct cmdline_token_ops cmdline_token_num_ops = {
+	.parse = cmdline_parse_num,
+	.complete_start = NULL,
+	.complete_iterate = NULL,
+	.complete_end = NULL,
+	.help = cmdline_help_num,
+};