===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxd.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- OpenXM/src/kxx/oxd.c	2002/10/20 13:13:35	1.1
+++ OpenXM/src/kxx/oxd.c	2002/10/28 08:57:28	1.6
@@ -1,5 +1,5 @@
 /*
- $OpenXM$
+ $OpenXM: OpenXM/src/kxx/oxd.c,v 1.5 2002/10/28 00:38:32 takayama Exp $
 */
 
 #include <stdio.h>
@@ -17,9 +17,13 @@
 #include "ox_kan.h"
 #include "serversm.h"
 
+/* #define DEBUG */
+
 char *getTag(char *s);
 char *getKeyValue(char *s,char *key);
 char *getBody(char *s);
+char *getOpenXMpath(void);
+void *xtagMalloc(int n);
 
 int MyServerPid;
 #define SERVERNAME_SIZE 4096
@@ -32,6 +36,7 @@ static void couldNotFind(char *s);
 #if defined(__CYGWIN__)
 int errno;
 #endif
+#define NOBODY 65534
 
 main(int argc, char *argv[]) {
   char sname[1024];
@@ -39,23 +44,18 @@ main(int argc, char *argv[]) {
   int fdControl = -1; int portControl = 8089;
   extern int OpenedSocket;
   extern int Serial;
-  int sleepingTime = 0;
   int result;
   int fd;
+  int uid;
 
   strcpy(sname,"localhost");
   i = 1;
   while (i<argc) {
-    if (strcmp(argv[i],"--control")==0) {
+    if (strcmp(argv[i],"--port")==0) {
       i++;
       if (i<argc) sscanf(argv[i],"%d",&portControl);
     }else if (strcmp(argv[i],"--insecure") == 0) {
       LocalMode = 0;
-    }else if (strcmp(argv[i],"--wait") == 0) {
-      i++;
-      if (i<argc) {
-        sscanf(argv[i],"%d",&sleepingTime);
-      }
     }else {
       fprintf(stderr,"Unknown option %s.\n",argv[i]);
       oxdUsage(); exit(10);
@@ -63,17 +63,19 @@ main(int argc, char *argv[]) {
     i++;
   }
 
-  if (sleepingTime) {
-    fprintf(stderr,"Waiting to connect for %d seconds...\n",sleepingTime);
-    sleep(sleepingTime);
-    fprintf(stderr,"\nTrying to connect\n");
+  uid = getuid();
+  if (uid == 0) {
+	/* If I'm a super user, then change uid to nobody. */
+	if (setuid(NOBODY) != 0) {
+	  oxdError("Failed to change uid to nobody (%d)\n",NOBODY);
+	}
+	fprintf(stderr,"uid is changed to nobody (%d).\n",NOBODY);
   }
-
   
   if (LocalMode) {
     if (portControl != -1) {
       fdControl = socketOpen(sname,portControl);
-	  if (fdControl < 0) oxdError("Could not open a socket.");
+	  if (fdControl < 0) oxdError("Could not open a socket. \n\nPerhaps, oxd is already running on your machine.\nTo start oxd on a different port xyz, start oxd by oxd --port xyz");
       portControl = OpenedSocket;
 	  while (1) {
 		/* fdControl : fd for the wait queue */
@@ -102,7 +104,7 @@ main(int argc, char *argv[]) {
 
 oxdUsage() {
   fprintf(stderr,"Usage: \n");
-  fprintf(stderr,"  oxd \n");
+  fprintf(stderr,"  oxd [--port xyz]\n");
   fprintf(stderr,"\n");
 }
 
@@ -132,6 +134,11 @@ childServerMain(int fd) {
   char fname[SIZE*2];
   char fnameBody[SIZE];
   char ccc[SIZE*3];
+  extern int Serial;
+  char *openxm;
+  int resultCode;
+  int st;
+
   /* Starting oxd session */
   signal(SIGALRM,exitServer);
   alarm(60);
@@ -183,14 +190,52 @@ childServerMain(int fd) {
 
   body = getBody(comm);
   if (strlen(body) > SIZE*2) exitServer2(fp,"too big body.");
-  sprintf(ccc,"/usr/local/bin/openxm %s",body);
-  fprintf(stderr,"Serial=%d : Executing command=%s\n",ccc);
+  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",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() {
+  char *s;
+  char *sss;
+  s = getenv("OpenXM_HOME");
+  if (s == NULL) {
+	s = getenv("OPENXM_HOME");
+  }
+  if (s == NULL) sss="/usr/local/bin/openxm";
+  else {
+	sss = (char *) xtagMalloc(strlen(s)+20);
+	sprintf(sss,"%s/bin/openxm",s);
+  }
+  if (access(sss,X_OK&R_OK) == 0) {
+  }else{
+	oxdError("The shell script openxm does not exists. It is usually generated under OpenXM/rc");
+  }
+  return sss;
+}
 
 /* These are dummy.  It is defined in stackmachine.c */
 unlockCtrlCForOx() { ; }