===================================================================
RCS file: /home/cvs/OpenXM_contrib2/fep/fep_hist.c,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM_contrib2/fep/fep_hist.c	2002/09/03 00:41:44	1.1
+++ OpenXM_contrib2/fep/fep_hist.c	2020/11/01 10:28:22	1.7
@@ -2,20 +2,25 @@
 
 #ifndef lint
 static char rcsid[]=
-"$Header: /home/cvs/OpenXM_contrib2/fep/fep_hist.c,v 1.1 2002/09/03 00:41:44 noro Exp $ (SRA)";
+"$Header: /home/cvs/OpenXM_contrib2/fep/fep_hist.c,v 1.7 2020/11/01 10:28:22 noro Exp $ (SRA)";
 #endif /* lint */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include "fep_defs.h"
 #include "fep_glob.h"
 #include "fep_funcs.h"
 
-#if defined(__FreeBSD__) || defined(__CYGWIN__)
-#define re_comp regcomp
-#define re_exec regexec
+#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE_CC__) || defined(__INTERIX) || defined(ANDROID)
+#include <regex.h>
+regex_t Re_pat;
+#define re_comp(p) (regcomp(&Re_pat,(p), REG_EXTENDED|REG_NOSUB))
+#define re_exec(p) (!regexec(&Re_pat, (p), 0 , NULL, 0))
+#else
+    char *re_comp();
 #endif
 
 char	**HistoryTable;
@@ -32,8 +37,7 @@ char	*getYoungestHistory();
 char *argv[MAXARGS];
 int argc;
 
-init_hist(size)
-    int size;
+void init_hist(int size)
 {
     char *itoa();
 
@@ -49,9 +53,7 @@ init_hist(size)
     set_var ("history", itoa (HistorySize));
 }
 
-char *
-itoa (i)
-    int i;
+char * itoa (int i)
 {
     static char buf[64];
 
@@ -59,8 +61,7 @@ itoa (i)
     return (buf);
 }
 
-addHistory(string)
-    char *string;
+void addHistory(char *string)
 {
     char *allocAndCopyThere();
     char *prev;
@@ -85,15 +86,12 @@ addHistory(string)
     CurrentHist = TailOfHist;
 }
 
-void
-resetCurrentHistory()
+void resetCurrentHistory()
 {
     CurrentHist = TailOfHist;
 }
 
-char *
-getHistory(num)
-    int num;
+char * getHistory(int num)
 {
     if (HistorySize <= 0)
 	return (0);
@@ -106,14 +104,12 @@ getHistory(num)
     }
 }
 
-char *
-getCurrentHistory()
+char * getCurrentHistory()
 {
     return (getHistory (CurrentHist));
 }
 
-char *
-getPreviousHistory()
+char * getPreviousHistory()
 {
     if (HistorySize <= 0)
 	return (0);
@@ -128,8 +124,7 @@ getPreviousHistory()
     return (getCurrentHistory ());
 }
 
-char *
-getNextHistory()
+char * getNextHistory()
 {
     
     if (HistorySize <= 0)
@@ -142,20 +137,19 @@ getNextHistory()
     return (getCurrentHistory ());
 }
 
-getOldestHistNum()
+int getOldestHistNum()
 {
 
     return (TopOfHist);
 }
 
-getYoungestHistNum()
+int getYoungestHistNum()
 {
 
     return (TailOfHist-1);
 }
 
-char *
-getOldestHistory()
+char * getOldestHistory()
 {
     register char *cp;
 
@@ -166,8 +160,7 @@ getOldestHistory()
     return (cp ? cp : "");
 }
 
-char *
-getYoungestHistory()
+char * getYoungestHistory()
 {
     register char *cp;
 
@@ -178,14 +171,12 @@ getYoungestHistory()
     return (cp ? cp : "");
 }
 
-getCurrentHistNum()
+int getCurrentHistNum()
 {
     return (CurrentHist);
 }
 
-char *
-allocAndCopyThere(string)
-    char *string;
+char * allocAndCopyThere(char *string)
 {
     register char *cp;
     
@@ -198,9 +189,7 @@ allocAndCopyThere(string)
     return(cp);
 }
 
-char *
-historyExtract(string)
-    char *string;
+char * historyExtract(char *string)
 {
     char *search_reverse_history();
 
@@ -272,12 +261,9 @@ historyExtract(string)
     return ((char *) 0);
 }
 
-char *
-search_reverse_history (string)
-    char *string;
+char * search_reverse_history (char *string)
 {
     register int i;
-    char *re_comp();
 
     if (string != NULL) {
 	set_var ("search-string", string);
@@ -297,12 +283,9 @@ search_reverse_history (string)
     return ((char *) 0);
 }
 
-char *
-search_forward_history (string)
-    char *string;
+char * search_forward_history (char *string)
 {
     register int i;
-    char *re_comp();
 
     if (string != NULL) {
 	if (re_comp(string) != (char *)0)
@@ -324,8 +307,7 @@ search_forward_history (string)
 /*
  * Change history table size.
  */
-changeHistorySize(newsize)
-    int newsize;
+int changeHistorySize(int newsize)
 {
     char **newHistTable;
     register int newTop, i;
@@ -375,8 +357,7 @@ changeHistorySize(newsize)
 /*
  * Built-in function "fep-history"
  */
-fep_history (comline)
-    char *comline;
+void fep_history (char *comline)
 {
     int num;
 
@@ -390,8 +371,7 @@ fep_history (comline)
     hist_showHistory (num);
 }
 
-hist_showHistory (num)
-    int num;
+void hist_showHistory (int num)
 {
     register int from, to, i;
     char *cp;
@@ -417,9 +397,7 @@ hist_showHistory (num)
     }
 }
 
-char *
-mk_home_relative (cp)
-    char *cp;
+char * mk_home_relative (char *cp)
 {
     static char buf[256];
 
@@ -438,8 +416,7 @@ mk_home_relative (cp)
     return (buf);
 }
 
-fep_save_history (comline)
-    char *comline;
+void fep_save_history (char *comline)
 {
     char *file;
     char **argp;
@@ -476,9 +453,7 @@ fep_save_history (comline)
 
 #define MAXSAVEHIST 512
 
-save_history (file, num)
-    char *file;
-    int num;
+void save_history (char *file, int num)
 {
     int old, new;
     FILE *fp, *fopen();
@@ -513,8 +488,7 @@ save_history (file, num)
     return;
 }
 
-fep_read_history (comline)
-    char *comline;
+void fep_read_history (char *comline)
 {
     char *file;
     char **argp;
@@ -545,8 +519,7 @@ fep_read_history (comline)
     read_history (file);
 }
 
-read_history (file)
-    char *file;
+void read_history (char *file)
 {
     FILE *fp;
     char line [MAXCMDLEN];