From 07c0cc5dfad8847aebadc1a52e5b42cd08b59058 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sat, 7 Aug 2004 05:50:01 +0000
Subject: [PATCH 1/1] Fix a fuckin bug preventing to pass --gras-log argument
 to nodes in simulation mode; allow to pass several arguments that way

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@351 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/gras_stub_generator | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/examples/gras_stub_generator b/examples/gras_stub_generator
index d908888d47..9fd9bd6557 100755
--- a/examples/gras_stub_generator
+++ b/examples/gras_stub_generator
@@ -62,15 +62,16 @@ foreach (keys %process) {
     print OUT<<EOF
 int launch_$_(int argc, char **argv) {
   char **myargv=argv;
+  int myargc=argc;
   int i;
     
   if (gras_log) {
     myargv=malloc((argc+1) * sizeof(char**));
     for (i=0; i<argc; i++)
       myargv[i] = argv[i];
-    myargv[argc++] = gras_log;
+    myargv[myargc++] = gras_log;
   }
-  $_(argc,argv);
+  $_(myargc,myargv);
   if (myargv != argv)
     free(myargv);
   return 0;
@@ -85,10 +86,17 @@ print OUT <<EOF
 int main (int argc,char *argv[]) {
   int i,j;
 
-  /** Save the gras-log argument */
+  /* Save the gras-log argument of real command line to pass it to all processes */
   for (i=1; i<argc; i++) {
     if (!strncmp(argv[i],"--gras-log=",strlen("--gras-log="))) {
-      gras_log = argv[i];
+      if (gras_log) {
+	 char *tmp=malloc(strlen(gras_log)+strlen(argv[i])+2);
+	 sprintf(tmp,"%s %s",gras_log, argv[i]);
+	 free(gras_log);
+	 gras_log=tmp;
+      } else {
+         gras_log = strdup(argv[i]);
+      }
       for (j=i+1; j<argc; j++) {
 	argv[j-1] = argv[j];
       } 
@@ -122,6 +130,8 @@ print OUT <<EOF
   /*  Run the simulation */
   MSG_main();
 
+  if (gras_log)
+    free(gras_log);
   return 0;
 }
 $warn
-- 
2.20.1