Rewritten using POSIX regex

Add 57600 and 115200 speeds
Correct termcap path

lib/libedit/search.c

@@ -43,9 +43,14 @@ static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
  */
 #include "sys.h"
 #include <stdlib.h>
+#ifdef REGEXEC
+#include <sys/types.h>
+#include <regex.h>
+#else
 #ifdef REGEXP
 #include <regexp.h>
 #endif
+#endif
 #include "el.h"
 
 /*
@@ -102,16 +107,26 @@ el_match(str, pat)
     const char *str;
     const char *pat;
 {
+#ifdef REGEXEC
+    regex_t re;
+    regmatch_t mb;
+#else
 #ifndef REGEXP
     extern char *re_comp __P((const char *));
     extern int re_exec __P((const char *));
 #else
     regexp *re;
     int rv;
+#endif
 #endif
 
     if (strstr(str, pat) != NULL)
 	return 1;
+#ifdef REGEXEC
+    if (regcomp(&re, pat, REG_EXTENDED) != 0)
+	return 0;
+    return (regexec(&re, str, 1, &mb, 0) == 0);
+#else
 #ifndef REGEXP
     if (re_comp(pat) != NULL)
 	return 0;
@@ -126,7 +141,7 @@ el_match(str, pat)
 	rv = 0;
     return rv;
 #endif
-   
+#endif
 }
 
 

lib/libedit/sys.h

@@ -76,10 +76,11 @@ typedef char* ioctl_t;
 #endif
 
 #include <stdio.h>
-#define REGEXP
+#define REGEXEC
+#undef REGEXP
 
 #ifdef SUNOS
-# undef REGEXP
+# undef REGEXEC
 # include <malloc.h>
 typedef void (*sig_t)__P((int));
 # ifdef __GNUC__

lib/libedit/term.c

@@ -134,6 +134,12 @@ private struct {
 #endif
 #ifdef B38400
     { "38400", B38400 },
+#endif
+#ifdef B57600
+    { "57600", B57600 },
+#endif
+#ifdef B115200
+    { "115200", B115200 },
 #endif
     { NULL, 0 }
 };
@@ -834,7 +840,11 @@ term_set(el, term)
 
     if (i <= 0) {
 	if (i == -1) 
+#ifdef __FreeBSD__
+	    (void) fprintf(el->el_errfile, "Cannot open /usr/share/misc/termcap.\n");
+#else
 	    (void) fprintf(el->el_errfile, "Cannot open /etc/termcap.\n");
+#endif
 	else if (i == 0) 
 	    (void) fprintf(el->el_errfile, 
 			   "No entry for terminal type \"%s\"\n", term);