===================================================================
RCS file: /home/cvs/OpenXM/src/asir-port/cgi/webasir2.c,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM/src/asir-port/cgi/webasir2.c	2014/08/31 07:53:57	1.3
+++ OpenXM/src/asir-port/cgi/webasir2.c	2014/09/01 02:41:48	1.5
@@ -1,9 +1,12 @@
-/* $OpenXM: OpenXM/src/asir-port/cgi/webasir2.c,v 1.2 2014/08/30 22:47:20 takayama Exp $
+/* $OpenXM: OpenXM/src/asir-port/cgi/webasir2.c,v 1.4 2014/08/31 10:20:33 takayama Exp $
  */
 /*
-  (httpd-asir2.sm1) run   webasir2
+ -(httpd-asir2.sm1) run   webasir2
    >log 2>&1
-   Todo, timer(limit, command, message) implement in sm1.
+ - Todo, timer(limit, command, message) implement in sm1.
+ - Example.  webasir2 --asir 'oxMessageBody=1%2B3%3B'
+ - Example.  webasir2 --asir '3-2'
+ - Error handling is not completed. Run src/kan96xx/Doc/httpd-asir2-kill.sh by cron.
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,7 +19,10 @@
 #include <string.h>
 
 #define SIZE 0x10000
+#define MKEY "oxMessageBody="
 char *byteArrayToUrlEncoding(char *s,int size);
+static int cgiHex(int p);
+char *urlEncodedStringToString(char *s);
 
 int Debug=1;
 int SetTimer=0;
@@ -30,16 +36,16 @@ int main(int argc,char *argv[]) {
   int i,j,c;
   char key[SIZE];
   char comm[SIZE];
-  char *asircomm;
+  char asircomm[SIZE];
   int quit;
   char workf[SIZE];
   quit = 0;
-  asircomm="3-2;";
+  asircomm[0] = 0;
   for (i=1; i<argc; i++) {
     if (strcmp(argv[i],"--quit")==0) quit=1;
     else if (strcmp(argv[i],"--asir")==0) {
       i++;
-      if (i <argc) asircomm = argv[i];
+      if (i <argc) strcpy(asircomm,argv[i]);
       else { usage(); return(-1); }
     }else if (strcmp(argv[i],"--debug")==0) {
       i++;
@@ -50,7 +56,6 @@ int main(int argc,char *argv[]) {
       if (i <argc) sscanf(argv[i],"%d",&SetTimer);
       else { usage(); return(-1); }
     } else if (strcmp(argv[i],"--stdin")==0) {
-      asircomm = (char *) malloc(SIZE);
       asircomm[0] = 0; j=0;
       while ((c=getchar()) != EOF) {
 	asircomm[j] = c; j++; asircomm[j] = 0;
@@ -68,7 +73,7 @@ int main(int argc,char *argv[]) {
   system(comm);
   fp = fopen(workf,"r");
   if (fp == NULL) {
-    fprintf(stderr,"No webasir2 is running.\n"); return(-1);
+    fprintf(stderr,"Failed ls\n"); return(-1);
   }
   fgets(fname,SIZE-2,fp);
   for (i=strlen(fname)-1; i>=0; i--) {
@@ -76,12 +81,30 @@ int main(int argc,char *argv[]) {
   }
   fclose(fp);
   if (strlen(fname)==0) {
-    fprintf(stderr,"No webasir2 pid file.\n"); return(-1);
+    if (Debug) fprintf(stderr,"No webasir2 pid file.\n"); 
+    if (Debug) {fprintf(stderr,"No webasir2 is running. Start server.\n");}
+    startServer();
+    sleep(5);
+    system(comm);
+    fp = fopen(workf,"r");
+    if (fp == NULL) {
+      fprintf(stderr,"Failed to start the server.\n"); return(-1);
+    }
+    fgets(fname,SIZE-2,fp);
+    for (i=strlen(fname)-1; i>=0; i--) {
+      if (fname[i] <= ' ') fname[i]=0; else break;
+    }
+    if (strlen(fname) == 0) {
+      fprintf(stderr,"Failed to start the server. No webasir2 pid file.\n"); return(-1);
+    }
+    fclose(fp);
   }
+
   fp = fopen(fname,"r");
   if (fp == NULL) {
     fprintf(stderr,"Open error of %s\n",fname); return(-1);
   }
+  mylock(fname);
   fgets(key,SIZE-2,fp); sscanf(key,"%d",&dataPort);
   if (Debug) printf("dataPort=%d\n",dataPort);
   fgets(key,SIZE-2,fp);
@@ -112,6 +135,16 @@ int main(int argc,char *argv[]) {
     fprintf(stderr,"error: cannot connect\n");
   }else{  if (Debug) fprintf(stderr,"Connected\n"); }
 
+  if ((strlen(asircomm)==0) && (!quit)) {myunlock(fname); outputTop(); return(0); }
+
+  /* If the input is MKEY=..., extract ... */
+  if (strncmp(asircomm,MKEY,strlen(MKEY))==0) {
+    strcpy(comm,&(asircomm[strlen(MKEY)]));
+    strcpy(asircomm,comm);
+    strcpy(asircomm,urlEncodedStringToString(asircomm));
+    if (Debug) fprintf(stderr,"oxMessageBody, asircomm=%s\n",asircomm);
+  }
+
   if (SetTimer) {
     strcpy(comm,asircomm);
     for (i=strlen(comm)-1; i>=0; i--) {
@@ -134,7 +167,13 @@ int main(int argc,char *argv[]) {
   /* get result */
   for (i=0; i<SIZE; i++) comm[i]=0;
   read(dataPort,comm,SIZE-2);
-  printf("%s\n",comm);
+  /* remove newline(s) */
+  for (i=strlen(comm)-1; i>0; i--) {
+    if (comm[i] < ' ') comm[i] = 0;
+    else break;
+  }
+  myunlock(fname);
+  outputResult(comm);
 }
 
 /* from kan96xx/plugin/oxcgi.c */
@@ -177,6 +216,78 @@ char *byteArrayToUrlEncoding(char *s,int size) {
 }
 
 
+char *urlEncodedStringToString(char *s)
+{
+  char *ts;
+  char *ts2;
+  int i,j;
+  int p;
+  int vstart, vend;
+  if (s == NULL) return(NULL);
+  vstart = 0; vend = strlen(s)-1;
+  ts = (char *) malloc(strlen(s)+2);
+  if (ts == NULL)  ;
+  j = 0; ts[j] = 0;
+  for (i=vstart; i<=vend; i++,j++) {
+    ts[j] = 0;
+    if (s[i] == '+') {
+      ts[j] = ' '; ts[j+1] = 0;
+    }else if (s[i] == '%') {
+      p = cgiHex(s[i+1])*16+cgiHex(s[i+2]);
+      i = i+2;
+      ts[j] = p; ts[j+1] = 0;
+    }else {
+      ts[j] = s[i]; ts[j+1] = 0;
+    }
+  }
+  ts2 = (char *) malloc(j);
+  if (ts2 == NULL) ;
+  for (i=0; i<j; i++) {
+    ts2[i] = ts[i];  ts2[i+1] = 0;
+  }
+  return (ts2);
+}
+
+static int cgiHex(int p) {
+  if (p >= '0' && p <= '9') return (p-'0');
+  if (p >= 'A' && p <= 'F') return (p-'A'+10);
+  if (p >= 'a' && p <= 'f') return (p-'a'+10);
+  if (Debug) fprintf(stderr,"%s\n","Invalid argument to cgiHex.");
+}
+
+outputTop() {
+  printf("Content-Type: text/html\n\n");
+  printf("<html><body>\nInput <br> asir-command <br> without semicolon. <br><br>\n");
+  printf("<form method=\"POST\"> <input type=submit>\n");
+  printf("<textarea name=\"oxMessageBody\" rows=10 cols=\"80\" wrap=\"soft\">\n");
+  printf("</textarea>\n</form>\n");
+  printf("</body></html>\n");
+}
+outputResult(char *s) {
+  printf("Content-Type: text/plain\n\n");
+  printf("%s\n",s);
+}
+startServer() {
+  char comm[SIZE];
+  char *r;
+  r = getenv("CGI_ASIR_ALLOW");
+  if (r == NULL) {
+    setenv("CGI_ASIR_ALLOW","[(quit) (fctr)]",1);
+  }
+  sprintf(comm,"%s/src/kan96xx/Doc/httpd-asir2.sh >/dev/null 2>&1 &",getenv("OpenXM_HOME"));
+  /* sprintf(comm,"echo $CGI_ASIR_ALLOW\n");  security check. */
+  system(comm);
+}
+mylock(char *fname) {
+  char comm[SIZE];
+  sprintf(comm,"mv %s /tmp/lock-webasir-%d.txt",fname,getpid());
+  system(comm);
+}
+myunlock(char *fname) {
+  char comm[SIZE];
+  sprintf(comm,"mv /tmp/lock-webasir-%d.txt %s",getpid(),fname);
+  system(comm);
+}
 usage() {
   fprintf(stderr,"webasir2 [--quit] [--asir command_string]\n");
   fprintf(stderr,"         [--debug level]\n");