format

[simgrid.git] / tools / tesh / tesh.c

diff --git a/tools/tesh/tesh.c b/tools/tesh/tesh.c
index 7b1a4c0..4cf55b9 100644 (file)
--- a/tools/tesh/tesh.c
+++ b/tools/tesh/tesh.c
@@ -1,13 +1,13 @@
-/* $Id$ */
-
 /* TESH (Test Shell) -- mini shell specialized in running test units        */
 
-/* Copyright (c) 2007 Martin Quinson.                                       */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* 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
@@ -87,21 +87,25 @@ static void handle_line(const char *filepos, char *line)
 static void handle_suite(const char *filename, FILE * IN)
 {
   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) {
     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')
@@ -123,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 \ */
@@ -171,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);
   }
@@ -183,9 +189,9 @@ static void parse_environ()
 
 int main(int argc, char *argv[])
 {
-
-  FILE *IN;
+  FILE *IN = NULL;
   int i;
+  char *suitename = NULL;
 
   /* Ignore pipe issues.
      They will show up when we try to send data to dead buddies,
@@ -201,7 +207,7 @@ int main(int argc, char *argv[])
 
   /* Get args */
   for (i = 1; i < argc; i++) {
-    if (!strncmp(argv[i], "--cd", strlen("--cd") + 1)) {
+    if (!strcmp(argv[i], "--cd")) {
       if (i == argc - 1) {
         ERROR0("--cd argument requires an argument");
         exit(1);
@@ -212,8 +218,9 @@ int main(int argc, char *argv[])
         exit(1);
       }
       INFO1("Change directory to %s", argv[i + 1]);
-      memmove(argv + i, argv + i + 2, argc - i - 1);
+      memmove(argv + i, argv + i + 2, (argc - i - 1)*sizeof(char*));
       argc -= 2;
+      i -= 2;
     }
   }
 
@@ -226,7 +233,7 @@ int main(int argc, char *argv[])
 
   } else {
     for (i = 1; i < argc; i++) {
-      char *suitename = xbt_strdup(argv[i]);
+      suitename = xbt_strdup(argv[i]);
       if (!strcmp("./", suitename))
         memmove(suitename, suitename + 2, strlen(suitename + 2));
 
@@ -250,6 +257,5 @@ int main(int argc, char *argv[])
   }
 
   rctx_exit();
-  xbt_exit();
   return 0;
 }