[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.27 and 1.32

version 1.27, 2004/08/12 12:11:41 version 1.32, 2015/08/03 20:56:50
Line 1 
Line 1 
 /* $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.31 2010/08/30 04:17:17 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 14 
Line 14 
 #include <string.h>  #include <string.h>
 #include "ox_pathfinder.h"  #include "ox_pathfinder.h"
   
   void *sGC_malloc(int);
   
 int OX_P_stdin = -1;  int OX_P_stdin = -1;
 int OX_P_stdout = -1;  int OX_P_stdout = -1;
 int OX_P_stderr = -1;  int OX_P_stderr = -1;
Line 37  static void msgPathFinder(char *s);
Line 39  static void msgPathFinder(char *s);
 static int Verbose_get_home = 0;  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 EngineLogToStdout = 0;
   
   #define nomemory(a) {fprintf(stderr,"(%p) no more memory.\n",(void *)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)
   
   void pathFinderErrorVerbose(int k) {
     static int prev;
     if (k >= 0) {
           prev = ErrorVerbose;
           ErrorVerbose = k;
     }else{
           ErrorVerbose = prev;
     }
   }
 static void errorPathFinder(char *s) {  static void errorPathFinder(char *s) {
   /* Todo; we need to return the error message to the client if it is used    /* Todo; we need to return the error message to the client if it is used
      in ox_shell */       in ox_shell */
   fprintf(stderr,"Error: %s",s);    if (ErrorVerbose) fprintf(stderr,"Error: %s",s);
 }  }
 static void msgPathFinder(char *s) {  static void msgPathFinder(char *s) {
   /* Todo; we need to return the error message to the client if it is used    /* Todo; we need to return the error message to the client if it is used
Line 161  int oxForkExec(char **argv) {
Line 173  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 206  int oxForkExecBlocked(char **argv) {
Line 218  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 562  char *cygwinPathToWinPath(char *s) {
Line 574  char *cygwinPathToWinPath(char *s) {
   }    }
   
   if (ans[0] == '/') {    if (ans[0] == '/') {
   #if defined(__CYGWIN64__)
       strcpy(ans,"C:\\cygwin64");
   #else
     strcpy(ans,"C:\\cygwin");      strcpy(ans,"C:\\cygwin");
   #endif
     strcat(ans,s);      strcat(ans,s);
   }    }
   
Line 1011  char *getCommandPath(char *cmdname)
Line 1027  char *getCommandPath(char *cmdname)
     if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */      if (getFileSize(cmdname) >= 0) { /* Todo: isExecutableFile() */
     }else{      }else{
       msg = (char *)mymalloc(strlen(cmdname)+30);        msg = (char *)mymalloc(strlen(cmdname)+30);
       sprintf(msg,"getCommandPath: %s is not found.");        sprintf(msg,"getCommandPath: %s is not found.",cmdname);
       errorPathFinder(msg);        errorPathFinder(msg);
       return NULL;        return NULL;
     }      }
Line 1195  int oxpSendStringAsFile(char *user,char *hostname, cha
Line 1211  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.27  
changed lines
  Added in v.1.32
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>