Remove all indefinite variables

[simgrid.git] / tools / tesh2 / src / fstream.c

diff --git a/tools/tesh2/src/fstream.c b/tools/tesh2/src/fstream.c
index f244865..c9e7f6c 100644 (file)
--- a/tools/tesh2/src/fstream.c
+++ b/tools/tesh2/src/fstream.c
@@ -708,7 +708,7 @@ fstream_lex_line(fstream_t fstream, context_t context, xbt_os_mutex_t mutex, con
                        \r
                        if((p = strstr(line2 + 2, exp)))\r
                        {\r
-                               if((p + strlen(variable->name) + 1)[0] != '\0')\r
+                               if((p + strlen(variable->name) + 1)[0] != '\0' && !(isalpha((p + strlen(variable->name) + 1)[0])))\r
                                        delimiters[0] = (p + strlen(variable->name) + 1)[0];\r
 \r
                                if(variable->val)\r
@@ -986,10 +986,10 @@ fstream_lex_line(fstream_t fstream, context_t context, xbt_os_mutex_t mutex, con
                \r
        }\r
        \r
-       p = line2 + 2;\r
-       \r
-       while(p && 1)\r
+       while(1)\r
        {\r
+               p = line2 + 2;\r
+               \r
                if((p = strchr(p, '$')))\r
                {\r
                        if(*(p+1) != ' ')\r