X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5afaee62be6661d36a8d42cb727d28833d17d7e..3a2947e432dde3d65f3319db5527e235074fbd43:/tools/tesh/tesh.c

diff --git a/tools/tesh/tesh.c b/tools/tesh/tesh.c
index 15c0053770..0a495b8180 100644
--- a/tools/tesh/tesh.c
+++ b/tools/tesh/tesh.c
@@ -6,6 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid_config.h"     /* FILE for getline */
+
 /* specific to Borland Compiler */
 #ifdef __BORLANDDC__
 #pragma hdrstop
@@ -82,24 +84,28 @@ static void handle_line(const char *filepos, char *line)
   }
 }
 
-static void handle_suite(const char *filename, FILE * IN)
+static void handle_suite(const char *filename, FILE * FICIN)
 {
   size_t len;
+  int blankline;
+  int linelen;
   char *line = NULL;
   int line_num = 0;
   char file_pos[256];
-
-  xbt_strbuff_t buff = xbt_strbuff_new();
+  int to_be_continued;
   int buffbegin = 0;
+  xbt_strbuff_t buff = NULL;
 
+  buff = xbt_strbuff_new();
   rctx = rctx_new();
 
-  while (getline(&line, &len, IN) != -1) {
+  while (getline(&line, &len, FICIN) != -1) {
     line_num++;
 
     /* Count the line length while checking wheather it's blank */
-    int blankline = 1;
-    int linelen = 0;
+    blankline = 1;
+    linelen = 0;
+
     while (line[linelen] != '\0') {
       if (line[linelen] != ' ' && line[linelen] != '\t'
           && line[linelen] != '\n')
@@ -121,7 +127,7 @@ static void handle_suite(const char *filename, FILE * IN)
     }
 
     /* Deal with \ at the end of the line, and call handle_line on result */
-    int to_be_continued = 0;
+    to_be_continued = 0;
     if (linelen > 1 && line[linelen - 2] == '\\') {
       if (linelen > 2 && line[linelen - 3] == '\\') {
         /* Damn. Escaped \ */
@@ -169,11 +175,13 @@ static void parse_environ()
 {
   char *p;
   int i;
+  char *eq = NULL;
+  char *key = NULL;
   env = xbt_dict_new();
   for (i = 0; environ[i]; i++) {
     p = environ[i];
-    char *eq = strchr(p, '=');
-    char *key = bprintf("%.*s", (int) (eq - p), p);
+    eq = strchr(p, '=');
+    key = bprintf("%.*s", (int) (eq - p), p);
     xbt_dict_set(env, key, xbt_strdup(eq + 1), xbt_free_f);
     free(key);
   }
@@ -181,9 +189,9 @@ static void parse_environ()
 
 int main(int argc, char *argv[])
 {
-
-  FILE *IN;
+  FILE *FICIN = NULL;
   int i;
+  char *suitename = NULL;
 
   /* Ignore pipe issues.
      They will show up when we try to send data to dead buddies,
@@ -225,24 +233,25 @@ int main(int argc, char *argv[])
 
   } else {
     for (i = 1; i < argc; i++) {
-      char *suitename = xbt_strdup(argv[i]);
-      if (!strcmp("./", suitename))
+      suitename = xbt_strdup(argv[i]);
+      if (!strncmp("./", suitename, 2))
         memmove(suitename, suitename + 2, strlen(suitename + 2));
 
-      if (!strcmp(".tesh", suitename + strlen(suitename) - 5))
+      if (strlen(suitename) > 5 &&
+          !strcmp(".tesh", suitename + strlen(suitename) - 5))
         suitename[strlen(suitename) - 5] = '\0';
 
       INFO1("Test suite `%s'", suitename);
       testsuite_name = suitename;
-      IN = fopen(argv[i], "r");
-      if (!IN) {
+      FICIN = fopen(argv[i], "r");
+      if (!FICIN) {
         perror(bprintf("Impossible to open the suite file `%s'", argv[i]));
         ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
         rctx_armageddon(rctx, 1);
       }
-      handle_suite(suitename, IN);
+      handle_suite(suitename, FICIN);
       rctx_wait_bg();
-      fclose(IN);
+      fclose(FICIN);
       INFO1("Test suite `%s' OK", suitename);
       free(suitename);
     }