From 1e139e410744eb791486dcee0ed4b1eebdf9a515 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 24 4月 2025 09:32:54 +0800
Subject: [PATCH] 提交修改
---
libscpi/src/utils.c | 607 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 374 insertions(+), 233 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 01562c7..8758917 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -1,30 +1,29 @@
/*-
- * Copyright (c) 2013 Jan Breuer
- * Richard.hmm
- * Copyright (c) 2012 Jan Breuer
+ * BSD 2-Clause License
*
- * All Rights Reserved
+ * Copyright (c) 2012-2018, Jan Breuer, Richard.hmm
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * modification, are permitted provided that the following conditions are met:
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
@@ -41,7 +40,6 @@
#include <string.h>
#include <ctype.h>
#include <math.h>
-
#include "utils_private.h"
#include "scpi/utils.h"
@@ -92,29 +90,29 @@
} else {
switch (base) {
- case 2:
- x = 0x80000000L;
- break;
- case 8:
- x = 0x40000000L;
- break;
- default:
- case 10:
- base = 10;
- x = 1000000000L;
- break;
- case 16:
- x = 0x10000000L;
- break;
+ case 2:
+ x = 0x80000000L;
+ break;
+ case 8:
+ x = 0x40000000L;
+ break;
+ default:
+ case 10:
+ base = 10;
+ x = 1000000000L;
+ break;
+ case 16:
+ x = 0x10000000L;
+ break;
}
- // add sign for numbers in base 10
+ /* add sign for numbers in base 10 */
if (sign && ((int32_t) val < 0) && (base == 10)) {
uval = -val;
ADD_CHAR('-');
}
- // remove leading zeros
+ /* remove leading zeros */
while ((uval / x) == 0) {
x /= base;
}
@@ -178,29 +176,29 @@
} else {
switch (base) {
- case 2:
- x = 0x8000000000000000ULL;
- break;
- case 8:
- x = 0x8000000000000000ULL;
- break;
- default:
- case 10:
- x = 10000000000000000000ULL;
- base = 10;
- break;
- case 16:
- x = 0x1000000000000000ULL;
- break;
+ case 2:
+ x = 0x8000000000000000ULL;
+ break;
+ case 8:
+ x = 0x8000000000000000ULL;
+ break;
+ default:
+ case 10:
+ x = 10000000000000000000ULL;
+ base = 10;
+ break;
+ case 16:
+ x = 0x1000000000000000ULL;
+ break;
}
- // add sign for numbers in base 10
+ /* add sign for numbers in base 10 */
if (sign && ((int64_t) val < 0) && (base == 10)) {
uval = -val;
ADD_CHAR('-');
}
- // remove leading zeros
+ /* remove leading zeros */
while ((uval / x) == 0) {
x /= base;
}
@@ -249,7 +247,8 @@
* @return number of bytes written to str (without '\0')
*/
size_t SCPI_FloatToStr(float val, char * str, size_t len) {
- return SCPIDEFINE_floatToStr(val, str, len);
+ SCPIDEFINE_floatToStr(val, str, len);
+ return strlen(str);
}
/**
@@ -260,7 +259,8 @@
* @return number of bytes written to str (without '\0')
*/
size_t SCPI_DoubleToStr(double val, char * str, size_t len) {
- return SCPIDEFINE_doubleToStr(val, str, len);
+ SCPIDEFINE_doubleToStr(val, str, len);
+ return strlen(str);
}
/**
@@ -295,7 +295,7 @@
*/
size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) {
char * endptr;
- *val = strtoll(str, &endptr, base);
+ *val = SCPIDEFINE_strtoll(str, &endptr, base);
return endptr - str;
}
@@ -307,7 +307,7 @@
*/
size_t strBaseToUInt64(const char * str, uint64_t * val, int8_t base) {
char * endptr;
- *val = strtoull(str, &endptr, base);
+ *val = SCPIDEFINE_strtoull(str, &endptr, base);
return endptr - str;
}
@@ -319,7 +319,7 @@
*/
size_t strToFloat(const char * str, float * val) {
char * endptr;
- *val = strtof(str, &endptr);
+ *val = SCPIDEFINE_strtof(str, &endptr);
return endptr - str;
}
@@ -376,7 +376,7 @@
if (num) {
if (len1 == len2) {
- //*num = 1;
+ /* *num = 1; */
} else {
int32_t tmpNum;
i = len1 + strBaseToInt32(str2 + len1, &tmpNum, 10);
@@ -483,13 +483,13 @@
pattern_sep_pos_short = patternSeparatorShortPos(pattern, new_pattern_len);
return compareStrAndNum(pattern, new_pattern_len, str, str_len, num) ||
- compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
+ compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
} else {
pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
return compareStr(pattern, pattern_len, str, str_len) ||
- compareStr(pattern, pattern_sep_pos_short, str, str_len);
+ compareStr(pattern, pattern_sep_pos_short, str, str_len);
}
}
@@ -528,11 +528,11 @@
}
/* now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
- if (pattern_ptr[0] == '[') { // skip first '['
+ if (pattern_ptr[0] == '[') { /* skip first '[' */
SKIP_PATTERN(1);
brackets++;
}
- if (pattern_ptr[0] == ':') { // skip first ':'
+ if (pattern_ptr[0] == ':') { /* skip first ':' */
SKIP_PATTERN(1);
}
@@ -555,7 +555,7 @@
if ((pattern_sep_pos > 0) && pattern_ptr[pattern_sep_pos - 1] == '#') {
if (numbers && (numbers_idx < numbers_len)) {
number_ptr = numbers + numbers_idx;
- *number_ptr = default_value; // default value
+ *number_ptr = default_value; /* default value */
} else {
number_ptr = NULL;
}
@@ -582,18 +582,18 @@
/* command complete, but pattern not */
if (cmd_len == 0) {
- // verify all subsequent pattern parts are also optional
+ /* verify all subsequent pattern parts are also optional */
while (pattern_len) {
pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_len);
switch (pattern_ptr[pattern_sep_pos]) {
- case '[':
- brackets++;
- break;
- case ']':
- brackets--;
- break;
- default:
- break;
+ case '[':
+ brackets++;
+ break;
+ case ']':
+ brackets--;
+ break;
+ default:
+ break;
}
SKIP_PATTERN(pattern_sep_pos + 1);
if (brackets == 0) {
@@ -612,33 +612,33 @@
/* both command and patter contains command separator at this position */
if ((pattern_len > 0)
- && ((pattern_ptr[0] == cmd_ptr[0])
+ && ((pattern_ptr[0] == cmd_ptr[0])
&& (pattern_ptr[0] == ':'))) {
SKIP_PATTERN(1);
SKIP_CMD(1);
} else if ((pattern_len > 1)
- && (pattern_ptr[1] == cmd_ptr[0])
- && (pattern_ptr[0] == '[')
- && (pattern_ptr[1] == ':')) {
- SKIP_PATTERN(2); // for skip '[' in "[:"
+ && (pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == '[')
+ && (pattern_ptr[1] == ':')) {
+ SKIP_PATTERN(2); /* for skip '[' in "[:" */
SKIP_CMD(1);
brackets++;
} else if ((pattern_len > 1)
- && (pattern_ptr[1] == cmd_ptr[0])
- && (pattern_ptr[0] == ']')
- && (pattern_ptr[1] == ':')) {
- SKIP_PATTERN(2); // for skip ']' in "]:"
+ && (pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == ':')) {
+ SKIP_PATTERN(2); /* for skip ']' in "]:" */
SKIP_CMD(1);
brackets--;
} else if ((pattern_len > 2)
- && (pattern_ptr[2] == cmd_ptr[0])
- && (pattern_ptr[0] == ']')
- && (pattern_ptr[1] == '[')
- && (pattern_ptr[2] == ':')) {
- SKIP_PATTERN(3); // for skip '][' in "][:"
+ && (pattern_ptr[2] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
+ SKIP_PATTERN(3); /* for skip '][' in "][:" */
SKIP_CMD(1);
- //brackets++;
- //brackets--;
+ /* brackets++; */
+ /* brackets--; */
} else {
result = FALSE;
break;
@@ -646,14 +646,14 @@
} else {
SKIP_PATTERN(pattern_sep_pos);
if ((pattern_ptr[0] == ']') && (pattern_ptr[1] == ':')) {
- SKIP_PATTERN(2); // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ SKIP_PATTERN(2); /* for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged */
brackets--;
} else if ((pattern_len > 2) && (pattern_ptr[0] == ']')
- && (pattern_ptr[1] == '[')
- && (pattern_ptr[2] == ':')) {
- SKIP_PATTERN(3); // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
- //brackets++;
- //brackets--;
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
+ SKIP_PATTERN(3); /* for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged */
+ /* brackets++; */
+ /* brackets--; */
} else {
result = FALSE;
break;
@@ -674,6 +674,8 @@
*
* prev and current should be in the same memory buffer
*/
+
+//缁勫悎澶嶅悎SCPI鍛戒护
scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) {
size_t i;
@@ -686,6 +688,7 @@
return TRUE;
/* Common command or command root - nothing to do */
+ // 褰撳墠鍛戒护鏄叕鍏卞懡浠�(*)鎴栨牴鍛戒护(:)
if (current->ptr[0] == '*' || current->ptr[0] == ':')
return TRUE;
@@ -706,6 +709,7 @@
current->ptr -= i;
current->len += i;
+ //澶嶅悎鍛戒护缁勫悎
memmove(current->ptr, prev->ptr, i);
return TRUE;
}
@@ -750,7 +754,37 @@
}
#endif
+#if USE_MEMORY_ALLOCATION_FREE && !HAVE_STRNDUP
+char *OUR_strndup(const char *s, size_t n) {
+ size_t len = SCPIDEFINE_strnlen(s, n);
+ //msvc涓嬮渶瑕佸己杞�
+ char * result =(char*) malloc(len + 1);
+ if (!result) {
+ return NULL;
+ }
+ memcpy(result, s, len);
+ result[len] = '\0';
+ return result;
+}
+#endif
+
#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+
+/**
+ * Initialize heap structure
+ * @param heap - pointer to manual allocated heap buffer
+ * @param error_info_heap - buffer for the heap
+ * @param error_info_heap_length - length of the heap
+ */
+void scpiheap_init(scpi_error_info_heap_t * heap, char * error_info_heap, size_t error_info_heap_length)
+{
+ heap->data = error_info_heap;
+ heap->wr = 0;
+ heap->size = error_info_heap_length;
+ heap->count = heap->size;
+ memset(heap->data, 0, heap->size);
+}
+
/**
* Duplicate string if "strdup" ("malloc/free") not supported on system.
* Allocate space in heap if it possible
@@ -759,41 +793,46 @@
* @param s - current pointer of duplication string
* @return - pointer of duplicated string or NULL, if duplicate is not possible.
*/
-char * OUR_strdup(scpi_error_info_heap_t * heap, const char *s) {
- if(!s || !heap) {
- return NULL;
- }
+char * scpiheap_strndup(scpi_error_info_heap_t * heap, const char *s, size_t n) {
+ if (!s || !heap || !heap->size) {
+ return NULL;
+ }
- if(heap->data[heap->wr]!='\0'){
- return NULL;
- }
-
- if( *s == '\0' ){
- return NULL;
- }
-
- size_t len=strlen(s) + 1; // additional '\0' at end
- if( len > heap->count ) {
- return NULL;
- }
- char * ptrs = s;
- char * head = &heap->data[heap->wr];
- size_t rem = heap->size - (&heap->data[heap->wr]-heap->data);
- size_t sstp = 0;
-
- if(len >= rem){
- memcpy(&heap->data[heap->wr],s,rem);
- len = len - rem;
- ptrs += rem;
- heap->wr = 0;
- heap->count -= rem;
- }
-
- memcpy(&heap->data[heap->wr],ptrs,len);
- heap->wr += len;
- heap->count -= len;
-
- return head;
+ if (heap->data[heap->wr] != '\0') {
+ return NULL;
+ }
+
+ if (*s == '\0') {
+ return NULL;
+ }
+
+ size_t len = SCPIDEFINE_strnlen(s, n) + 1; /* additional '\0' at end */
+ if (len > heap->count) {
+ return NULL;
+ }
+ const char * ptrs = s;
+ char * head = &heap->data[heap->wr];
+ size_t rem = heap->size - (&heap->data[heap->wr] - heap->data);
+
+ if (len >= rem) {
+ memcpy(&heap->data[heap->wr], s, rem);
+ len = len - rem;
+ ptrs += rem;
+ heap->wr = 0;
+ heap->count -= rem;
+ }
+
+ memcpy(&heap->data[heap->wr], ptrs, len);
+ heap->wr += len;
+ heap->count -= len;
+
+ /* ensure '\0' a the end */
+ if (heap->wr > 0) {
+ heap->data[heap->wr - 1] = '\0';
+ } else {
+ heap->data[heap->size - 1] = '\0';
+ }
+ return head;
}
/**
@@ -805,27 +844,27 @@
* @return s2 - pointer of second part of string, if string splited .
* @return len2 - lenght of second part of string.
*/
-scpi_bool_t OUR_get_parts(scpi_error_info_heap_t * heap, const char * s, size_t * len1, const char ** s2, size_t * len2) {
- if(!heap || !s || !len1 || !s2 || !len2) {
- return FALSE;
- }
-
- if(*s == '\0') {
- return FALSE;
- }
-
- *len1 = 0;
- size_t rem = heap->size - (s - heap->data);
- *len1 = strnlen(s, rem);
+scpi_bool_t scpiheap_get_parts(scpi_error_info_heap_t * heap, const char * s, size_t * len1, const char ** s2, size_t * len2) {
+ if (!heap || !s || !len1 || !s2 || !len2) {
+ return FALSE;
+ }
- if(&s[*len1-1] == &heap->data[heap->size-1]){
- *s2 = heap->data;
- *len2 = strnlen(*s2, heap->size);
- }else{
- *s2 = NULL;
- *len2 = 0;
- }
- return TRUE;
+ if (*s == '\0') {
+ return FALSE;
+ }
+
+ *len1 = 0;
+ size_t rem = heap->size - (s - heap->data);
+ *len1 = strnlen(s, rem);
+
+ if (&s[*len1 - 1] == &heap->data[heap->size - 1]) {
+ *s2 = heap->data;
+ *len2 = strnlen(*s2, heap->size);
+ } else {
+ *s2 = NULL;
+ *len2 = 0;
+ }
+ return TRUE;
}
/**
@@ -835,67 +874,69 @@
* @param s - pointer of duplicate string
* @param rollback - backward write pointer in heap
*/
-void OUR_free(scpi_error_info_heap_t * heap, const char * s, scpi_bool_t rollback) {
-
- if(!s) return;
-
- char * data_add;
- size_t len[2];
-
- if( !OUR_get_parts( heap, s, &len[0], &data_add, &len[1] ) ) return;
-
- if(data_add) {
- len[1]++;
- memset(data_add,0,len[1]);
- heap->count += len[1];
- } else {
- len[0]++;
- }
- memset(s,0,len[0]);
- heap->count += len[0];
- if( heap->count == heap->size){
- heap->wr = 0;
- return;
- }
- if(rollback){
- size_t rb = len[0] + len[1];
- if( rb > heap->wr){
- heap->wr += heap->size;
- }
- heap->wr -= rb;
- }
+void scpiheap_free(scpi_error_info_heap_t * heap, char * s, scpi_bool_t rollback) {
+
+ if (!s) return;
+
+ char * data_add;
+ size_t len[2];
+
+ if (!scpiheap_get_parts(heap, s, &len[0], (const char **)&data_add, &len[1])) return;
+
+ if (data_add) {
+ len[1]++;
+ memset(data_add, 0, len[1]);
+ heap->count += len[1];
+ } else {
+ len[0]++;
+ }
+ memset(s, 0, len[0]);
+ heap->count += len[0];
+ if (heap->count == heap->size) {
+ heap->wr = 0;
+ return;
+ }
+ if (rollback) {
+ size_t rb = len[0] + len[1];
+ if (rb > heap->wr) {
+ heap->wr += heap->size;
+ }
+ heap->wr -= rb;
+ }
}
#endif
-// Floating point to string conversion routines
-//
-// Copyright (C) 2002 Michael Ringgaard. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the project nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
+/*
+ * Floating point to string conversion routines
+ *
+ * Copyright (C) 2002 Michael Ringgaard. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
static char *scpi_ecvt(double arg, int ndigits, int *decpt, int *sign, char *buf, size_t bufsize) {
int r1, r2;
@@ -928,7 +969,7 @@
buf[--w2] = (int) ((fj + .03) * 10) + '0';
r2++;
}
- while (w2 < (int)bufsize) buf[w1++] = buf[w2++];
+ while (w2 < (int) bufsize) buf[w1++] = buf[w2++];
} else if (arg > 0) {
while ((fj = arg * 10) < 1) {
arg = fj;
@@ -941,12 +982,12 @@
buf[0] = '\0';
return buf;
}
- while (w1 <= w2 && w1 < (int)bufsize) {
+ while (w1 <= w2 && w1 < (int) bufsize) {
arg *= 10;
arg = modf(arg, &fj);
buf[w1++] = (int) fj + '0';
}
- if (w2 >= (int)bufsize) {
+ if (w2 >= (int) bufsize) {
buf[bufsize - 1] = '\0';
return buf;
}
@@ -970,14 +1011,14 @@
char * SCPI_dtostre(double __val, char * __s, size_t __ssize, unsigned char __prec, unsigned char __flags) {
char buffer[SCPI_DTOSTRE_BUFFER_SIZE];
- int sign = signbit(__val);
+ int sign = SCPIDEFINE_signbit(__val);
char * s = buffer;
int decpt;
if (sign) {
__val = -__val;
s[0] = '-';
s++;
- } else if (!isnan(__val)) {
+ } else if (!SCPIDEFINE_isnan(__val)) {
if (SCPI_DTOSTRE_PLUS_SIGN & __flags) {
s[0] = '+';
s++;
@@ -987,13 +1028,14 @@
}
}
- if (!isfinite(__val)) {
- if (isnan(__val)) {
+ if (!SCPIDEFINE_isfinite(__val)) {
+ if (SCPIDEFINE_isnan(__val)) {
strcpy(s, (__flags & SCPI_DTOSTRE_UPPERCASE) ? "NAN" : "nan");
} else {
strcpy(s, (__flags & SCPI_DTOSTRE_UPPERCASE) ? "INF" : "inf");
}
strncpy(__s, buffer, __ssize);
+ __s[__ssize - 1] = '\0';
return __s;
}
@@ -1047,14 +1089,16 @@
}
strncpy(__s, buffer, __ssize);
+ __s[__ssize - 1] = '\0';
return __s;
}
/**
* Get native CPU endiannes
- * @return
+ * @return
*/
scpi_array_format_t SCPI_GetNativeFormat(void) {
+
union {
uint32_t i;
char c[4];
@@ -1066,37 +1110,134 @@
/**
* Swap 16bit number
* @param val
- * @return
+ * @return
*/
uint16_t SCPI_Swap16(uint16_t val) {
- return ((val & 0x00FF) << 8) |
- ((val & 0xFF00) >> 8);
+ return ((val & 0x00FF) << 8) |
+ ((val & 0xFF00) >> 8);
}
/**
* Swap 32bit number
* @param val
- * @return
+ * @return
*/
uint32_t SCPI_Swap32(uint32_t val) {
- return ((val & 0x000000FF) << 24) |
- ((val & 0x0000FF00) << 8) |
- ((val & 0x00FF0000) >> 8) |
- ((val & 0xFF000000) >> 24);
+ return ((val & 0x000000FFul) << 24) |
+ ((val & 0x0000FF00ul) << 8) |
+ ((val & 0x00FF0000ul) >> 8) |
+ ((val & 0xFF000000ul) >> 24);
}
/**
* Swap 64bit number
* @param val
- * @return
+ * @return
*/
uint64_t SCPI_Swap64(uint64_t val) {
- return ((val & 0x00000000000000FFul) << 56) |
- ((val & 0x000000000000FF00ul) << 40) |
- ((val & 0x0000000000FF0000ul) << 24) |
- ((val & 0x00000000FF000000ul) << 8) |
- ((val & 0x000000FF00000000ul) >> 8) |
- ((val & 0x0000FF0000000000ul) >> 24) |
- ((val & 0x00FF000000000000ul) >> 40) |
- ((val & 0xFF00000000000000ul) >> 56);
+ return ((val & 0x00000000000000FFull) << 56) |
+ ((val & 0x000000000000FF00ull) << 40) |
+ ((val & 0x0000000000FF0000ull) << 24) |
+ ((val & 0x00000000FF000000ull) << 8) |
+ ((val & 0x000000FF00000000ull) >> 8) |
+ ((val & 0x0000FF0000000000ull) >> 24) |
+ ((val & 0x00FF000000000000ull) >> 40) |
+ ((val & 0xFF00000000000000ull) >> 56);
+}
+
+
+// 鐢ㄤ簬鎻愬彇骞跺鐞嗛�夐」鐨勫嚱鏁�
+int extract_required_options(const char* pattern, char options[MAX_TAGS][MAX_OPTION_LEN][MAX_OPTION_LEN], int max_tags) {
+ const char* start = strchr(pattern, '<'); // 鏌ユ壘绗竴涓� '<'
+ const char* end = NULL;
+ int tag_count = 0;
+
+ // 澶勭悊 <...> 鍐呯殑閫夐」
+ while (start != NULL && tag_count < max_tags)
+ {
+ end = strchr(start, '>'); // 鏌ユ壘瀵瑰簲鐨� '>'
+
+ if (end == NULL) {
+ break; // 濡傛灉娌℃湁鎵惧埌 '>'锛屽垯閫�鍑�
+ }
+
+ // 鎻愬彇 <...> 涓殑鍐呭
+ int len = end - start - 1;
+ if (len > 0 && len < MAX_OPTION_LEN) {
+ char buffer[MAX_OPTION_LEN];
+ strncpy(buffer, start + 1, len); // 澶嶅埗 '<' 鍜� '>' 涔嬮棿鐨勫唴瀹�
+ buffer[len] = '\0'; // 缁撴潫绗�
+
+ // 澶勭悊 | 鍒嗛殧绗︼紝鎻愬彇澶氫釜閫夐」
+ char* token = strtok(buffer, "|");
+ int option_count = 0;
+ while (token && option_count < MAX_OPTION_LEN) {
+ // 鍘婚櫎 token 涓殑 "[:", "]" 鍜岀┖鏍�
+ char* p = token;
+ while (*p == ' ' || *p == '[' || *p == ':') p++; // 鍘婚櫎鍓嶅绌烘牸鍜� [:
+ char* q = p + strlen(p) - 1;
+ while (q > p && (*q == ' ' || *q == ']')) q--; // 鍘婚櫎灏鹃殢绌烘牸鍜� ]
+ *(q + 1) = '\0'; // 纭繚缁撳熬鏄�'\0'
+
+ // 鎷疯礉閫夐」鍒� options 鏁扮粍
+ if (option_count < MAX_OPTION_LEN) { // 纭繚涓嶄細瓒婄晫
+ strncpy(options[tag_count][option_count], p, MAX_OPTION_LEN - 1);
+ options[tag_count][option_count][MAX_OPTION_LEN - 1] = '\0'; // 纭繚缁撴潫绗�
+ option_count++;
+ }
+ token = strtok(NULL, "|");
+ }
+ }
+
+ // 绉诲姩鍒颁笅涓�涓� '<' 浣嶇疆锛岀户缁煡鎵�
+ start = strchr(end + 1, '<');
+ tag_count++;
+ }
+
+ return tag_count;
+}
+
+// 鐢ㄤ簬妫�鏌ヨ緭鍏ユ槸鍚﹁兘鍖归厤姣忎竴缁勯�夐」
+int match_input_to_options(const char* input, char options[MAX_TAGS][MAX_OPTION_LEN][MAX_OPTION_LEN], int num_tags) {
+ char input_copy[MAX_INPUT_LEN];
+ strncpy(input_copy, input, MAX_INPUT_LEN - 1);
+ input_copy[MAX_INPUT_LEN - 1] = '\0'; // 纭繚缁撳熬鏄�'\0'
+
+ // 鎷嗗垎杈撳叆瀛楃涓诧紝鎸� ":" 鍒嗗壊
+ char* token = strtok(input_copy, ":");
+ int group_idx = 0;
+
+ // 瀵规瘡涓�缁勮繘琛屽尮閰�
+ while (token != NULL && group_idx < num_tags) {
+ int match_found = 0;
+ // 妫�鏌ュ綋鍓嶇粍鐨勬瘡涓�夐」鏄惁涓庤緭鍏ョ殑 token 鍖归厤
+ printf("Checking input token: '%s' against group %d options\n", token, group_idx + 1); // Debug info
+ for (int i = 0; i < MAX_OPTION_LEN && options[group_idx][i][0] != '\0'; i++) {
+ printf(" Comparing with option: '%s'\n", options[group_idx][i]); // Debug info
+ if (strcmp(options[group_idx][i], token) == 0) {
+ match_found = 1;
+ break;
+ }
+ }
+
+ // 濡傛灉褰撳墠缁勭殑鏌愪釜閫夐」娌℃湁鍖归厤涓婏紝杩斿洖 false
+ if (!match_found) {
+ return 0; // 涓嶅尮閰�
+ }
+
+ // 澶勭悊涓嬩竴涓緭鍏ラ儴鍒�
+ token = strtok(NULL, ":");
+ group_idx++;
+ }
+
+ return (group_idx == num_tags);
+}
+
+
+// 娴嬭瘯鍖归厤鍑芥暟
+bool test_match(const char* pattern, const char* command)
+{
+ char options[MAX_TAGS][MAX_OPTION_LEN][MAX_OPTION_LEN] = { {{0}} };
+ int num_tags = extract_required_options(pattern, options, MAX_TAGS);
+ return match_input_to_options(command, options, num_tags);
}
--
Gitblit v1.9.1