BSD 4_4 release

[unix-history] / usr / src / lib / libedit / search.c

diff --git a/usr/src/lib/libedit/search.c b/usr/src/lib/libedit/search.c
index 8f9a830..4ff9c61 100644 (file)
--- a/usr/src/lib/libedit/search.c
+++ b/usr/src/lib/libedit/search.c
@@ -1,15 +1,41 @@
 /*-
 /*-

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if !defined(lint) && !defined(SCCSID)
  */
 
 #if !defined(lint) && !defined(SCCSID)

-static char sccsid[] = "@(#)search.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)search.c   8.1 (Berkeley) 6/4/93";

 #endif /* not lint && not SCCSID */
 
 /*
 #endif /* not lint && not SCCSID */
 
 /*


@@ -92,7 +118,7 @@ el_match(str, pat)
     else
     return re_exec(str) == 1;
 #else
     else
     return re_exec(str) == 1;
 #else

-    if ((re = regcomp(pat)) == NULL) {
+    if ((re = regcomp(pat)) != NULL) {

        rv = regexec(re, str);
        free((ptr_t) re);
     }
        rv = regexec(re, str);
        free((ptr_t) re);
     }


@@ -396,7 +422,7 @@ cv_search(el, dir)
 
     c_insert(el, 2);   /* prompt + '\n' */
     *el->el_line.cursor++ = '\n';
 
     c_insert(el, 2);   /* prompt + '\n' */
     *el->el_line.cursor++ = '\n';

-    *el->el_line.cursor++ = dir == ED_SEARCH_PREV_HISTORY ? '?' : '/';
+    *el->el_line.cursor++ = dir == ED_SEARCH_PREV_HISTORY ? '/' : '?';

     re_refresh(el);
 
 #ifdef ANCHOR
     re_refresh(el);
 
 #ifdef ANCHOR