=================================================================== RCS file: /home/cvs/OpenXM_contrib2/fep/fep_edit.c,v retrieving revision 1.1 retrieving revision 1.7 diff -u -p -r1.1 -r1.7 --- OpenXM_contrib2/fep/fep_edit.c 2002/09/03 00:41:44 1.1 +++ OpenXM_contrib2/fep/fep_edit.c 2019/12/13 15:41:36 1.7 @@ -1,11 +1,19 @@ /* 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_edit.c,v 1.1 2002/09/03 00:41:44 noro Exp $ (SRA)"; +"$Id: fep_edit.c,v 1.7 2019/12/13 15:41:36 fujimoto Exp $ (SRA)"; #endif /* lint */ #include +#include +#include #include #include #include @@ -24,6 +32,10 @@ static char rcsid[]= #if defined(__CYGWIN__) #include #define direct dirent +#elif defined(sun) || defined(__FreeBSD__) || defined(ANDROID) +#include +#define direct dirent +#include #else #include #endif @@ -158,7 +170,8 @@ init_edit_params () set_var ("editmode", "emacs"); } - set_var ("showhist", itoa (lines - 1)); + sprintf (sbuf, "%d", lines); + set_var ("showhist", sbuf); /* * Read startup file @@ -232,7 +245,9 @@ initEmacsBindings (cft, aft) import (cft, initial_ttymode.c_cc[VDSUSP], self_insert); */ import (cft, initial_ttymode.c_cc[VREPRINT], reprint); +#ifdef VDISCARD import (cft, initial_ttymode.c_cc[VDISCARD], self_insert); +#endif import (cft, initial_ttymode.c_cc[VWERASE], delete_previous_word); import (cft, initial_ttymode.c_cc[VLNEXT], literal_next); import (cft, initial_ttymode.c_cc[VERASE], delete_previous_character); @@ -279,7 +294,7 @@ initEmacsBindings (cft, aft) * Main function of front end program */ CHAR * -getline() +mygetline() { int c; CHAR *execute_command, *check_alias(); @@ -1762,7 +1777,9 @@ expand_file_name () int found = 0; int i; int tilde_expanded = 0; +#if !defined(ANDROID) CHAR *index(), *rindex(); +#endif if (delimiters == NULL) delimiters = DEFAULT_DELIMITERS; @@ -1875,7 +1892,9 @@ list_file_name () CHAR *cp; char dir[256]; DIR *dirp, *x_opendir(); +#if !defined(ANDROID) CHAR *index(), *rindex(); +#endif if (delimiters == NULL) delimiters = DEFAULT_DELIMITERS;