[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.7 and 1.11

version 1.7, 2010/04/23 05:34:05 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 341  recover_signal ()
Line 351  recover_signal ()
 input_handler()  input_handler()
 {  {
     char   *inputline;      char   *inputline;
     char   *getline ();      char   *mygetline ();
   
     /*      /*
      * Get slave tty descriptor for auto-tty-fix       * Get slave tty descriptor for auto-tty-fix
Line 349  input_handler()
Line 359  input_handler()
     if ((slave = open (slave_tty, O_RDONLY)) < 0)      if ((slave = open (slave_tty, O_RDONLY)) < 0)
         perror ("open");          perror ("open");
   
     while (inputline = getline ()) {      while (inputline = mygetline ()) {
         /*          /*
          * XXX: nbyte should be greater than 0 only for ^@ input in emacs.           * XXX: nbyte should be greater than 0 only for ^@ input in emacs.
          * This solution is very ugly.. but it will takes a half day           * This solution is very ugly.. but it will takes a half day
Line 365  input_handler()
Line 375  input_handler()
   
         /*          /*
          * NOTE:           * NOTE:
          * Saving command line to output buffer is done in getline().           * Saving command line to output buffer is done in mygetline().
          * Because inputline here is converted by alias.           * Because inputline here is converted by alias.
          */           */
   
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 880  get_pty_master()
Line 890  get_pty_master()
             strcpy(slave_tty, name);              strcpy(slave_tty, name);
             goto FOUND;              goto FOUND;
         }          }
   #elif defined(__APPLE__)
           char *name;
           grantpt(master);
           unlockpt(master);
           if ( name = (char *)ptsname(master) ) {
               strcpy(slave_tty, name);
               goto FOUND;
           }
 #else  #else
         char *name;          char *name;
         name = (char *)ptsname(master);          name = (char *)ptsname(master);
Line 1075  usageAndExit()
Line 1093  usageAndExit()
  */   */
 void sigwinch(int dummy)  void sigwinch(int dummy)
 {  {
       char *itoa(int i);
 #ifdef TIOCGWINSZ                       /* 4.3BSD */  #ifdef TIOCGWINSZ                       /* 4.3BSD */
     struct winsize win;      struct winsize win;
   
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.11
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>