===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf_win_mini.c,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM_contrib2/asir2000/io/tcpf_win_mini.c	2006/09/29 09:02:49	1.3
+++ OpenXM_contrib2/asir2000/io/tcpf_win_mini.c	2018/03/29 01:32:54	1.5
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/tcpf_win_mini.c,v 1.2 2006/09/26 05:50:31 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/io/tcpf_win_mini.c,v 1.4 2013/08/20 14:22:33 ohara Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -20,179 +20,179 @@ static char rootdir[BUFSIZ];
 
 int win_ox_launch()
 {
-	int cs,ss,cn,sn;
-	char control_port_str[BUFSIZ];
-	char server_port_str[BUFSIZ];
-	static int launched=0;
+  int cs,ss,cn,sn;
+  char control_port_str[BUFSIZ];
+  char server_port_str[BUFSIZ];
+  static int launched=0;
 
-	if ( launched ) return 0;
+  if ( launched ) return 0;
 
-	control_port_str[0] = 0;
-	server_port_str[0] = 0;
-	do { 
-		generate_port(0,control_port_str);
-		generate_port(0,server_port_str);
-		cs = try_bind_listen(0,control_port_str);
-		if ( cs < 0 ) continue;
-		ss = try_bind_listen(0,server_port_str);
-		if ( ss < 0 ) continue;
-		win_spawn_server(control_port_str,server_port_str);
-		cs = try_accept(0,cs);
-		if ( cs < 0 ) continue;
-		ss = try_accept(0,ss);
-		if ( ss < 0 ) continue;
-	} while ( cs < 0 || ss < 0 );
+  control_port_str[0] = 0;
+  server_port_str[0] = 0;
+  do { 
+    generate_port(0,control_port_str);
+    generate_port(0,server_port_str);
+    cs = try_bind_listen(0,control_port_str);
+    if ( cs < 0 ) continue;
+    ss = try_bind_listen(0,server_port_str);
+    if ( ss < 0 ) continue;
+    win_spawn_server(control_port_str,server_port_str);
+    cs = try_accept(0,cs);
+    if ( cs < 0 ) continue;
+    ss = try_accept(0,ss);
+    if ( ss < 0 ) continue;
+  } while ( cs < 0 || ss < 0 );
 
-	/* client mode */
-	cn = get_iofp(cs,control_port_str,0);
-	sn = get_iofp(ss,server_port_str,0);
-	/* get_iofp returns -1 if the laucher could not spawn the server */
-	if ( sn < 0 ) {
-		/* we should terminate the launcher */
-		ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn);
-		return -1;
-	}
+  /* client mode */
+  cn = get_iofp(cs,control_port_str,0);
+  sn = get_iofp(ss,server_port_str,0);
+  /* get_iofp returns -1 if the laucher could not spawn the server */
+  if ( sn < 0 ) {
+    /* we should terminate the launcher */
+    ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn);
+    return -1;
+  }
 
-	/* register server to the server list */
-	control_port = cn;
-	server_port = sn;
-	launched = 1;
-	return 0;
+  /* register server to the server list */
+  control_port = cn;
+  server_port = sn;
+  launched = 1;
+  return 0;
 }
 
