[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.32 and 1.34

version 1.32, 2015/08/03 20:56:50 version 1.34, 2015/09/25 01:47:09
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.31 2010/08/30 04:17:17 takayama Exp $ */  /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.33 2015/08/06 22:33:21 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 7 
Line 7 
 #include <fcntl.h>  #include <fcntl.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <unistd.h>  #include <unistd.h>
   #if  (!defined(__MINGW32__) &&  !defined(__MINGW64__))
 #include <sys/wait.h>  #include <sys/wait.h>
   #else
   #include <_mingw.h>
   #endif
 #include <signal.h>  #include <signal.h>
 #include <ctype.h>  #include <ctype.h>
 #include <time.h>  #include <time.h>
Line 124  void *sGC_malloc(int s) { return (void *) malloc(s); }
Line 128  void *sGC_malloc(int s) { return (void *) malloc(s); }
 #define MYFORKCP_SIZE 100  #define MYFORKCP_SIZE 100
 static int Myforkchildren[MYFORKCP_SIZE];  static int Myforkchildren[MYFORKCP_SIZE];
 static int Myforkcp=0;  static int Myforkcp=0;
   #if  (!defined(__MINGW32__)  && !defined(__MINGW64__))
 static void myforkwait() {  static void myforkwait() {
   int status;    int status;
   int pid;    int pid;
Line 234  int oxForkExecBlocked(char **argv) {
Line 239  int oxForkExecBlocked(char **argv) {
     exit(3);      exit(3);
   }    }
 }  }
   #else
   static void myforkwait() {
     fprintf(stderr,"ERROR: myforkwait is not implented in mingw\n");
     return;
   }
   int oxForkExec(char **argv) {
     /* cf. Kan/shell.c */
     fprintf(stderr,"ERROR: oxForkExec is not implented in mingw\n");
     return(-1);
   }
   int oxForkExecBlocked(char **argv) {
     fprintf(stderr,"ERROR: oxForkExecBlocked is not implented in mingw\n");
     return(-1);
   }
   #endif
   
 static int getOStypei() {  static int getOStypei() {
   /*    /*
Line 574  char *cygwinPathToWinPath(char *s) {
Line 594  char *cygwinPathToWinPath(char *s) {
   }    }
   
   if (ans[0] == '/') {    if (ans[0] == '/') {
 #if defined(__CYGWIN64__)  #if defined(__CYGWIN64__) || (defined(__CYGWIN__) && defined(__x86_64__))
     strcpy(ans,"C:\\cygwin64");      strcpy(ans,"C:\\cygwin64");
 #else  #else
     strcpy(ans,"C:\\cygwin");      strcpy(ans,"C:\\cygwin");
Line 1139  int oxDeleteFile(char *fname) {
Line 1159  int oxDeleteFile(char *fname) {
 /* This function just kills processes, so if there is a process which  /* This function just kills processes, so if there is a process which
    uses ox protocol, it is not relevant to use this functions.     uses ox protocol, it is not relevant to use this functions.
 */  */
   #if  (!defined(__MINGW32__) &&  !defined(__MINGW64__))
 int oxKillAll(void) {  int oxKillAll(void) {
   int i;    int i;
   int pid;    int pid;
Line 1153  int oxKillAll(void) {
Line 1174  int oxKillAll(void) {
   Myforkcp = 0;    Myforkcp = 0;
   return(0);    return(0);
 }  }
   #else
   int oxKillAll(void) {
     fprintf(stderr,"ERROR: oxKillAll is not implented in mingw\n");
     return(-1);
   }
   #endif
 void ox_pathfinder_quiet(void) {  void ox_pathfinder_quiet(void) {
   Verbose_get_home = 0;    Verbose_get_home = 0;
   Verbose = 0;    Verbose = 0;

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.34

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