=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.44 retrieving revision 1.50 diff -u -p -r1.44 -r1.50 --- OpenXM/src/kan96xx/Kan/ext.c 2013/09/22 01:26:07 1.44 +++ OpenXM/src/kan96xx/Kan/ext.c 2020/10/06 11:33:46 1.50 @@ -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.49 2018/09/07 00:09:32 takayama Exp $ */ #include #include #include @@ -20,7 +20,10 @@ #include #include #include "ox_pathfinder.h" +#include "mysig.h" +void cmoDumpCmo(struct object ob); /* defined in ../plugin/cmo0.h */ + extern int Quiet; extern char **environ; extern char *MsgSourceTrace; @@ -33,7 +36,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 +112,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 @@ -122,7 +126,7 @@ struct object Kextension(struct object obj) char **argv; FILE *fp; void (*oldsig)(); - extern SecureMode; + extern int SecureMode; extern char *UD_str; extern int UD_attr; @@ -142,10 +146,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 +185,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 +258,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) { @@ -523,6 +526,11 @@ struct object Kextension(struct object obj) obj1 = getoa(obj,1); if (obj1.tag != Sdollar) errorKan1("%s\n","unlink, the first argument should be a string (filename)."); rob = KpoInteger(oxDeleteFile(KopString(obj1))); + }else if (strcmp(key,"quiet")==0) { + obj1 = getoa(obj,1); + if (obj1.tag != Sinteger) errorKan1("%s\n","quiet, the first argument should be an integer."); + Quiet = KopInteger(obj1); + rob = obj1; } #include "plugin.hh" #include "Kclass/tree.hh"