===================================================================
RCS file: /home/cvs/OpenXM/src/util/ox_pathfinder.c,v
retrieving revision 1.27
retrieving revision 1.30
diff -u -p -r1.27 -r1.30
--- OpenXM/src/util/ox_pathfinder.c	2004/08/12 12:11:41	1.27
+++ OpenXM/src/util/ox_pathfinder.c	2006/01/26 08:36:50	1.30
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.26 2004/03/05 06:26:52 takayama Exp $ */
+/* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.29 2006/01/10 11:52:56 takayama Exp $ */
 /* Moved from misc-2003/07/cygwin/test.c */
 
 #include <stdio.h>
@@ -37,15 +37,25 @@ static void msgPathFinder(char *s);
 static int Verbose_get_home = 0;
 static int Verbose = 1;
 static int NoX = 0;
+static int ErrorVerbose = 1;
+static int EngineLogToStdout = 0;
 
-
 #define nomemory(a) {fprintf(stderr,"(%d) no more memory.\n",a);exit(10);}
 #define mymalloc(a)  sGC_malloc(a)
 
+void pathFinderErrorVerbose(int k) {
+  static int prev;
+  if (k >= 0) {
+	prev = ErrorVerbose;
+	ErrorVerbose = k;
+  }else{
+	ErrorVerbose = prev;
+  }
+}
 static void errorPathFinder(char *s) {
   /* Todo; we need to return the error message to the client if it is used
      in ox_shell */
-  fprintf(stderr,"Error: %s",s);
+  if (ErrorVerbose) fprintf(stderr,"Error: %s",s);
 }
 static void msgPathFinder(char *s) {
   /* Todo; we need to return the error message to the client if it is used
@@ -161,7 +171,7 @@ int oxForkExec(char **argv) {
        sigaddset(&sss,SIGINT);
        sigprocmask(SIG_BLOCK,&sss,NULL);
     }
-    if (NoX) {
+    if (NoX && (!EngineLogToStdout)) {
       FILE *null;
       null = fopen("/dev/null","wb");
       if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
@@ -206,7 +216,7 @@ int oxForkExecBlocked(char **argv) {
        sigaddset(&sss,SIGINT);
        sigprocmask(SIG_BLOCK,&sss,NULL);
     }
-    if (NoX) {
+    if (NoX && (!EngineLogToStdout)) {
       FILE *null;
       null = fopen("/dev/null","wb");
       if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
@@ -1011,7 +1021,7 @@ char *getCommandPath(char *cmdname)
     if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */
     }else{
       msg = (char *)mymalloc(strlen(cmdname)+30);
-      sprintf(msg,"getCommandPath: %s is not found.");
+      sprintf(msg,"getCommandPath: %s is not found.",cmdname);
       errorPathFinder(msg);
       return NULL;
     }
@@ -1195,3 +1205,7 @@ int oxpSendStringAsFile(char *user,char *hostname, cha
 
 char *oxpReadOneTimePasswordFromFile(char *filename) {
 }
+
+int ox_pathfinderEngineLogToStdout(int state) {
+  EngineLogToStdout = state;
+}