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

Diff for /OpenXM/src/kxx/oxmain.c between version 1.10 and 1.11

version 1.10, 2002/05/02 03:08:28 version 1.11, 2002/05/02 08:33:47
Line 1 
Line 1 
 /*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.9 2001/12/28 01:20:27 takayama Exp $  */  /*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.10 2002/05/02 03:08:28 takayama Exp $  */
 /* nullserver01 */  /* nullserver01 */
 #include <stdio.h>  #include <stdio.h>
 #include <fcntl.h>  #include <fcntl.h>
Line 334  restoreLockCtrlCForOx() { ; }
Line 334  restoreLockCtrlCForOx() { ; }
 static int findOxServer(char *server) {  static int findOxServer(char *server) {
   char *p;    char *p;
   char *p2;    char *p2;
   int fd;  
   char *getenv(char *s);    char *getenv(char *s);
   if (strlen(server) == 0) return(-1);    if (strlen(server) == 0) return(-1);
   /* fd = open(server,O_RDONLY); */    /* fd = open(server,O_RDONLY); */
   fd = access(server,X_OK&R_OK);    if (access(server,X_OK&R_OK) == 0) {
   if (fd >= 0) {  
     fprintf(stderr,"Starting OX server : %s\n",server);      fprintf(stderr,"Starting OX server : %s\n",server);
     close(fd);  
     return(0);      return(0);
   }    }
   if (server[0] == '/') {    if (server[0] == '/') {
Line 357  static int findOxServer(char *server) {
Line 354  static int findOxServer(char *server) {
   if (p2 == NULL) { fprintf(stderr,"No more memory.\n"); exit(10); }    if (p2 == NULL) { fprintf(stderr,"No more memory.\n"); exit(10); }
   strcpy(p2,p); strcat(p2,"/bin/"); strcat(p2,server);    strcpy(p2,p); strcat(p2,"/bin/"); strcat(p2,server);
   /* fd = open(p2,O_RDONLY); */    /* fd = open(p2,O_RDONLY); */
   fd = access(p2,X_OK&R_OK);    if (access(p2,X_OK&R_OK) == 0) {
   if (fd >= 0) {  
     fprintf(stderr,"Starting OX server : %s\n",p2);      fprintf(stderr,"Starting OX server : %s\n",p2);
     if (strlen(p2) < SERVERNAME_SIZE) strcpy(server,p2);      if (strlen(p2) < SERVERNAME_SIZE) strcpy(server,p2);
     else {      else {
       couldNotFind("Too long ox server name.");        couldNotFind("Too long ox server name.");
       return(-1);        return(-1);
     }      }
     close(fd);  
     return(0);      return(0);
   }    }
   couldNotFind(p2);    couldNotFind(p2);

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>