=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/oxd.c,v retrieving revision 1.5 retrieving revision 1.9 diff -u -p -r1.5 -r1.9 --- OpenXM/src/kxx/oxd.c 2002/10/28 00:38:32 1.5 +++ OpenXM/src/kxx/oxd.c 2016/03/31 05:27:34 1.9 @@ -1,5 +1,5 @@ /* - $OpenXM: OpenXM/src/kxx/oxd.c,v 1.4 2002/10/27 10:39:33 takayama Exp $ + $OpenXM: OpenXM/src/kxx/oxd.c,v 1.8 2004/09/17 03:28:21 takayama Exp $ */ #include @@ -33,9 +33,6 @@ int Serial = 0; int LocalMode = 1; static int findOxServer(char *server); static void couldNotFind(char *s); -#if defined(__CYGWIN__) -int errno; -#endif #define NOBODY 65534 main(int argc, char *argv[]) { @@ -137,8 +134,10 @@ childServerMain(int fd) { extern int Serial; char *openxm; int resultCode; + int st; + /* Starting oxd session */ - signal(SIGALRM,exitServer); + mysignal(SIGALRM,exitServer); alarm(60); fp = fdopen(fd,"w+"); if (fp == NULL) oxdError("failed fdopen\n"); @@ -209,6 +208,10 @@ childServerMain(int fd) { GET_COMMAND /* expect */ fclose(fp); /* close the connection */ + fprintf(stderr,"Waiting the termination of the child process (ox server).\n"); + fflush(NULL); + wait(&st); + fprintf(stderr,"%d: The child process is terminated.\n",Serial); exit(0); } @@ -241,4 +244,5 @@ oxdError(char *s) { } +void *sGC_malloc(int n) { return (void *) GC_malloc(n); }