[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 884b63695569c4c85c670b400a1695989ea1c9a9
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Thu May 26 11:15:56 2005 +1000

    Fix for GfsEventScript unused handling of error output
    
    darcs-hash:20050526011556-fbd8f-2c2bc8d5340d17613cfa730afe674616c5d3f66a.gz

diff --git a/src/event.c b/src/event.c
index 96de549..51f1439 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1443,19 +1443,18 @@ static gboolean gfs_event_script_event (GfsEvent * event, GfsSimulation * sim)
     if (s->script) {
       gchar * scommand;
       gchar sname[] = "/tmp/gfsXXXXXX";
-      gchar ename[] = "/tmp/gfsXXXXXX";
       gint sf = mkstemp (sname);
-      gint ef = mkstemp (ename);
       gint status;
       FILE * f;
 
-      if (sf < 0 || ef < 0) {
+      if (sf < 0) {
 	g_warning ("GfsEventScript cannot create temporary files");
 	return TRUE;
       }
       f = fdopen (sf, "w");
       fputs (s->script->str, f);
       fclose (f);
+      close (sf);
       scommand = g_strdup_printf ("GfsTime=%g GfsIter=%d GfsPid=%d "
 				  "GFS_STOP=%d sh %s",
 				  sim->time.t, sim->time.i, 
@@ -1471,16 +1470,6 @@ static gboolean gfs_event_script_event (GfsEvent * event, GfsSimulation * sim)
       remove (sname);
       if (status == GFS_EVENT_SCRIPT_STOP)
 	sim->time.end = sim->time.t;
-      else if (status == -1 || status != 0) {
-	FILE * ferr = fdopen (ef, "r");
-	gint c;
-
-	fputs ("Error while executing GfsEventScript:\n", stderr);
-	while ((c = fgetc (ferr)) != EOF)
-	  fputc (c, stderr);
-	fclose (ferr);
-      }
-      remove (ename);
     }
     return TRUE;
   }

-- 
Gerris Flow Solver