From a28ccd18f24b50dc62e37f1a5d8be641578343d9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 16 10月 2015 21:04:54 +0800
Subject: [PATCH] Resolve issue with strBaseToInt64 on 32bit platforms
---
libscpi/src/parser.c | 81 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index c996764..62dc151 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -118,9 +118,10 @@
* Process command
* @param context
*/
-static void processCommand(scpi_t * context) {
+static scpi_bool_t processCommand(scpi_t * context) {
const scpi_command_t * cmd = context->param_list.cmd;
lex_state_t * state = &context->param_list.lex_state;
+ scpi_bool_t result = TRUE;
/* conditionaly write ; */
writeSemicolon(context);
@@ -131,15 +132,25 @@
/* if callback exists - call command callback */
if (cmd->callback != NULL) {
- if ((cmd->callback(context) != SCPI_RES_OK) && !context->cmd_error) {
- SCPI_ErrorPush(context, SCPI_ERROR_EXECUTION_ERROR);
+ if ((cmd->callback(context) != SCPI_RES_OK)) {
+ if (!context->cmd_error) {
+ SCPI_ErrorPush(context, SCPI_ERROR_EXECUTION_ERROR);
+ }
+ result = FALSE;
+ } else {
+ if (context->cmd_error) {
+ result = FALSE;
+ }
}
}
/* set error if command callback did not read all parameters */
if (state->pos < (state->buffer + state->len) && !context->cmd_error) {
SCPI_ErrorPush(context, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
+ result = FALSE;
}
+
+ return result;
}
/**
@@ -166,28 +177,27 @@
* @param context
* @param data - complete command line
* @param len - command line length
- * @return 1 if the last evaluated command was found
+ * @return FALSE if there was some error during evaluation of commands
*/
-int SCPI_Parse(scpi_t * context, char * data, int len) {
- int result = 0;
+scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len) {
+ scpi_bool_t result = TRUE;
scpi_parser_state_t * state;
int r;
scpi_token_t cmd_prev = {SCPI_TOKEN_UNKNOWN, NULL, 0};
if (context == NULL) {
- return -1;
+ return FALSE;
}
state = &context->parser_state;
context->output_count = 0;
while (1) {
- result = 0;
-
r = scpiParser_detectProgramMessageUnit(state, data, len);
if (state->programHeader.type == SCPI_TOKEN_INVALID) {
SCPI_ErrorPush(context, SCPI_ERROR_INVALID_CHARACTER);
+ result = FALSE;
} else if (state->programHeader.len > 0) {
composeCompoundCommand(&cmd_prev, &state->programHeader);
@@ -201,12 +211,11 @@
context->param_list.cmd_raw.position = 0;
context->param_list.cmd_raw.length = state->programHeader.len;
- processCommand(context);
-
- result = 1;
+ result &= processCommand(context);
cmd_prev = state->programHeader;
} else {
SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
+ result = FALSE;
}
}
@@ -260,8 +269,8 @@
* @param len - length of data
* @return
*/
-int SCPI_Input(scpi_t * context, const char * data, int len) {
- int result = 0;
+scpi_bool_t SCPI_Input(scpi_t * context, const char * data, int len) {
+ scpi_bool_t result = TRUE;
size_t totcmdlen = 0;
int cmdlen = 0;
@@ -274,7 +283,11 @@
buffer_free = context->buffer.length - context->buffer.position;
if (len > (buffer_free - 1)) {
- return -1;
+ /* Input buffer overrun - invalidate buffer */
+ context->buffer.position = 0;
+ context->buffer.data[context->buffer.position] = 0;
+ SCPI_ErrorPush(context, SCPI_ERROR_INPUT_BUFFER_OVERRUN);
+ return FALSE;
}
memcpy(&context->buffer.data[context->buffer.position], data, len);
context->buffer.position += len;
@@ -339,7 +352,7 @@
* @return
*/
static size_t resultUInt32BaseSign(scpi_t * context, uint32_t val, int8_t base, scpi_bool_t sign) {
- char buffer[32+1];
+ char buffer[32 + 1];
const char * basePrefix;
size_t result = 0;
size_t len;
@@ -365,7 +378,7 @@
* @return
*/
static size_t resultUInt64BaseSign(scpi_t * context, uint64_t val, int8_t base, scpi_bool_t sign) {
- char buffer[64+1];
+ char buffer[64 + 1];
const char * basePrefix;
size_t result = 0;
size_t len;
@@ -487,7 +500,7 @@
SCPI_UInt32ToStrBase((uint32_t) len, block_header + 2, 10, 10);
header_len = strlen(block_header + 2);
- block_header[1] = (char)(header_len + '0');
+ block_header[1] = (char) (header_len + '0');
result += writeData(context, block_header, header_len + 2);
result += writeData(context, data, len);
@@ -623,7 +636,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
if (sign) {
- return strBaseToInt32(parameter->ptr, (int32_t *)value, 10) > 0 ? TRUE : FALSE;
+ return strBaseToInt32(parameter->ptr, (int32_t *) value, 10) > 0 ? TRUE : FALSE;
} else {
return strBaseToUInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
}
@@ -657,7 +670,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
if (sign) {
- return strBaseToInt64(parameter->ptr, (int64_t *)value, 10) > 0 ? TRUE : FALSE;
+ return strBaseToInt64(parameter->ptr, (int64_t *) value, 10) > 0 ? TRUE : FALSE;
} else {
return strBaseToUInt64(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
}
@@ -674,7 +687,7 @@
* @return TRUE if succesful
*/
scpi_bool_t SCPI_ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value) {
- return ParamSignToUInt32(context, parameter, (uint32_t *)value, TRUE);
+ return ParamSignToUInt32(context, parameter, (uint32_t *) value, TRUE);
}
/**
@@ -684,7 +697,7 @@
* @param value result
* @return TRUE if succesful
*/
-scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) {
+scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) {
return ParamSignToUInt32(context, parameter, value, FALSE);
}
@@ -696,7 +709,7 @@
* @return TRUE if succesful
*/
scpi_bool_t SCPI_ParamToInt64(scpi_t * context, scpi_parameter_t * parameter, int64_t * value) {
- return ParamSignToUInt64(context, parameter, (uint64_t *)value, TRUE);
+ return ParamSignToUInt64(context, parameter, (uint64_t *) value, TRUE);
}
/**
@@ -706,7 +719,7 @@
* @param value result
* @return TRUE if succesful
*/
-scpi_bool_t SCPI_ParamToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value) {
+scpi_bool_t SCPI_ParamToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value) {
return ParamSignToUInt64(context, parameter, value, FALSE);
}
@@ -910,7 +923,7 @@
* @return
*/
scpi_bool_t SCPI_ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
- return ParamSignUInt32(context, (uint32_t *)value, mandatory, TRUE);
+ return ParamSignUInt32(context, (uint32_t *) value, mandatory, TRUE);
}
/**
@@ -932,7 +945,7 @@
* @return
*/
scpi_bool_t SCPI_ParamInt64(scpi_t * context, int64_t * value, scpi_bool_t mandatory) {
- return ParamSignUInt64(context, (uint64_t *)value, mandatory, TRUE);
+ return ParamSignUInt64(context, (uint64_t *) value, mandatory, TRUE);
}
/**
@@ -965,7 +978,7 @@
result = SCPI_Parameter(context, ¶m, mandatory);
if (result) {
- switch(param.type) {
+ switch (param.type) {
case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA:
case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA:
*value = param.ptr + 1;
@@ -1334,9 +1347,10 @@
}
pattern = context->param_list.cmd->pattern;
- return matchCommand (pattern, cmd, strlen (cmd), NULL, 0, 0);
+ return matchCommand(pattern, cmd, strlen(cmd), NULL, 0, 0);
}
+#if USE_COMMAND_TAGS
/**
* Return the .tag field of the matching scpi_command_t
* @param context
@@ -1349,13 +1363,14 @@
return 0;
}
}
+#endif /* USE_COMMAND_TAGS */
scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len) {
- return matchCommand (pattern, value, len, NULL, 0, 0);
+ return matchCommand(pattern, value, len, NULL, 0, 0);
}
scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len, int32_t default_value) {
- return matchCommand (context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value);
+ return matchCommand(context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value);
}
/**
@@ -1364,8 +1379,7 @@
* @param parameter
* @return
*/
-scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter)
-{
+scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter) {
return parameter->type == SCPI_TOKEN_UNKNOWN ? FALSE : TRUE;
}
@@ -1374,7 +1388,6 @@
* @param context
* @return
*/
-scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context)
-{
+scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context) {
return context->cmd_error;
}
--
Gitblit v1.9.1