[BACK]Return to ox_k0.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / k097

Diff for /OpenXM/src/k097/ox_k0.c between version 1.6 and 1.9

version 1.6, 2004/09/05 00:51:18 version 1.9, 2013/11/07 07:29:47
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.5 2003/12/05 14:02:23 takayama Exp $ */  /* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.8 2013/11/06 06:23:23 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/socket.h>  #include <sys/socket.h>
Line 7 
Line 7 
 #include <netdb.h>  #include <netdb.h>
 #include <signal.h>  #include <signal.h>
 #include <setjmp.h>  #include <setjmp.h>
   #include <string.h>
 /* -lnsl -lsocket /usr/ucblib/libucb.a */  /* -lnsl -lsocket /usr/ucblib/libucb.a */
 #include "../kxx/ox_kan.h"  #include "../kxx/ox_kan.h"
 #include "../kxx/serversm.h"  #include "../kxx/serversm.h"
Line 69  nullserver(int fdStreamIn,int fdStreamOut) {
Line 70  nullserver(int fdStreamIn,int fdStreamOut) {
   ox_stream ostreamIn;    ox_stream ostreamIn;
   ox_stream ostreamOut;    ox_stream ostreamOut;
   char sreason[1024];    char sreason[1024];
     extern int RestrictedMode, RestrictedMode_saved;
   extern void controlResetHandler();    extern void controlResetHandler();
 #if defined(__CYGWIN__)  #if defined(__CYGWIN__)
   extern sigjmp_buf EnvOfStackMachine;    extern sigjmp_buf EnvOfStackMachine;
Line 120  nullserver(int fdStreamIn,int fdStreamOut) {
Line 122  nullserver(int fdStreamIn,int fdStreamOut) {
       fprintf(stderr," ?! \n"); fflush(NULL);        fprintf(stderr," ?! \n"); fflush(NULL);
     }      }
     if (!Calling_ctrlC_hook) {      if (!Calling_ctrlC_hook) {
       Calling_ctrlC_hook = 1;        Calling_ctrlC_hook = 1; RestrictedMode = 0;
       KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */        KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
         RestrictedMode = RestrictedMode_saved;
     }      }
     Calling_ctrlC_hook = 0;      Calling_ctrlC_hook = 0;
         KSexecuteString(" (Computation is interrupted.) ");          KSexecuteString(" (Computation is interrupted.) ");
Line 157  nullserver(int fdStreamIn,int fdStreamOut) {
Line 160  nullserver(int fdStreamIn,int fdStreamOut) {
     */      */
     Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error");      Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error");
   
         KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */      if (!Calling_ctrlC_hook) {
         Calling_ctrlC_hook = 1; RestrictedMode = 0;
             KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
         RestrictedMode = RestrictedMode_saved;
       }
       Calling_ctrlC_hook = 0;
     InSendmsg2=0;      InSendmsg2=0;
     signal(SIGUSR1,controlResetHandler); goto aaa ;      signal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {    } else {
Line 335  nullserver_simplest(int fd) {
Line 343  nullserver_simplest(int fd) {
   int c;    int c;
   while(1) {    while(1) {
     c = readOneByte(fd);      c = readOneByte(fd);
     if (c == '@') { return; }      if (c == '@') { return 0; }
   }    }
 }  }
   
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.9
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>