Changeset 3371 in Sophya

Timestamp:

Oct 31, 2007, 11:50:01 PM (18 years ago)

Author:

ansari

Message:

nouveaux flags de redirect stdout/err (-doublered), Reza 31/10/2007

File:

• trunk/SophyaPI/ProgPI/piapp.cc (modified) (10 diffs)

trunk/SophyaPI/ProgPI/piapp.cc

@@ -57 +57 @@
               [-tmpdir TmpDirectory] [-help2tex] [-exec file [args]] 
   -nored : Don't redirect stdout/stderr to piapp console
+  -doublered : Redirect stdout/stderr to piapp console AND the terminal
   -termread : Read commands on terminal (stdin)
   -term : equivalent to -nored -termread -small 
@@ -83 +84 @@
          << "              [-tmpdir TmpDirectory] [-help2tex] [-exec file [args]] \n"
          << "  -nored : Don't redirect stdout/stderr to piapp console\n"
+         << "  -doublered : Redirect stdout/stderr to piapp console AND the terminal \n"
          << "  -termread : Read commands on terminal (stdin)\n"
          << "  -term : equivalent to -nored -termread -small \n"
@@ -102 +104 @@
 {
 int ofa;
-bool fgfpe, fgsegv, fgred, fghidezsw, fgexec, fgsmall, fgtermrd;
+bool fgfpe, fgsegv, fghidezsw, fgexec, fgsmall, fgtermrd;
+RED_OUTERR_FLG fgred = CONSRED_OE;
 
 SkyTInitiator skyinit;
@@ -112 +115 @@
 
 ofa = 1;
-fgred = fgfpe = fgsegv = true;
+fgred = CONSRED_OE;
+fgfpe = fgsegv = true;
 fghidezsw = false;
 fgexec = false;
@@ -124 +128 @@
 int ka;
 for(ka=1; ka<narg; ka++) {
-  if (strcmp(arg[ka],"-nored") == 0)   fgred=false; 
+  if (strcmp(arg[ka],"-nored") == 0)   fgred=NORED_OE; 
+  else if (strcmp(arg[ka],"-doublered") == 0)   fgred=DOUBLERED_OE; 
   else if (strcmp(arg[ka],"-nosig") == 0)   fgfpe=fgsegv=false; 
   else if (strcmp(arg[ka],"-termread") == 0)   fgtermrd=true; 
   else if (strcmp(arg[ka],"-term") == 0)  
-    { fgred=false;  fgtermrd=true; fgsmall=true; }
+    { fgred=NORED_OE;  fgtermrd=true; fgsmall=true; }
   else if (strcmp(arg[ka],"-nosigfpe") == 0)   fgfpe=false; 
   else if (strcmp(arg[ka],"-nosigsegv") == 0)   fgsegv=false; 
   else if (strcmp(arg[ka],"-small") == 0)     fgsmall=true; 
   else if (strcmp(arg[ka],"-hidezswin") == 0)   fghidezsw=true; 
-  else if (strcmp(arg[ka],"-help2tex") == 0) { fgtexh=true; fgred=false; }
+  else if (strcmp(arg[ka],"-help2tex") == 0) { fgtexh=true; fgred=NORED_OE; }
   else if (strcmp(arg[ka],"-tmpdir") == 0) {
     if (ka == narg-1) return Usage(true);
@@ -198 +203 @@
 
 // Gestion de redirection stdout/err et Signaux
-if (fgred) app->RedirectStdOutErr(true);
-else app->RedirectStdOutErr(false);
+app->RedirectStdOutErr(fgred);
 app->CatchSignals(fgfpe, fgsegv);
 
@@ -238 +242 @@
   rc = 0;   cont = false;
   app->SetReady();
-  if (fgred) app->RedirectStdOutErr(true);
+  app->RedirectStdOutErr(fgred);
   try {
     app->Run();
@@ -244 +248 @@
   catch(PThrowable exc) {  // Catching SOPHYA exceptions 
     app->Stop();
-    app->RedirectStdOutErr(false);  
+    app->RedirectStdOutErr(NORED_OE);  
     //BUG ? fait planter OSF-cxx     fflush(stdout); 
     cout << endl;      cerr << endl;
@@ -268 +272 @@
   catch(...) { // Catching all other exceptions 
     app->Stop();
-    app->RedirectStdOutErr(false);  
+    app->RedirectStdOutErr(NORED_OE);  
     cout << endl;      cerr << endl;
     cout << "\n piapp/main() exception catched ! " << endl;
@@ -292 +296 @@
 cout << "\n ------------------------------------------------ \n"
      << " piapp: Cleaning up ... " << endl;
-
-app->RedirectStdOutErr(false);  
+app->RedirectStdOutErr(NORED_OE);  
+cout << "\n ------------------------------------------------ \n"
+     << " piapp: Exiting - Cleaning up ... " << endl;
+
 // -- ca fait planter sur linux -- Reza 04/2006 if (fgtermrd) cmdrdr.cancel();