[BACK]Return to fep_main.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / fep

Diff for /OpenXM_contrib2/fep/fep_main.c between version 1.9 and 1.11

version 1.9, 2012/05/14 12:52:08 version 1.11, 2019/12/13 15:41:36
Line 1 
Line 1 
 /*      Copyright (c) 1987, 1988 by Software Research Associates, Inc.  */  /*      Copyright (c) 1987, 1988 by Software Research Associates, Inc.  */
   
   #if defined(ANDROID)
   #include <strings.h>
   #define index(s,c) strchr(s,c)
   #define rindex(s,c) strrchr(s,c)
   #endif
   
 #ifndef lint  #ifndef lint
 static char rcsid[]=  static char rcsid[]=
 "$Id$ (SRA)";  "$Id$ (SRA)";
Line 248  DEFAULT:
Line 254  DEFAULT:
      * Set variable of command name.       * Set variable of command name.
      */       */
     {      {
   #if defined(ANDROID)
           char *cp = argv[1];
   #else
         char *cp = argv[1], *rindex();          char *cp = argv[1], *rindex();
   #endif
   
         if (any ('/', cp))          if (any ('/', cp))
             cp = rindex (cp, '/') + 1;              cp = rindex (cp, '/') + 1;
Line 868  get_pty_master()
Line 878  get_pty_master()
         master = 1;          master = 1;
         return;          return;
     }      }
 #if defined(__CYGWIN32__) || defined(__linux__)  #if defined(__CYGWIN32__) || defined(__linux__) || defined(__APPLE__)
     sprintf (master_tty, "/dev/ptmx");      sprintf (master_tty, "/dev/ptmx");
     master = open (master_tty, O_RDWR);      master = open (master_tty, O_RDWR);
     if (master >= 0) {      if (master >= 0) {
Line 877  get_pty_master()
Line 887  get_pty_master()
         grantpt(master);          grantpt(master);
         unlockpt(master);          unlockpt(master);
         if ( !ptsname_r(master,name,sizeof(name)) ) {          if ( !ptsname_r(master,name,sizeof(name)) ) {
               strcpy(slave_tty, name);
               goto FOUND;
           }
   #elif defined(__APPLE__)
           char *name;
           grantpt(master);
           unlockpt(master);
           if ( name = (char *)ptsname(master) ) {
             strcpy(slave_tty, name);              strcpy(slave_tty, name);
             goto FOUND;              goto FOUND;
         }          }
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.11
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>