=================================================================== RCS file: /home/cvs/OpenXM_contrib2/fep/fep_main.c,v retrieving revision 1.6 retrieving revision 1.13 diff -u -p -r1.6 -r1.13 --- OpenXM_contrib2/fep/fep_main.c 2009/02/24 07:30:15 1.6 +++ OpenXM_contrib2/fep/fep_main.c 2021/03/24 06:22:04 1.13 @@ -1,11 +1,20 @@ /* Copyright (c) 1987, 1988 by Software Research Associates, Inc. */ +#if defined(ANDROID) +#include +#define index(s,c) strchr(s,c) +#define rindex(s,c) strrchr(s,c) +#endif + #ifndef lint static char rcsid[]= -"$Id: fep_main.c,v 1.6 2009/02/24 07:30:15 noro Exp $ (SRA)"; +"$Id: fep_main.c,v 1.13 2021/03/24 06:22:04 fujimoto Exp $ (SRA)"; #endif /* lint */ #include +#include +#include +#include #include #include #include @@ -128,9 +137,7 @@ struct cmdinfo { {0, 0} }; -main(argc, argv) - int argc; - char *argv[]; +int main(int argc, char *argv[]) { int i; char *cp; @@ -246,7 +253,11 @@ DEFAULT: * Set variable of command name. */ { +#if defined(ANDROID) + char *cp = argv[1]; +#else char *cp = argv[1], *rindex(); +#endif if (any ('/', cp)) cp = rindex (cp, '/') + 1; @@ -260,7 +271,7 @@ DEFAULT: #if defined(__INTERIX) execvp (*commandv, commandv); #else - execvp (*commandv, commandv, 0); + execvp (*commandv, commandv); #endif perror (*commandv); exit (1); @@ -309,7 +320,7 @@ DEFAULT: input_handler (); } -fix_signal () +void fix_signal () { #ifdef SIGWINCH #if defined(sun) @@ -328,7 +339,7 @@ fix_signal () #endif } -recover_signal () +void recover_signal () { (void) signal (SIGHUP, sighup); @@ -336,10 +347,10 @@ recover_signal () (void) signal (SIGTSTP, sigtstp); } -input_handler() +void input_handler() { char *inputline; - char *getline (); + char *mygetline (); /* * Get slave tty descriptor for auto-tty-fix @@ -347,7 +358,7 @@ input_handler() if ((slave = open (slave_tty, O_RDONLY)) < 0) perror ("open"); - while (inputline = getline ()) { + while (inputline = mygetline ()) { /* * XXX: nbyte should be greater than 0 only for ^@ input in emacs. * This solution is very ugly.. but it will takes a half day @@ -363,7 +374,7 @@ input_handler() /* * 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. */ @@ -421,7 +432,7 @@ struct timeval *notimeout[] = { TIMEOUT_FOREVER }; -getcharacter() +int getcharacter() { char c; int n; @@ -541,11 +552,9 @@ RETRY: goto RETRY; } -int set_buffer (bp, size) - BUFFER *bp; - int size; +int set_buffer (BUFFER *bp, int size) { - char *newbuf, *malloc(), *realloc(); + char *newbuf; if (bp->b_buf) newbuf = (char *) realloc (bp->b_buf, size); @@ -568,9 +577,10 @@ int set_buffer (bp, size) return (1); } -int buf_read (fd, bp) - int fd; /* file discriptor */ - BUFFER *bp; /* buffer pointer */ +/* int fd; file discriptor */ +/* BUFFER *bp; buffer pointer */ + +int buf_read (int fd, BUFFER *bp) { int nbyte; @@ -608,9 +618,12 @@ int buf_read (fd, bp) return (nbyte); } -buf_put (bp, s) - BUFFER *bp; /* buffer pointer */ - char *s; /* string pointer */ +/* + BUFFER *bp; buffer pointer + char *s; string pointer +*/ + +void buf_put (BUFFER *bp, char *s) { int nbyte; int slen; @@ -635,7 +648,7 @@ buf_put (bp, s) } } -swallow_output() +void swallow_output() { fd_set readfd = mastermask; int r; @@ -677,13 +690,11 @@ swallow_output() #include #endif -#if defined(__INTERIX) +#if defined(__INTERIX) || defined(ANDROID) #define wait3(s,opt,rp) (waitpid((-1),(s),(opt))) #endif -void -catchsig(n) - int n; +void catchsig(int n) { int status; struct rusage ru; @@ -700,8 +711,7 @@ catchsig(n) terminate (0); } -exec_to_command(argv) - char *argv[]; +void exec_to_command(char *argv[]) { int t; @@ -732,14 +742,14 @@ exec_to_command(argv) #if defined(__INTERIX) execvp (*argv, argv); #else - execvp (*argv, argv, 0); + execvp (*argv, argv); #endif perror (*argv); exit (1); } #ifdef TERMIOS -fix_tty() +void fix_tty() { int i; master_ttymode = initial_ttymode; @@ -759,7 +769,7 @@ fix_tty() #elif defined(TIOCSETN) -fix_tty() +void fix_tty() { struct tchars tcbuf; struct ltchars lcbuf; @@ -798,16 +808,14 @@ fix_tty() } #endif -kill_process() +void kill_process() { if (child_pid) (void) killpg (child_pid, SIGTERM); } -void -terminate(n) - int n; +void terminate(int n) { extern int errno; @@ -849,14 +857,14 @@ terminate(n) exit (0); } -send_int_sig() { +int send_int_sig() { #ifndef __CYGWIN__ kill(child_pid,SIGINT); #endif return 0; } -get_pty_master() +void get_pty_master() { char c; struct stat stb; @@ -866,7 +874,7 @@ get_pty_master() master = 1; return; } -#if defined(__CYGWIN32__) || defined(__linux__) +#if defined(__CYGWIN32__) || defined(__linux__) || defined(__APPLE__) sprintf (master_tty, "/dev/ptmx"); master = open (master_tty, O_RDWR); if (master >= 0) { @@ -878,6 +886,14 @@ get_pty_master() strcpy(slave_tty, name); goto FOUND; } +#elif defined(__APPLE__) + char *name; + grantpt(master); + unlockpt(master); + if ( name = (char *)ptsname(master) ) { + strcpy(slave_tty, name); + goto FOUND; + } #else char *name; name = (char *)ptsname(master); @@ -951,7 +967,7 @@ get_pty_master() return; } -get_pty_slave() +void get_pty_slave() { slave = open (slave_tty, 2); @@ -989,7 +1005,7 @@ get_pty_slave() #endif } -recover_tty() +void recover_tty() { #ifdef TERMIOS tcsetattr(0, TCSANOW, &initial_ttymode); @@ -1000,7 +1016,7 @@ recover_tty() #endif } -suspend() +int suspend() { long pid; #if defined(sun) @@ -1040,8 +1056,7 @@ suspend() fep_repaint(0); } -look_cmdinfo (command) - char *command; +void look_cmdinfo (char *command) { struct cmdinfo *p; char *allocAndCopyThere(); @@ -1060,7 +1075,7 @@ look_cmdinfo (command) } -usageAndExit() +void usageAndExit() { printf ("Usage: %s [-emacs|-vi] command\n", myself); @@ -1073,6 +1088,7 @@ usageAndExit() */ void sigwinch(int dummy) { + char *itoa(int i); #ifdef TIOCGWINSZ /* 4.3BSD */ struct winsize win;