Merge branch 'fix/TS-165' of https://github.com/taosdata/TDengine into fix/TS-165

src/client/src/tscUtil.c

@@ -2700,7 +2700,7 @@ void tscDequoteAndTrimToken(SStrToken* pToken) {
   // trim leading spaces
   while (first < last) {
     char c = pToken->z[first];
-    if (isspace(c)) {
+    if (c != ' ' && c != '\t') {
       break;
     }
     first++;
@@ -2709,7 +2709,7 @@ void tscDequoteAndTrimToken(SStrToken* pToken) {
   // trim ending spaces
   while (first < last) {
     char c = pToken->z[last - 1];
-    if (isspace(c)) {
+    if (c != ' ' && c != '\t') {
       break;
     }
     last--;

src/util/src/tutil.c

@@ -223,7 +223,7 @@ char *paGetToken(char *string, char **token, int32_t *tokenLen) {
   char quote = 0;
   
   while (*string != 0) {
-    if (isspace(*string)) {
+    if (*string == ' ' || *string == '\t') {
       ++string;
     } else {
       break;
@@ -244,12 +244,12 @@ char *paGetToken(char *string, char **token, int32_t *tokenLen) {
       break;
     }
 
-    if (*string == '#' || isspace(*string)) {
+    if (*string == '#' || *string == '\n' || *string == '\r') {
       *string = 0;
       break;
     }
 
-    if (isspace(*string) && !quote) {
+    if ((*string == ' ' || *string == '\t') && !quote) {
       break;
     } else {
       ++string;