[BACK]Return to ox_pathfinder.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / util

Diff for /OpenXM/src/util/ox_pathfinder.c between version 1.29 and 1.30

version 1.29, 2006/01/10 11:52:56 version 1.30, 2006/01/26 08:36:50
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.28 2004/10/14 10:08:09 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 */  /* Moved from misc-2003/07/cygwin/test.c */
   
 #include <stdio.h>  #include <stdio.h>
Line 38  static int Verbose_get_home = 0;
Line 38  static int Verbose_get_home = 0;
 static int Verbose = 1;  static int Verbose = 1;
 static int NoX = 0;  static int NoX = 0;
 static int ErrorVerbose = 1;  static int ErrorVerbose = 1;
   static int EngineLogToStdout = 0;
   
 #define nomemory(a) {fprintf(stderr,"(%d) no more memory.\n",a);exit(10);}  #define nomemory(a) {fprintf(stderr,"(%d) no more memory.\n",a);exit(10);}
 #define mymalloc(a)  sGC_malloc(a)  #define mymalloc(a)  sGC_malloc(a)
Line 170  int oxForkExec(char **argv) {
Line 171  int oxForkExec(char **argv) {
        sigaddset(&sss,SIGINT);         sigaddset(&sss,SIGINT);
        sigprocmask(SIG_BLOCK,&sss,NULL);         sigprocmask(SIG_BLOCK,&sss,NULL);
     }      }
     if (NoX) {      if (NoX && (!EngineLogToStdout)) {
       FILE *null;        FILE *null;
       null = fopen("/dev/null","wb");        null = fopen("/dev/null","wb");
       if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);        if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
Line 215  int oxForkExecBlocked(char **argv) {
Line 216  int oxForkExecBlocked(char **argv) {
        sigaddset(&sss,SIGINT);         sigaddset(&sss,SIGINT);
        sigprocmask(SIG_BLOCK,&sss,NULL);         sigprocmask(SIG_BLOCK,&sss,NULL);
     }      }
     if (NoX) {      if (NoX && (!EngineLogToStdout)) {
       FILE *null;        FILE *null;
       null = fopen("/dev/null","wb");        null = fopen("/dev/null","wb");
       if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);        if (OX_P_stdout >= 0) dup2(OX_P_stdout,1); else dup2(fileno(null),1);
Line 1204  int oxpSendStringAsFile(char *user,char *hostname, cha
Line 1205  int oxpSendStringAsFile(char *user,char *hostname, cha
   
 char *oxpReadOneTimePasswordFromFile(char *filename) {  char *oxpReadOneTimePasswordFromFile(char *filename) {
 }  }
   
   int ox_pathfinderEngineLogToStdout(int state) {
     EngineLogToStdout = state;
   }

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>