There are some left-over (unused) header files from removed components
in vi. The following patch deletes them and cleans up the documentation
to remove references to these components. No binary change.
cheers,
natano
---
Index: LAYOUT
===================================================================
RCS file: /cvs/src/usr.bin/vi/LAYOUT,v
retrieving revision 1.4
diff -u -u -r1.4 LAYOUT
--- LAYOUT 29 Jan 2001 01:58:24 -0000 1.4
+++ LAYOUT 13 Oct 2014 19:54:29 -0000
@@ -2,6 +2,9 @@
# @(#)LAYOUT 8.12 (Berkeley) 10/10/96
+FAQ
+ Frequently asked questions.
+
LAYOUT
This file: the layout of the nvi sources.
@@ -22,27 +25,12 @@
cl/
Source files for nvi's curses screen support.
-clib/
- Replacement source files for C library functions.
-
common/
Source files for pieces of code that are shared by ex and vi,
e.g., searching and logging code or code translating line numbers
into requests to the dbopen(3) database code. It also has the
interface code for modifying "records" in the underlying database.
-curses/
- A stripped-down replacement curses library. Do not try and use
- this library outside of nvi, many standard curses functions have
- been removed because nvi doesn't use them. See build/README for
- more information.
-
-db/
- A stripped-down replacement DB library. Do not try and use this
- library outside of nvi, many standard DB functions have been
- removed because nvi doesn't use them. See db/README for more
- information.
-
docs/
Ex/vi documentation, both current and historic.
@@ -104,27 +92,12 @@
Replacement include files:
bitstring.h -- The 4.4BSD bitstring operations.
- sys/queue.h -- The 4.4BSD queue operations.
perl_api/
Source code supporting the Perl scripting language for nvi.
perl_scripts/
Scripts for Perl included with nvi.
-
-regex/
- Henry Spencer's POSIX 1003.2 regular expression (RE) library.
-
-tcl_api/
- Source code supporting the Tcl scripting language for nvi.
-
-tcl_scripts/
- Scripts for Tcl included with nvi.
-
-tk/
- Source files for nvi's Tk screen support.
-
- init.tcl -- Vi startup tcl script.
vi/
The vi source code.
Index: README
===================================================================
RCS file: /cvs/src/usr.bin/vi/README,v
retrieving revision 1.10
diff -u -u -r1.10 README
--- README 29 Jan 2001 01:58:25 -0000 1.10
+++ README 13 Oct 2014 20:01:01 -0000
@@ -8,36 +8,24 @@
The directory layout is as follows:
- FAQ ........... Frequently asked questions.
- LICENSE ....... Copyright, use and redistribution information.
- README ........ This file.
- catalog ....... Message catalogs; see catalog/README.
- changelog ..... Log of changes from version to version.
- cl ............ Vi interface to the curses(3) library.
- clib .......... C library replacement source code.
- common ........ Code shared by ex and vi.
- curses ........ A stripped-down, replacement curses(3) library.
- db ............ A stripped-down, replacement db(3) library.
- dist .......... Various files used to build the vi distribution.
- docs .......... Ex/vi documentation, both current and historic.
- docs/README ... Documentation overview.
- docs/edit ..... Edit: A tutorial.
- docs/exref .... Ex Reference Manual -- Version 3.7.
- docs/vi.man ... UNIX manual page for nex/nvi.
- docs/vi.ref ... Nex/nvi reference manual.
- docs/vitut .... An Introduction to Display Editing with Vi.
- ex ............ Ex source code.
- include ....... Replacement include files.
- ip ............ Library interface to vi: vi side.
- ipc ........... Library interface to vi: application side.
- motif ......... Vi motif application.
- motif_l ....... Motif library interface to vi.
- perl_api ...... Perl scripting language support.
- perl_scripts .. Perl scripts.
- regex ......... POSIX 1003.2 regular expression library.
- tcl_api ....... Tcl scripting language support.
- tcl_scripts ... Tcl scripts.
- vi ............ Vi source code.
+ FAQ ................... Frequently asked questions.
+ LAYOUT ................ The layout of the nvi sources.
+ LICENSE ............... Copyright, use and redistribution information.
+ README ................ This file.
+ catalog ............... Message catalogs; see catalog/README.
+ cl .................... Vi interface to the curses(3) library.
+ common ................ Code shared by ex and vi.
+ docs .................. Ex/vi documentation, both current and historic.
+ docs/USD.doc/edit ..... Edit: A tutorial.
+ docs/USD.doc/exref .... Ex Reference Manual -- Version 3.7.
+ docs/USD.doc/vi.man ... UNIX manual page for nex/nvi.
+ docs/USD.doc/vi.ref ... Nex/nvi reference manual.
+ docs/USD.doc/vitut .... An Introduction to Display Editing with Vi.
+ ex .................... Ex source code.
+ include ............... Replacement include files.
+ perl_api .............. Perl scripting language support.
+ perl_scripts .......... Perl scripts.
+ vi .................... Vi source code.
Bug fixes and updated versions of this software will periodically be made
available. For more information see:
Index: common/common.h
===================================================================
RCS file: /cvs/src/usr.bin/vi/common/common.h,v
retrieving revision 1.5
diff -u -u -r1.5 common.h
--- common/common.h 28 Jan 2009 13:02:22 -0000 1.5
+++ common/common.h 13 Oct 2014 19:25:03 -0000
@@ -17,11 +17,6 @@
*/
#include "port.h"
-/*
- * Pseudo-local includes. These are files that are unlikely to exist
- * on most machines to which we're porting vi, and we want to include
- * them in a very specific order, regardless.
- */
#include <db.h>
#include <regex.h>
Index: include/ip_extern.h
===================================================================
RCS file: /cvs/src/usr.bin/vi/include/ip_extern.h,v
retrieving revision 1.3
diff -u -u -r1.3 ip_extern.h
--- include/ip_extern.h 16 Feb 2002 21:27:58 -0000 1.3
+++ include/ip_extern.h 13 Oct 2014 19:56:05 -0000
@@ -1,25 +0,0 @@
-/* $OpenBSD: ip_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */
-
-int ip_addstr(SCR *, const char *, size_t);
-int ip_attr(SCR *, scr_attr_t, int);
-int ip_baud(SCR *, u_long *);
-int ip_bell(SCR *);
-void ip_busy(SCR *, const char *, busy_t);
-int ip_clrtoeol(SCR *);
-int ip_cursor(SCR *, size_t *, size_t *);
-int ip_deleteln(SCR *);
-int ip_ex_adjust(SCR *, exadj_t);
-int ip_insertln(SCR *);
-int ip_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
-int ip_move(SCR *, size_t, size_t);
-int ip_refresh(SCR *, int);
-int ip_rename(SCR *);
-int ip_suspend(SCR *, int *);
-void ip_usage(void);
-int ip_event(SCR *, EVENT *, u_int32_t, int);
-int ip_screen(SCR *, u_int32_t);
-int ip_quit(GS *);
-int ip_term_init(SCR *);
-int ip_term_end(GS *);
-int ip_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
-int ip_optchange(SCR *, int, char *, u_long *);
Index: include/tcl_extern.h
===================================================================
RCS file: /cvs/src/usr.bin/vi/include/tcl_extern.h,v
retrieving revision 1.3
diff -u -u -r1.3 tcl_extern.h
--- include/tcl_extern.h 16 Feb 2002 21:27:58 -0000 1.3
+++ include/tcl_extern.h 13 Oct 2014 19:56:05 -0000
@@ -1,3 +0,0 @@
-/* $OpenBSD: tcl_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */
-
-int tcl_init(GS *);
Index: include/tk_extern.h
===================================================================
RCS file: /cvs/src/usr.bin/vi/include/tk_extern.h,v
retrieving revision 1.3
diff -u -u -r1.3 tk_extern.h
--- include/tk_extern.h 16 Feb 2002 21:27:58 -0000 1.3
+++ include/tk_extern.h 13 Oct 2014 19:56:05 -0000
@@ -1,31 +0,0 @@
-/* $OpenBSD: tk_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */
-
-int tk_addstr(SCR *, const char *, size_t);
-int tk_attr(SCR *, scr_attr_t, int);
-int tk_baud(SCR *, u_long *);
-int tk_bell(SCR *);
-int tk_clrtoeol(SCR *);
-int tk_cursor(SCR *, size_t *, size_t *);
-int tk_deleteln(SCR *);
-int tk_ex_adjust(SCR *, exadj_t);
-int tk_insertln(SCR *);
-int tk_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
-int tk_move(SCR *, size_t, size_t);
-int tk_refresh(SCR *, int);
-int tk_rename(SCR *);
-int tk_suspend(SCR *, int *);
-void tk_usage(void);
-int tk_event(SCR *, EVENT *, u_int32_t, int);
-int tk_key(ClientData, Tcl_Interp *, int, char *[]);
-int tk_screen(SCR *, u_int32_t);
-int tk_quit(GS *);
-int tk_term_init(SCR *);
-int tk_term_end(GS *);
-int tk_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
-int tk_optchange(SCR *, int, char *, u_long *);
-int tk_ssize(SCR *, int, size_t *, size_t *, int *);
-int tk_op(ClientData, Tcl_Interp *, int, char *[]);
-int tk_opt_init(ClientData, Tcl_Interp *, int, char *[]);
-int tk_opt_set(ClientData, Tcl_Interp *, int, char *[]);
-int tk_version(ClientData, Tcl_Interp *, int, char *[]);
-void tk_msg(SCR *, mtype_t, char *, size_t);
