[openi18n-im:01158] iiimf Client Emacs (IIIMECF) improvement

/* iiimp.c
 * VERSION: 0.1
 * AUTHOR: [email protected]
 * DATE: 2005.01.10
 * 
 * This is almostly come from icanna.c on yc-el package.
 *
 * -Original copyright notice.
 * icanna.c
 * VERSION: 0.9.0
 * AUTHER: [email protected]
 * DATE: 2003.9.29
 * LICENCE: GPL
 */

/*
 * communicate unix domain iiim server
 * stdin -> iiim server -> stdout
 */
#include <sys/types.h>
#include <sys/socket.h>
#include <stdio.h>
#include <sys/un.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>

#define BFSZ (4096)	/* buffer size */
#define IIIM_PATH ("/var/run/iiim/.iiimp-unix/9010")	/* unix domain socket path */

/*
 * connect unix domain iiimp server
 */
int
connect_iiimp_server()
{
  int iiimp;
  struct sockaddr_un sun;

  /* create unix domain socket */
  if ((iiimp = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
    perror("socket");
    exit(1);
  }
  /* connect iiimp server */
  sun.sun_family = AF_UNIX;
  strcpy(sun.sun_path, IIIM_PATH);
  if (connect(iiimp, (struct sockaddr*)&sun, SUN_LEN(&sun)) < 0) {
    perror("connect");
    exit(1);
  }
  return iiimp;
}

/*
 * data transport
 * stdin -> iiim
 * iiim -> stdout
 */
int
transport(in, out)
int in, out;
{
  char* buf = NULL;	/* data buffer */
  int len = BFSZ;	/* data length */
  int count = -1;	/* read count */

  /* read input */
  while (len == BFSZ) {
    count++;
    /* allocate data buffer */
    if ((buf = (char*)realloc(buf, (count + 1) * BFSZ)) == NULL) {
      perror("realloc");
      exit(1);
    }
    /* read input to data buffer */
    if ((len = read(in, buf + count * BFSZ, BFSZ)) < 0) {
      perror("read");
      exit(1);
    }
  }
  len += count * BFSZ;
  /* write output */
  if (len > 0 && write(out, buf, len) < 0) {
    perror("write");
    exit(1);
  }
  /* destroy data buffer */
  free(buf);
  return len;
}

/*
 * communicate unix domain iiim server
 */
int
main()
{
  int iiimp;
  
  iiimp = connect_iiimp_server();	/* connect unix domain socket */

  /* transport request & response, until stdin or socket is eof */
  while (1)
    /* transport request from stdin to iiim server,
     * transport response from iiim server to stdout */
    if (transport(0, iiimp) == 0 || transport(iiimp, 1) == 0)
      /* when stdin or iiim server is eof, break loop */
      break;
  close(iiimp);	/* close unix domain iiim server */
  return 0;
}

diff -u IIIMECF-0.6/lisp/iiimp.el iiimecf-0.6-6/lisp/iiimp.el
--- IIIMECF-0.6/lisp/iiimp.el	2002-07-15 20:18:13.000000000 +0900
+++ iiimecf-0.6-6/lisp/iiimp.el	2005-01-12 23:41:38.000000000 +0900
@@ -68,6 +68,8 @@
 
 (defvar iiimp-text-warning-char ?!)
 
+(defvar iiimp-helper-path "iiimp")
+
 (defconst iiimp-basic-opcode-spec-list
   '((iiimp-im-no-protocol
      0 (nil . nil)
@@ -360,8 +362,9 @@
 ;;; network I/O
 
 (defsubst iiimp-check-channel-connection (com-id)
-  (eq (process-status (iiimp-com-id-process com-id)) 'open))
-
+  (or (eq (process-status (iiimp-com-id-process com-id)) 'open)
+      (eq (process-status (iiimp-com-id-process com-id)) 'run)))
+  
 (defun iiimp-proc-to-com-id (proc)
   (let ((oldbuf (current-buffer))
 	(nbuf (process-buffer proc)))
@@ -391,7 +394,10 @@
 	  (set-buffer-multibyte nil))
       (buffer-disable-undo buf)
       (setq proc
-	    (open-network-stream iiimp-process-name buf host port))
+	    (cond ((string= host "unix")
+		   (let ((process-connection-type nil))
+		     (start-process iiimp-process-name buf iiimp-helper-path)))
+		  (t (open-network-stream iiimp-process-name buf host port))))
       (process-kill-without-query proc)
       (set-process-coding-system proc 'binary 'binary)
       (set-process-sentinel
@@ -407,7 +413,8 @@
 (defun iiimp-destroy-network-channel (com-id)
   (let* ((proc (iiimp-com-id-process com-id))
 	 (stat (process-status proc)))
-    (while (not (or (eq stat 'closed)
+    (while (not (or (or (eq stat 'closed)
+			(eq stat 'exit))
 		    (eq stat nil)))
       (set-process-sentinel proc nil)
       (delete-process proc)