=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.44 retrieving revision 1.47 diff -u -p -r1.44 -r1.47 --- OpenXM/src/kan96xx/Kan/ext.c 2013/09/22 01:26:07 1.44 +++ OpenXM/src/kan96xx/Kan/ext.c 2016/03/31 03:22:54 1.47 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.43 2012/12/23 01:27:54 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.46 2013/09/25 00:05:55 takayama Exp $ */ #include #include #include @@ -20,6 +20,7 @@ #include #include #include "ox_pathfinder.h" +#include "../plugin/mysig.h" extern int Quiet; extern char **environ; @@ -33,7 +34,7 @@ static void mywait() { int status; int pid; int i,j; - /* signal(SIGCHLD,SIG_IGN); */ + /* mysignal(SIGCHLD,SIG_IGN); */ pid = wait(&status); if ((!Quiet) && (Verbose_mywait)) fprintf(stderr,"Child process %d is exiting.\n",pid); for (i=0; i 0) Mycp--; } } - signal(SIGCHLD,mywait); + mysignal(SIGCHLD,mywait); } #define SIZE_OF_ENVSTACK 5 @@ -109,6 +110,7 @@ struct object Kextension(struct object obj) char *abc; char *abc2; extern struct context *CurrentContextp; + struct timeval tm; #if (__CYGWIN__) extern sigjmp_buf EnvOfStackMachine; #else @@ -142,10 +144,10 @@ struct object Kextension(struct object obj) pushEnv(EnvOfStackMachine); m = KSexecuteString(obj1.lc.str); /* This is critical area. If you catch ctrl-c here, program crashes. */ - oldsig = signal(SIGINT,SIG_IGN); + oldsig = mysignal(SIGINT,SIG_IGN); popEnv(EnvOfStackMachine); /* OK! We passed the critical area. */ - signal(SIGINT,oldsig); + mysignal(SIGINT,oldsig); rob = KpoInteger(m); }else if (strcmp(key,"getpid") == 0) { rob = KpoInteger( (int) getpid() ); @@ -181,9 +183,8 @@ struct object Kextension(struct object obj) } */ }else if (strcmp(key,"date")==0) { if (size != 1) errorKan1("%s\n","[(date)] extension."); - struct timeval tm; gettimeofday(&tm,NULL); - rob = KpoString(ctime(&((time_t)tm.tv_sec))); + rob = KpoString(ctime((time_t *)&(tm.tv_sec))); }else if (strcmp(key,"defaultPolyRing")==0) { if (size != 2) errorKan1("%s\n","[(defaultPolyRing) n] extension."); rob = KdefaultPolyRing(getoa(obj,1)); @@ -255,7 +256,7 @@ struct object Kextension(struct object obj) if (m&2) { /* Do not call singal to turn around a trouble on cygwin. BUG. */ }else{ - signal(SIGCHLD,mywait); /* to kill Zombie */ + mysignal(SIGCHLD,mywait); /* to kill Zombie */ } Mychildren[Mycp++] = pid; if (Mycp >= MYCP_SIZE-1) {