[BACK]Return to ox_launch.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ox_launch.c between version 1.3 and 1.8

version 1.3, 2000/08/21 08:31:38 version 1.8, 2000/11/07 06:35:39
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.2 2000/02/08 04:47:11 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.7 2000/10/06 06:05:23 noro Exp $
 */  */
 #include <setjmp.h>  #include <setjmp.h>
 #include <signal.h>  #include <signal.h>
Line 53 
Line 53 
 #include "com.h"  #include "com.h"
 #include "ox.h"  #include "ox.h"
 #if defined(VISUAL)  #if defined(VISUAL)
   #include <stdlib.h>
 #include <windows.h>  #include <windows.h>
 #include <io.h>  #include <io.h>
 #include <fcntl.h>  #include <fcntl.h>
Line 227  int cmd;
Line 228  int cmd;
         switch ( cmd ) {          switch ( cmd ) {
                 case SM_shutdown:                  case SM_shutdown:
                         SetEvent(hKill);                          SetEvent(hKill);
                         exit(0); break;                          ExitProcess(0);
                           break;
                 case SM_control_intr:                  case SM_control_intr:
                         SetEvent(hIntr);                          SetEvent(hIntr);
                         break;                          break;
Line 287  char *dname;
Line 289  char *dname;
         HANDLE hProc;          HANDLE hProc;
         STRING rootdir;          STRING rootdir;
         int mypid;          int mypid;
           int newbs;
   
           DuplicateHandle(GetCurrentProcess(),(HANDLE)bs,
                                           GetCurrentProcess(),(HANDLE *)&newbs,
                                           0,TRUE,DUPLICATE_SAME_ACCESS);
           close(bs);
           bs = newbs;
   
         mypid = GetCurrentProcessId();          mypid = GetCurrentProcessId();
         sprintf(ox_intr,"ox_intr_%d",mypid);          sprintf(ox_intr,"ox_intr_%d",mypid);
         sprintf(ox_reset,"ox_reset_%d",mypid);          sprintf(ox_reset,"ox_reset_%d",mypid);
Line 298  char *dname;
Line 307  char *dname;
         sprintf(sock_id,"%d",bs);          sprintf(sock_id,"%d",bs);
         av[0] = prog;          av[0] = prog;
         av[1] = sock_id;          av[1] = sock_id;
         av[2] = ox_intr;          av[2] = dname; /* if dname == "1" then a message window is opened */
         av[3] = ox_reset;          av[3] = ox_intr;
         av[4] = ox_kill;          av[4] = ox_reset;
         av[5] = NULL;          av[5] = ox_kill;
           av[6] = NULL;
         Pget_rootdir(&rootdir);          Pget_rootdir(&rootdir);
         sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));          if ( !strcmp(prog,"ox_plot") ) {
   //              sprintf(AsirExe,"d:\\home\\noro\\ox_plot\\debug\\ox_plot.exe");
                   sprintf(AsirExe,"%s\\bin\\ox_plot.exe",BDY(rootdir));
           } else
                   sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
           _fileinfo = 1;
         hProc = _spawnv(_P_NOWAIT,AsirExe,av);          hProc = _spawnv(_P_NOWAIT,AsirExe,av);
         return (int)hProc;          return (int)hProc;
 #else /* VISUAL */  #else /* VISUAL */
Line 312  char *dname;
Line 327  char *dname;
         int pid;          int pid;
         char wname[BUFSIZ];          char wname[BUFSIZ];
         char buf[BUFSIZ];          char buf[BUFSIZ];
           char errcode;
   
         pid = fork();          pid = fork();
         if ( pid )          if ( pid )
Line 338  char *dname;
Line 354  char *dname;
                                 close(i);                                  close(i);
 #endif  #endif
                 }                  }
                 if ( strcmp(dname,"0") )                  if ( !strcmp(dname,"1" ) ) /* XXX: for ssh */
                         execl(prog,prog,"-display",dname,0);                          execl(prog,prog,0);
                 else {                  else if ( !strcmp(dname,"0") ) {
                         FILE *null;                          FILE *null;
   
                         null = fopen("/dev/null","wb");                          null = fopen("/dev/null","wb");
Line 348  char *dname;
Line 364  char *dname;
                         dup2(fileno(null),2);                          dup2(fileno(null),2);
                         putenv("DISPLAY=");                          putenv("DISPLAY=");
                         execl(prog,prog,0);                          execl(prog,prog,0);
                 }                  } else
                           execl(prog,prog,"-display",dname,0);
                   /* On failure */
                   errcode = 2;
                   write(4,&errcode,1);
                   exit(1);
         }          }
 #endif  #endif
 }  }
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>