===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxd.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM/src/kxx/oxd.c	2002/10/27 10:39:33	1.4
+++ OpenXM/src/kxx/oxd.c	2004/02/25 23:14:36	1.7
@@ -1,5 +1,5 @@
 /*
- $OpenXM: OpenXM/src/kxx/oxd.c,v 1.3 2002/10/20 23:49:12 takayama Exp $
+ $OpenXM: OpenXM/src/kxx/oxd.c,v 1.6 2002/10/28 08:57:28 takayama Exp $
 */
 
 #include <stdio.h>
@@ -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[]) {
@@ -136,6 +133,9 @@ childServerMain(int fd) {
   char ccc[SIZE*3];
   extern int Serial;
   char *openxm;
+  int resultCode;
+  int st;
+
   /* Starting oxd session */
   signal(SIGALRM,exitServer);
   alarm(60);
@@ -190,10 +190,29 @@ childServerMain(int fd) {
   openxm = getOpenXMpath();
   sprintf(ccc,"%s %s",openxm,body);
   fprintf(stderr,"Serial=%d : Executing command=%s\n",Serial,ccc);
+  /*  Old code.
   fprintf(fp,"<bye/>\n"); fflush(NULL);
-  fclose(fp); /* close the connection */
+  fclose(fp); 
   system(ccc);
   fprintf(stderr,"Serial=%d : The following command is finished : %s\n",Serial,ccc);
+   */
+  /* New code. It requires  ox with -finish option. */
+  resultCode = system(ccc);
+  fprintf(stderr,"Serial=%d : The following command is finished : %s, resultCode=%d\n",Serial,ccc,resultCode);
+  if (resultCode == 0) {
+	fprintf(fp,"<suceeded/>\n"); 
+  }else{
+	fprintf(fp,"<failed code=\"%d\"/>\n",resultCode); 
+  }
+
+  GET_COMMAND   /* expect <login/> */
+
+  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);
 }
 
 char *getOpenXMpath() {