-void win_get_rootdir();
-
 void win_spawn_server(char *control_port_str,char *server_port_str)
 {
-	char AsirExe[BUFSIZ];
-	char AsirExePath[BUFSIZ];
-	char *av[BUFSIZ];
+  char AsirExe[BUFSIZ];
+  char AsirExePath[BUFSIZ];
+  char *av[BUFSIZ];
 
-//	strcpy(rootdir,"c:\\program files\\asir");
-//	sprintf(AsirExe,"%s\\bin\\engine.exe",rootdir);
-	sprintf(AsirExe,"c:\\Program Files\\asir\\bin\\engine.exe",rootdir);
-	sprintf(AsirExePath,"\"%s\"",AsirExe);
-	av[0] = "ox_launch";
-	av[1] = "127.0.0.1";
-	av[2] = "0";
-	av[3] = control_port_str;
-	av[4] = server_port_str;
-	av[5] = "ox_asir_wfep";
-	av[6] = "1";
-	av[7] = AsirExePath;
-	av[8] = 0;
+//  strcpy(rootdir,"c:\\program files\\asir");
+//  sprintf(AsirExe,"%s\\bin\\engine.exe",rootdir);
+  sprintf(AsirExe,"c:\\Program Files\\asir\\bin\\engine.exe",rootdir);
+  sprintf(AsirExePath,"\"%s\"",AsirExe);
+  av[0] = "ox_launch";
+  av[1] = "127.0.0.1";
+  av[2] = "0";
+  av[3] = control_port_str;
+  av[4] = server_port_str;
+  av[5] = "ox_asir_wfep";
+  av[6] = "1";
+  av[7] = AsirExePath;
+  av[8] = 0;
 
-	_spawnv(_P_NOWAIT,AsirExe,av);
+  _spawnv(_P_NOWAIT,AsirExe,av);
 }
 
 void win_get_rootdir()
 {
-	char *slash;
+  char *slash;
 
-	GetCurrentDirectory(BUFSIZ,rootdir);
-	slash = strrchr(rootdir,'\\');
-	if ( slash ) *slash = 0;
+  GetModuleFileName(NULL,rootdir,BUFSIZ);
+  slash = strrchr(rootdir,'\\');
+  *slash = 0;
+  slash = strrchr(rootdir,'\\');
+  if ( slash ) *slash = 0;
 }
 
 // ret=1 : data, ret=0 : void, ret=-1 : terminate
 
 int win_pop_string(Obj *obj)
 {
-	int id,serial;
+  int id,serial;
 
-	serial = ox_recv(server_port,&id,obj);
-	if ( serial < 0 ) return -1;
+  serial = ox_recv(server_port,&id,obj);
+  if ( serial < 0 ) return -1;
 
-	if ( id == OX_DATA )
-		return 1;
-	else {
-		if ( id == OX_SYNC_BALL ) {
-			ox_send_sync(server_port);
-			ox_flush_stream_force(server_port);
-		}
-		*obj = 0;
-		return 0;
-	}
+  if ( id == OX_DATA )
+    return 1;
+  else {
+    if ( id == OX_SYNC_BALL ) {
+      ox_send_sync(server_port);
+      ox_flush_stream_force(server_port);
+    }
+    *obj = 0;
+    return 0;
+  }
 }
 
 /* ret=1 => data, ret=0 => void, ret=-1 => terminated */
 
 int win_pop_one(Obj *obj)
 {
-	int id,serial;
+  int id,serial;
 
-	serial = ox_recv(server_port,&id,obj);
-	if ( serial < 0 ) return -1;
+  serial = ox_recv(server_port,&id,obj);
+  if ( serial < 0 ) return -1;
 
-	if ( id == OX_DATA ) {
-		return 1;
-	} else if ( id == OX_SYNC_BALL ) {
-		ox_send_sync(server_port);
-		ox_flush_stream_force(server_port);
-		return 0;
-	} else return 0;
+  if ( id == OX_DATA ) {
+    return 1;
+  } else if ( id == OX_SYNC_BALL ) {
+    ox_send_sync(server_port);
+    ox_flush_stream_force(server_port);
+    return 0;
+  } else return 0;
 }
 
 void win_execute_string(char *cmd)
 {
-	struct oSTRING str;
+  struct oSTRING str;
 
-	OID(&str) = O_STR;
-	BDY(&str) = cmd;
-	ox_send_data(server_port,&str);
-	ox_send_cmd(server_port,SM_executeStringByLocalParser);
-	ox_send_cmd(server_port,SM_popString);
-	ox_flush_stream_force(server_port);
+  OID(&str) = O_STR;
+  BDY(&str) = cmd;
+  ox_send_data(server_port,&str);
+  ox_send_cmd(server_port,SM_executeStringByLocalParser);
+  ox_send_cmd(server_port,SM_popString);
+  ox_flush_stream_force(server_port);
 }
 
 void ox_reset()
 {
-	USINT t;
-	int id;
-	Obj obj;
+  USINT t;
+  int id;
+  Obj obj;
 
-	ox_send_cmd(control_port,SM_control_reset_connection);
-	ox_flush_stream_force(control_port);
-	ox_recv(control_port,&id,&obj); t = (USINT)obj;
-	Sleep(100);
-	ox_send_cmd(server_port,SM_nop);
-	ox_flush_stream_force(server_port);
+  ox_send_cmd(control_port,SM_control_reset_connection);
+  ox_flush_stream_force(control_port);
+  ox_recv(control_port,&id,&obj); t = (USINT)obj;
+  Sleep(100);
+  ox_send_cmd(server_port,SM_nop);
+  ox_flush_stream_force(server_port);
 }
 
 void ox_shutdown()
 {
-	terminate = 1;
-	ox_send_cmd(server_port,SM_shutdown);
-	Sleep(100);
-	ox_send_cmd(control_port,SM_shutdown);
+  terminate = 1;
+  ox_send_cmd(server_port,SM_shutdown);
+  Sleep(100);
+  ox_send_cmd(control_port,SM_shutdown);
 }
 
 void free_obj(Obj obj)
 {
-	NODE n,n1;
+  NODE n,n1;
 
-	if ( !obj ) return;
-	switch ( OID(obj) ) {
-		case O_USINT:
-			break;
-		case O_STR:
-			free(BDY((STRING)obj));
-			break;
-		case O_LIST:
-			n = BDY((LIST)obj);
-			while ( n ) {
-				free_obj(BDY(n));
-				n1 = NEXT(n);
-				free(n);
-				n = n1;
-			}
-			break;
-		case O_ERR:
-			free_obj(BDY((LIST)obj));
-			break;
-		default:
-			break;
-	}
-	free(obj);
+  if ( !obj ) return;
+  switch ( OID(obj) ) {
+    case O_USINT:
+      break;
+    case O_STR:
+      free(BDY((STRING)obj));
+      break;
+    case O_LIST:
+      n = BDY((LIST)obj);
+      while ( n ) {
+        free_obj(BDY(n));
+        n1 = NEXT(n);
+        free(n);
+        n = n1;
+      }
+      break;
+    case O_ERR:
+      free_obj(BDY((LIST)obj));
+      break;
+    default:
+      break;
+  }
+  free(obj);
 }