Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libedit Standard location of readline headers is /usr/in...
details: https://anonhg.NetBSD.org/src/rev/cccc9dfda596
branches: trunk
changeset: 501691:cccc9dfda596
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Fri Jan 05 21:15:49 2001 +0000
description:
Standard location of readline headers is /usr/include/readline/, so install
them there.
readline.h of libedit had to move to subdirectory 'readline', due to the way
BSD makefiles work; this is better than potentially fragile Makefile hacks
diffstat:
lib/libedit/Makefile | 8 +-
lib/libedit/readline.c | 6 +-
lib/libedit/readline.h | 114 ----------------------------------------
lib/libedit/readline/Makefile | 9 +++
lib/libedit/readline/readline.h | 114 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 131 insertions(+), 120 deletions(-)
diffs (truncated from 310 to 300 lines):
diff -r 0782b3020bfd -r cccc9dfda596 lib/libedit/Makefile
--- a/lib/libedit/Makefile Fri Jan 05 20:18:10 2001 +0000
+++ b/lib/libedit/Makefile Fri Jan 05 21:15:49 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2001/01/05 21:15:49 jdolecek Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
LIB= edit
@@ -24,9 +24,8 @@
LIBEDITDIR?=${.CURDIR}
-INCS= histedit.h readline.h
+INCS= histedit.h
INCSDIR=/usr/include
-LINKS=${INCSDIR}/readline.h ${INCSDIR}/history.h
CLEANFILES+=common.h editline.c emacs.h fcns.c fcns.h help.c help.h vi.h
CLEANFILES+=common.h.tmp editline.c.tmp emacs.h.tmp fcns.c.tmp fcns.h.tmp
@@ -39,6 +38,8 @@
AHDR=vi.h emacs.h common.h
ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
+SUBDIR= readline
+
vi.h: vi.c makelist
sh ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/vi.c > ${.TARGET}.tmp && \
mv ${.TARGET}.tmp ${.TARGET}
@@ -83,3 +84,4 @@
common.h emacs.h fcns.h help.h vi.h
.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
diff -r 0782b3020bfd -r cccc9dfda596 lib/libedit/readline.c
--- a/lib/libedit/readline.c Fri Jan 05 20:18:10 2001 +0000
+++ b/lib/libedit/readline.c Fri Jan 05 21:15:49 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.16 2001/01/04 15:55:53 christos Exp $ */
+/* $NetBSD: readline.c,v 1.17 2001/01/05 21:15:49 jdolecek Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.16 2001/01/04 15:55:53 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.17 2001/01/05 21:15:49 jdolecek Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -52,7 +52,7 @@
#include <unistd.h>
#include <limits.h>
#include "histedit.h"
-#include "readline.h"
+#include "readline/readline.h"
#include "sys.h"
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
diff -r 0782b3020bfd -r cccc9dfda596 lib/libedit/readline.h
--- a/lib/libedit/readline.h Fri Jan 05 20:18:10 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/* $NetBSD: readline.h,v 1.5 2001/01/01 15:52:26 jdolecek Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * 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 NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-#ifndef _READLINE_H_
-#define _READLINE_H_
-
-#include <sys/types.h>
-
-/* list of readline stuff supported by editline library's readline wrapper */
-
-/* typedefs */
-typedef int Function(const char *, int);
-typedef void VFunction(void);
-typedef char *CPFunction(const char *, int);
-typedef char **CPPFunction(const char *, int, int);
-
-typedef struct _hist_entry {
- const char *line;
- const char *data;
-} HIST_ENTRY;
-
-/* global variables used by readline enabled applications */
-__BEGIN_DECLS
-extern const char *rl_library_version;
-extern char *rl_readline_name;
-extern FILE *rl_instream;
-extern FILE *rl_outstream;
-extern char *rl_line_buffer;
-extern int rl_point, rl_end;
-extern int history_base, history_length;
-extern int max_input_history;
-extern char *rl_basic_word_break_characters;
-extern char *rl_completer_word_break_characters;
-extern char *rl_completer_quote_characters;
-extern CPFunction *rl_completion_entry_function;
-extern CPPFunction *rl_attempted_completion_function;
-extern int rl_completion_type;
-extern int rl_completion_query_items;
-extern char *rl_special_prefixes;
-extern int rl_completion_append_character;
-
-/* supported functions */
-char *readline(const char *);
-int rl_initialize(void);
-
-void using_history(void);
-int add_history(const char *);
-void clear_history(void);
-void stifle_history(int);
-int unstifle_history(void);
-int history_is_stifled(void);
-int where_history(void);
-HIST_ENTRY *current_history(void);
-HIST_ENTRY *history_get(int);
-int history_total_bytes(void);
-int history_set_pos(int);
-HIST_ENTRY *previous_history(void);
-HIST_ENTRY *next_history(void);
-int history_search(const char *, int);
-int history_search_prefix(const char *, int);
-int history_search_pos(const char *, int, int);
-int read_history(const char *);
-int write_history(const char *);
-int history_expand(char *, char **);
-char **history_tokenize(const char *);
-
-char *tilde_expand(char *);
-char *filename_completion_function(const char *, int);
-char *username_completion_function(const char *, int);
-int rl_complete(int, int);
-int rl_read_key(void);
-char **completion_matches(const char *, CPFunction *);
-void rl_display_match_list(char **, int, int);
-
-int rl_insert(int, int);
-void rl_reset_terminal(const char *);
-int rl_bind_key(int, int (*)(int, int));
-__END_DECLS
-
-#endif /* _READLINE_H_ */
diff -r 0782b3020bfd -r cccc9dfda596 lib/libedit/readline/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libedit/readline/Makefile Fri Jan 05 21:15:49 2001 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2001/01/05 21:15:50 jdolecek Exp $
+
+.PATH: ${CURDIR}/..
+
+INCS= readline.h
+INCSDIR= /usr/include/readline
+LINKS= ${INCSDIR}/readline.h ${INCSDIR}/history.h
+
+.include <bsd.prog.mk>
diff -r 0782b3020bfd -r cccc9dfda596 lib/libedit/readline/readline.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libedit/readline/readline.h Fri Jan 05 21:15:49 2001 +0000
@@ -0,0 +1,114 @@
+/* $NetBSD: readline.h,v 1.1 2001/01/05 21:15:50 jdolecek Exp $ */
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * 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 NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+#ifndef _READLINE_H_
+#define _READLINE_H_
+
+#include <sys/types.h>
+
+/* list of readline stuff supported by editline library's readline wrapper */
+
+/* typedefs */
+typedef int Function(const char *, int);
+typedef void VFunction(void);
+typedef char *CPFunction(const char *, int);
+typedef char **CPPFunction(const char *, int, int);
+
+typedef struct _hist_entry {
+ const char *line;
+ const char *data;
+} HIST_ENTRY;
+
+/* global variables used by readline enabled applications */
+__BEGIN_DECLS
+extern const char *rl_library_version;
+extern char *rl_readline_name;
+extern FILE *rl_instream;
+extern FILE *rl_outstream;
+extern char *rl_line_buffer;
+extern int rl_point, rl_end;
+extern int history_base, history_length;
+extern int max_input_history;
+extern char *rl_basic_word_break_characters;
+extern char *rl_completer_word_break_characters;
+extern char *rl_completer_quote_characters;
+extern CPFunction *rl_completion_entry_function;
+extern CPPFunction *rl_attempted_completion_function;
+extern int rl_completion_type;
+extern int rl_completion_query_items;
+extern char *rl_special_prefixes;
+extern int rl_completion_append_character;
+
+/* supported functions */
+char *readline(const char *);
+int rl_initialize(void);
+
+void using_history(void);
+int add_history(const char *);
+void clear_history(void);
+void stifle_history(int);
+int unstifle_history(void);
+int history_is_stifled(void);
+int where_history(void);
+HIST_ENTRY *current_history(void);
+HIST_ENTRY *history_get(int);
+int history_total_bytes(void);
+int history_set_pos(int);
+HIST_ENTRY *previous_history(void);
+HIST_ENTRY *next_history(void);
+int history_search(const char *, int);
+int history_search_prefix(const char *, int);
+int history_search_pos(const char *, int, int);
+int read_history(const char *);
+int write_history(const char *);
+int history_expand(char *, char **);
+char **history_tokenize(const char *);
+
+char *tilde_expand(char *);
+char *filename_completion_function(const char *, int);
+char *username_completion_function(const char *, int);
+int rl_complete(int, int);
Home |
Main Index |
Thread Index |
Old Index