socsvn commit: r223243 - in soc2011/zy/nvi-iconv/head/usr.bin/nvi: build cl common ex include ip perl_api tcl_api vi

zy at FreeBSD.org zy at FreeBSD.org
Tue Jun 14 20:22:05 UTC 2011


Author: zy
Date: Tue Jun 14 20:22:03 2011
New Revision: 223243
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223243

Log:
  include/ should contains only header replacements.
  Merge nvi-1.8x's layout to here.

Added:
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/cl_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/com_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ex_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ip_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/perl_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/tcl_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/extern.h
     - copied unchanged from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/vi_extern.h
Deleted:
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/cl_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/com_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ex_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ip_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/perl_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/tcl_extern.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/vi_extern.h
Modified:
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/distrib
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/common.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/ex.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/ip.h
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perl.xs
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perlsfio.c
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/tcl.c
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/vi.h

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/distrib
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/distrib	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/distrib	Tue Jun 14 20:22:03 2011	(r223243)
@@ -14,13 +14,13 @@
 chmod 555 configure config.guess config.sub install-sh
 
 # Build include files.
-f=../include/cl_extern.h
+f=../cl/extern.h
 echo "Building $f"
 rm -f $f
 sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../cl/*.c > $f
 chmod 444 $f
 
-f=../include/com_extern.h
+f=../common/extern.h
 echo "Building $f"
 rm -f $f
 sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../clib/*.c ../common/*.c > $f
@@ -32,14 +32,14 @@
 awk -f ../ex/ex.awk ../ex/ex_cmd.c > $f
 chmod 444 $f
 
-f=../include/ex_extern.h
+f=../ex/extern.h
 echo "Building $f"
 rm -f $f
 sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../ex/*.c > $f
 chmod 444 $f
 
 if [ -d ../ip ]; then
-	f=../include/ip_extern.h
+	f=../ip/extern.h
 	echo "Building $f"
 	rm -f $f
 	sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../ip/*.c > $f
@@ -52,19 +52,19 @@
 awk -f ../common/options.awk ../common/options.c > $f
 chmod 444 $f
 
-f=../include/perl_extern.h
+f=../perl_api/extern.h
 echo "Building $f"
 rm -f $f
 sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../perl_api/*.xs ../perl_api/*.c > $f
 chmod 444 $f
 
-f=../include/tcl_extern.h
+f=../tcl_api/extern.h
 echo "Building $f"
 rm -f $f
 sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../tcl_api/*.c > $f
 chmod 444 $f
 
-f=../include/vi_extern.h
+f=../vi/extern.h
 echo "Building $f"
 rm -f $f
 sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../vi/*.c > $f

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl.h
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl.h	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl.h	Tue Jun 14 20:22:03 2011	(r223243)
@@ -75,4 +75,4 @@
 #define	FALSE	0
 #endif
 
-#include "cl_extern.h"
+#include "extern.h"

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/cl_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/cl_extern.h)
@@ -0,0 +1,56 @@
+#ifndef HAVE_CURSES_ADDNSTR
+int addnstr __P((char *, int));
+#endif
+#ifndef HAVE_CURSES_BEEP
+void beep __P((void));
+#endif
+#ifndef HAVE_CURSES_FLASH
+void flash __P((void));
+#endif
+#ifndef HAVE_CURSES_IDLOK
+void idlok __P((WINDOW *, int));
+#endif
+#ifndef HAVE_CURSES_KEYPAD
+int keypad __P((void *, int));
+#endif
+#ifndef HAVE_CURSES_NEWTERM
+void *newterm __P((const char *, FILE *, FILE *));
+#endif
+#ifndef HAVE_CURSES_SETUPTERM
+void setupterm __P((char *, int, int *));
+#endif
+#ifdef HAVE_CURSES_TIGETSTR
+char *tigetstr();
+#else
+char *tigetstr __P((char *));
+#endif
+#ifndef HAVE_CURSES_TIGETSTR
+int tigetnum __P((char *));
+#endif
+int cl_addstr __P((SCR *, const char *, size_t));
+int cl_attr __P((SCR *, scr_attr_t, int));
+int cl_baud __P((SCR *, u_long *));
+int cl_bell __P((SCR *));
+int cl_clrtoeol __P((SCR *));
+int cl_cursor __P((SCR *, size_t *, size_t *));
+int cl_deleteln __P((SCR *));
+int cl_ex_adjust __P((SCR *, exadj_t));
+int cl_insertln __P((SCR *));
+int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+int cl_move __P((SCR *, size_t, size_t));
+int cl_refresh __P((SCR *, int));
+int cl_rename __P((SCR *, char *, int));
+int cl_suspend __P((SCR *, int *));
+void cl_usage __P((void));
+int sig_init __P((GS *, SCR *));
+int cl_event __P((SCR *, EVENT *, u_int32_t, int));
+int cl_screen __P((SCR *, u_int32_t));
+int cl_quit __P((GS *));
+int cl_getcap __P((SCR *, char *, char **));
+int cl_term_init __P((SCR *));
+int cl_term_end __P((GS *));
+int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+int cl_optchange __P((SCR *, int, char *, u_long *));
+int cl_omesg __P((SCR *, CL_PRIVATE *, int));
+int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
+int cl_putchar __P((int));

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/common.h
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/common.h	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/common.h	Tue Jun 14 20:22:03 2011	(r223243)
@@ -93,4 +93,4 @@
 #include "log.h"
 #include "mem.h"
 
-#include "com_extern.h"
+#include "extern.h"

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/com_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/common/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/com_extern.h)
@@ -0,0 +1,199 @@
+#ifndef HAVE_BSEARCH
+void	*bsearch __P((const void *, const void *, size_t,
+   size_t, int (*)(const void *, const void *)));
+#endif
+#ifndef HAVE_SETENV
+int setenv __P((const char *, const char *, int));
+#endif
+#ifndef HAVE_UNSETENV
+void unsetenv __P((const char *));
+#endif
+#ifndef HAVE_GETHOSTNAME
+int gethostname __P((char *, int));
+#endif
+#ifndef HAVE_GETOPT
+int getopt __P((int, char * const *, const char *)); 
+#endif
+#ifndef HAVE_MEMCHR
+void *memchr __P((const void *, int, size_t));
+#endif
+#ifndef HAVE_MEMCPY
+void *memcpy __P((void *, const void *, size_t));
+#endif
+#ifndef HAVE_MEMMOVE
+void *memmove __P((void *, const void *, size_t));
+#endif
+#ifndef HAVE_MEMSET
+void *memset __P((void *, int, size_t));
+#endif
+#ifndef HAVE_MKSTEMP
+int mkstemp __P((char *));
+#endif
+#ifndef HAVE_MMAP
+char *mmap __P((char *, size_t, int, int, int, off_t));
+#endif
+#ifndef HAVE_MMAP
+int munmap __P((char *, size_t));
+#endif
+#ifndef HAVE_SNPRINTF
+int snprintf __P((char *, size_t, const char *, ...));
+#endif
+#ifndef HAVE_STRDUP
+char *strdup __P((const char *));
+#endif
+#ifndef HAVE_STRERROR
+char *strerror __P((int));
+#endif
+#ifndef HAVE_STRPBRK
+char *strpbrk __P((const char *, const char *));
+#endif
+#ifndef HAVE_STRSEP
+char *strsep __P((char **, const char *));
+#endif
+#ifndef HAVE_STRTOL
+long strtol __P((const char *, char **, int));
+#endif
+#ifndef HAVE_STRTOUL
+unsigned long strtoul __P((const char *, char **, int));
+#endif
+#ifndef HAVE_VSNPRINTF
+int vsnprintf __P((char *, size_t, const char *, ...));
+#endif
+SCR *api_fscreen __P((int, char *));
+int api_aline __P((SCR *, recno_t, char *, size_t));
+int api_dline __P((SCR *, recno_t));
+int api_gline __P((SCR *, recno_t, char **, size_t *));
+int api_iline __P((SCR *, recno_t, char *, size_t));
+int api_lline __P((SCR *, recno_t *));
+int api_sline __P((SCR *, recno_t, char *, size_t));
+int api_getmark __P((SCR *, int, MARK *));
+int api_setmark __P((SCR *, int, MARK *));
+int api_nextmark __P((SCR *, int, char *));
+int api_getcursor __P((SCR *, MARK *));
+int api_setcursor __P((SCR *, MARK *));
+void api_emessage __P((SCR *, char *));
+void api_imessage __P((SCR *, char *));
+int api_edit __P((SCR *, char *, SCR **, int));
+int api_escreen __P((SCR *));
+int api_swscreen __P((SCR *, SCR *));
+int api_map __P((SCR *, char *, char *, size_t));
+int api_unmap __P((SCR *, char *));
+int api_opts_get __P((SCR *, char *, char **, int *));
+int api_opts_set __P((SCR *, char *, char *, u_long, int));
+int api_run_str __P((SCR *, char *));
+int cut __P((SCR *, CHAR_T *, MARK *, MARK *, int));
+int cut_line __P((SCR *, recno_t, size_t, size_t, CB *));
+void cut_close __P((GS *));
+TEXT *text_init __P((SCR *, const char *, size_t, size_t));
+void text_lfree __P((TEXTH *));
+void text_free __P((TEXT *));
+int del __P((SCR *, MARK *, MARK *, int));
+FREF *file_add __P((SCR *, CHAR_T *));
+int file_init __P((SCR *, FREF *, char *, int));
+int file_end __P((SCR *, EXF *, int));
+int file_write __P((SCR *, MARK *, MARK *, char *, int));
+int file_m1 __P((SCR *, int, int));
+int file_m2 __P((SCR *, int));
+int file_m3 __P((SCR *, int));
+int file_aw __P((SCR *, int));
+void set_alt_name __P((SCR *, char *));
+lockr_t file_lock __P((SCR *, char *, int *, int, int));
+int v_key_init __P((SCR *));
+void v_key_ilookup __P((SCR *));
+size_t v_key_len __P((SCR *, ARG_CHAR_T));
+CHAR_T *v_key_name __P((SCR *, ARG_CHAR_T));
+int v_key_val __P((SCR *, ARG_CHAR_T));
+int v_event_push __P((SCR *, EVENT *, CHAR_T *, size_t, u_int));
+int v_event_get __P((SCR *, EVENT *, int, u_int32_t));
+void v_event_err __P((SCR *, EVENT *));
+int v_event_flush __P((SCR *, u_int));
+int db_eget __P((SCR *, recno_t, char **, size_t *, int *));
+int db_get __P((SCR *, recno_t, u_int32_t, char **, size_t *));
+int db_delete __P((SCR *, recno_t));
+int db_append __P((SCR *, int, recno_t, char *, size_t));
+int db_insert __P((SCR *, recno_t, char *, size_t));
+int db_set __P((SCR *, recno_t, char *, size_t));
+int db_exist __P((SCR *, recno_t));
+int db_last __P((SCR *, recno_t *));
+void db_err __P((SCR *, recno_t));
+int log_init __P((SCR *, EXF *));
+int log_end __P((SCR *, EXF *));
+int log_cursor __P((SCR *));
+int log_line __P((SCR *, recno_t, u_int));
+int log_mark __P((SCR *, LMARK *));
+int log_backward __P((SCR *, MARK *));
+int log_setline __P((SCR *));
+int log_forward __P((SCR *, MARK *));
+int editor __P((GS *, int, char *[]));
+void v_end __P((GS *));
+int mark_init __P((SCR *, EXF *));
+int mark_end __P((SCR *, EXF *));
+int mark_get __P((SCR *, ARG_CHAR_T, MARK *, mtype_t));
+int mark_set __P((SCR *, ARG_CHAR_T, MARK *, int));
+int mark_insdel __P((SCR *, lnop_t, recno_t));
+void msgq __P((SCR *, mtype_t, const char *, ...));
+void msgq_str __P((SCR *, mtype_t, char *, char *));
+void mod_rpt __P((SCR *));
+void msgq_status __P((SCR *, recno_t, u_int));
+int msg_open __P((SCR *, char *));
+void msg_close __P((GS *));
+const char *msg_cmsg __P((SCR *, cmsg_t, size_t *));
+const char *msg_cat __P((SCR *, const char *, size_t *));
+char *msg_print __P((SCR *, const char *, int *));
+int opts_init __P((SCR *, int *));
+int opts_set __P((SCR *, ARGS *[], char *));
+int o_set __P((SCR *, int, u_int, char *, u_long));
+int opts_empty __P((SCR *, int, int));
+void opts_dump __P((SCR *, enum optdisp));
+int opts_save __P((SCR *, FILE *));
+OPTLIST const *opts_search __P((char *));
+void opts_nomatch __P((SCR *, char *));
+int opts_copy __P((SCR *, SCR *));
+void opts_free __P((SCR *));
+int f_altwerase __P((SCR *, OPTION *, char *, u_long *));
+int f_columns __P((SCR *, OPTION *, char *, u_long *));
+int f_lines __P((SCR *, OPTION *, char *, u_long *));
+int f_lisp __P((SCR *, OPTION *, char *, u_long *));
+int f_msgcat __P((SCR *, OPTION *, char *, u_long *));
+int f_paragraph __P((SCR *, OPTION *, char *, u_long *));
+int f_print __P((SCR *, OPTION *, char *, u_long *));
+int f_readonly __P((SCR *, OPTION *, char *, u_long *));
+int f_recompile __P((SCR *, OPTION *, char *, u_long *));
+int f_reformat __P((SCR *, OPTION *, char *, u_long *));
+int f_section __P((SCR *, OPTION *, char *, u_long *));
+int f_ttywerase __P((SCR *, OPTION *, char *, u_long *));
+int f_w300 __P((SCR *, OPTION *, char *, u_long *));
+int f_w1200 __P((SCR *, OPTION *, char *, u_long *));
+int f_w9600 __P((SCR *, OPTION *, char *, u_long *));
+int f_window __P((SCR *, OPTION *, char *, u_long *));
+int put __P((SCR *, CB *, CHAR_T *, MARK *, MARK *, int));
+int rcv_tmp __P((SCR *, EXF *, char *));
+int rcv_init __P((SCR *));
+int rcv_sync __P((SCR *, u_int));
+int rcv_list __P((SCR *));
+int rcv_read __P((SCR *, FREF *));
+int screen_init __P((GS *, SCR *, SCR **));
+int screen_end __P((SCR *));
+SCR *screen_next __P((SCR *));
+int f_search __P((SCR *,
+   MARK *, MARK *, char *, size_t, char **, u_int));
+int b_search __P((SCR *,
+   MARK *, MARK *, char *, size_t, char **, u_int));
+void search_busy __P((SCR *, busy_t));
+int seq_set __P((SCR *, CHAR_T *,
+   size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int));
+int seq_delete __P((SCR *, CHAR_T *, size_t, seq_t));
+int seq_mdel __P((SEQ *));
+SEQ *seq_find
+   __P((SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *));
+void seq_close __P((GS *));
+int seq_dump __P((SCR *, seq_t, int));
+int seq_save __P((SCR *, FILE *, char *, seq_t));
+int e_memcmp __P((CHAR_T *, EVENT *, size_t));
+void *binc __P((SCR *, void *, size_t *, size_t));
+int nonblank __P((SCR *, recno_t, size_t *));
+char *tail __P((char *));
+CHAR_T *v_strdup __P((SCR *, const CHAR_T *, size_t));
+enum nresult nget_uslong __P((u_long *, const char *, char **, int));
+enum nresult nget_slong __P((long *, const char *, char **, int));
+void TRACE __P((SCR *, const char *, ...));

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/ex.h
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/ex.h	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/ex.h	Tue Jun 14 20:22:03 2011	(r223243)
@@ -228,4 +228,4 @@
 } tagmsg_t;
 
 #include "ex_def.h"
-#include "ex_extern.h"
+#include "extern.h"

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ex_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/ex/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ex_extern.h)
@@ -0,0 +1,128 @@
+int ex __P((SCR **));
+int ex_cmd __P((SCR *));
+int ex_range __P((SCR *, EXCMD *, int *));
+int ex_is_abbrev __P((char *, size_t));
+int ex_is_unmap __P((char *, size_t));
+void ex_badaddr
+   __P((SCR *, EXCMDLIST const *, enum badaddr, enum nresult));
+int ex_abbr __P((SCR *, EXCMD *));
+int ex_unabbr __P((SCR *, EXCMD *));
+int ex_append __P((SCR *, EXCMD *));
+int ex_change __P((SCR *, EXCMD *));
+int ex_insert __P((SCR *, EXCMD *));
+int ex_next __P((SCR *, EXCMD *));
+int ex_prev __P((SCR *, EXCMD *));
+int ex_rew __P((SCR *, EXCMD *));
+int ex_args __P((SCR *, EXCMD *));
+char **ex_buildargv __P((SCR *, EXCMD *, char *));
+int argv_init __P((SCR *, EXCMD *));
+int argv_exp0 __P((SCR *, EXCMD *, char *, size_t));
+int argv_exp1 __P((SCR *, EXCMD *, char *, size_t, int));
+int argv_exp2 __P((SCR *, EXCMD *, char *, size_t));
+int argv_exp3 __P((SCR *, EXCMD *, char *, size_t));
+int argv_free __P((SCR *));
+int ex_at __P((SCR *, EXCMD *));
+int ex_bang __P((SCR *, EXCMD *));
+int ex_cd __P((SCR *, EXCMD *));
+int ex_cscope __P((SCR *, EXCMD *));
+int cscope_display __P((SCR *));
+int cscope_search __P((SCR *, TAGQ *, TAG *));
+int ex_delete __P((SCR *, EXCMD *));
+int ex_display __P((SCR *, EXCMD *));
+int ex_edit __P((SCR *, EXCMD *));
+int ex_equal __P((SCR *, EXCMD *));
+int ex_file __P((SCR *, EXCMD *));
+int ex_filter __P((SCR *, 
+   EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype));
+int ex_global __P((SCR *, EXCMD *));
+int ex_v __P((SCR *, EXCMD *));
+int ex_g_insdel __P((SCR *, lnop_t, recno_t));
+int ex_screen_copy __P((SCR *, SCR *));
+int ex_screen_end __P((SCR *));
+int ex_optchange __P((SCR *, int, char *, u_long *));
+int ex_exrc __P((SCR *));
+int ex_run_str __P((SCR *, char *, char *, size_t, int, int));
+int ex_join __P((SCR *, EXCMD *));
+int ex_map __P((SCR *, EXCMD *));
+int ex_unmap __P((SCR *, EXCMD *));
+int ex_mark __P((SCR *, EXCMD *));
+int ex_mkexrc __P((SCR *, EXCMD *));
+int ex_copy __P((SCR *, EXCMD *));
+int ex_move __P((SCR *, EXCMD *));
+int ex_open __P((SCR *, EXCMD *));
+int ex_perl __P((SCR*, EXCMD *));
+int ex_preserve __P((SCR *, EXCMD *));
+int ex_recover __P((SCR *, EXCMD *));
+int ex_list __P((SCR *, EXCMD *));
+int ex_number __P((SCR *, EXCMD *));
+int ex_pr __P((SCR *, EXCMD *));
+int ex_print __P((SCR *, EXCMD *, MARK *, MARK *, u_int32_t));
+int ex_ldisplay __P((SCR *, const char *, size_t, size_t, u_int));
+int ex_scprint __P((SCR *, MARK *, MARK *));
+int ex_printf __P((SCR *, const char *, ...));
+int ex_puts __P((SCR *, const char *));
+int ex_fflush __P((SCR *sp));
+int ex_put __P((SCR *, EXCMD *));
+int ex_quit __P((SCR *, EXCMD *));
+int ex_read __P((SCR *, EXCMD *));
+int ex_readfp __P((SCR *, char *, FILE *, MARK *, recno_t *, int));
+int ex_bg __P((SCR *, EXCMD *));
+int ex_fg __P((SCR *, EXCMD *));
+int ex_resize __P((SCR *, EXCMD *));
+int ex_sdisplay __P((SCR *));
+int ex_script __P((SCR *, EXCMD *));
+int sscr_exec __P((SCR *, recno_t));
+int sscr_input __P((SCR *));
+int sscr_end __P((SCR *));
+int ex_set __P((SCR *, EXCMD *));
+int ex_shell __P((SCR *, EXCMD *));
+int ex_exec_proc __P((SCR *, EXCMD *, char *, const char *, int));
+int proc_wait __P((SCR *, long, const char *, int, int));
+int ex_shiftl __P((SCR *, EXCMD *));
+int ex_shiftr __P((SCR *, EXCMD *));
+int ex_source __P((SCR *, EXCMD *));
+int ex_stop __P((SCR *, EXCMD *));
+int ex_s __P((SCR *, EXCMD *));
+int ex_subagain __P((SCR *, EXCMD *));
+int ex_subtilde __P((SCR *, EXCMD *));
+int re_compile __P((SCR *,
+    char *, size_t, char **, size_t *, regex_t *, u_int));
+void re_error __P((SCR *, int, regex_t *));
+int ex_tag_first __P((SCR *, char *));
+int ex_rtag_push __P((SCR *, EXCMD *));
+int ex_tag_push __P((SCR *, EXCMD *));
+int ex_tag_next __P((SCR *, EXCMD *));
+int ex_tag_prev __P((SCR *, EXCMD *));
+int ex_tag_nswitch __P((SCR *, TAG *, int));
+int ex_tag_Nswitch __P((SCR *, TAG *, int));
+int ex_tag_pop __P((SCR *, EXCMD *));
+int ex_tag_top __P((SCR *, EXCMD *));
+int ex_tag_display __P((SCR *));
+int ex_tag_copy __P((SCR *, SCR *));
+int tagq_free __P((SCR *, TAGQ *));
+void tag_msg __P((SCR *, tagmsg_t, char *));
+int ex_tagf_alloc __P((SCR *, char *));
+int ex_tag_free __P((SCR *));
+int ex_tcl __P((SCR*, EXCMD *));
+int ex_txt __P((SCR *, TEXTH *, ARG_CHAR_T, u_int32_t));
+int ex_undo __P((SCR *, EXCMD *));
+int ex_help __P((SCR *, EXCMD *));
+int ex_usage __P((SCR *, EXCMD *));
+int ex_viusage __P((SCR *, EXCMD *));
+void ex_cinit __P((EXCMD *,
+   int, int, recno_t, recno_t, int, ARGS **));
+void ex_cadd __P((EXCMD *, ARGS *, char *, size_t));
+int ex_getline __P((SCR *, FILE *, size_t *));
+int ex_ncheck __P((SCR *, int));
+int ex_init __P((SCR *));
+void ex_emsg __P((SCR *, char *, exm_t));
+int ex_version __P((SCR *, EXCMD *));
+int ex_visual __P((SCR *, EXCMD *));
+int ex_wn __P((SCR *, EXCMD *));
+int ex_wq __P((SCR *, EXCMD *));
+int ex_write __P((SCR *, EXCMD *));
+int ex_xit __P((SCR *, EXCMD *));
+int ex_writefp __P((SCR *,
+   char *, FILE *, MARK *, MARK *, u_long *, u_long *, int));
+int ex_yank __P((SCR *, EXCMD *));
+int ex_z __P((SCR *, EXCMD *));

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ip_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/ip_extern.h)
@@ -0,0 +1,23 @@
+int ip_addstr __P((SCR *, const char *, size_t));
+int ip_attr __P((SCR *, scr_attr_t, int));
+int ip_baud __P((SCR *, u_long *));
+int ip_bell __P((SCR *));
+void ip_busy __P((SCR *, const char *, busy_t));
+int ip_clrtoeol __P((SCR *));
+int ip_cursor __P((SCR *, size_t *, size_t *));
+int ip_deleteln __P((SCR *));
+int ip_ex_adjust __P((SCR *, exadj_t));
+int ip_insertln __P((SCR *));
+int ip_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+int ip_move __P((SCR *, size_t, size_t));
+int ip_refresh __P((SCR *, int));
+int ip_rename __P((SCR *));
+int ip_suspend __P((SCR *, int *));
+void ip_usage __P((void));
+int ip_event __P((SCR *, EVENT *, u_int32_t, int));
+int ip_screen __P((SCR *, u_int32_t));
+int ip_quit __P((GS *));
+int ip_term_init __P((SCR *));
+int ip_term_end __P((GS *));
+int ip_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+int ip_optchange __P((SCR *, int, char *, u_long *));

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/ip.h
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/ip.h	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/ip/ip.h	Tue Jun 14 20:22:03 2011	(r223243)
@@ -89,4 +89,4 @@
 #define	IPO_RENAME	11	/* Rename the screen: IPO_STR. */
 #define	IPO_REWRITE	12	/* Rewrite a line: IPO_INT. */
 
-#include "ip_extern.h"
+#include "extern.h"

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/perl_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/perl_extern.h)
@@ -0,0 +1,8 @@
+int perl_end __P((GS *));
+int perl_init __P((SCR *));
+int perl_screen_end __P((SCR*));
+int perl_ex_perl __P((SCR*, CHAR_T *, size_t, recno_t, recno_t));
+int perl_ex_perldo __P((SCR*, CHAR_T *, size_t, recno_t, recno_t));
+#ifdef USE_SFIO
+Sfdisc_t* sfdcnewnvi __P((SCR*));
+#endif

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perl.xs
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perl.xs	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perl.xs	Tue Jun 14 20:22:03 2011	(r223243)
@@ -41,7 +41,7 @@
 #include <perl.h>
 #include <XSUB.h>
 
-#include "perl_extern.h"
+#include "extern.h"
 
 static void msghandler __P((SCR *, mtype_t, char *, size_t));
 

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perlsfio.c
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perlsfio.c	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/perl_api/perlsfio.c	Tue Jun 14 20:22:03 2011	(r223243)
@@ -35,7 +35,7 @@
 #include <perl.h>
 #include <XSUB.h>
 
-#include "perl_extern.h"
+#include "extern.h"
 
 /*
  * PUBLIC: #ifdef USE_SFIO

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/tcl_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/tcl_extern.h)
@@ -0,0 +1 @@
+int tcl_init __P((GS *));

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/tcl.c
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/tcl.c	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/tcl_api/tcl.c	Tue Jun 14 20:22:03 2011	(r223243)
@@ -31,7 +31,7 @@
 #include <unistd.h>
 
 #include "../common/common.h"
-#include "tcl_extern.h"
+#include "extern.h"
 
 static int  getint __P((Tcl_Interp *, char *, char *, int *));
 static int  getscreenid __P((Tcl_Interp *, SCR **, char *, char *));

Copied: soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/extern.h (from r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/vi_extern.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/extern.h	Tue Jun 14 20:22:03 2011	(r223243, copy of r223241, soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/vi_extern.h)
@@ -0,0 +1,142 @@
+int cs_init __P((SCR *, VCS *));
+int cs_next __P((SCR *, VCS *));
+int cs_fspace __P((SCR *, VCS *));
+int cs_fblank __P((SCR *, VCS *));
+int cs_prev __P((SCR *, VCS *));
+int cs_bblank __P((SCR *, VCS *));
+int v_at __P((SCR *, VICMD *));
+int v_chrepeat __P((SCR *, VICMD *));
+int v_chrrepeat __P((SCR *, VICMD *));
+int v_cht __P((SCR *, VICMD *));
+int v_chf __P((SCR *, VICMD *));
+int v_chT __P((SCR *, VICMD *));
+int v_chF __P((SCR *, VICMD *));
+int v_delete __P((SCR *, VICMD *));
+int v_again __P((SCR *, VICMD *));
+int v_exmode __P((SCR *, VICMD *));
+int v_join __P((SCR *, VICMD *));
+int v_shiftl __P((SCR *, VICMD *));
+int v_shiftr __P((SCR *, VICMD *));
+int v_suspend __P((SCR *, VICMD *));
+int v_switch __P((SCR *, VICMD *));
+int v_tagpush __P((SCR *, VICMD *));
+int v_tagpop __P((SCR *, VICMD *));
+int v_filter __P((SCR *, VICMD *));
+int v_event_exec __P((SCR *, VICMD *));
+int v_ex __P((SCR *, VICMD *));
+int v_ecl_exec __P((SCR *));
+int v_increment __P((SCR *, VICMD *));
+int v_screen_copy __P((SCR *, SCR *));
+int v_screen_end __P((SCR *));
+int v_optchange __P((SCR *, int, char *, u_long *));
+int v_iA __P((SCR *, VICMD *));
+int v_ia __P((SCR *, VICMD *));
+int v_iI __P((SCR *, VICMD *));
+int v_ii __P((SCR *, VICMD *));
+int v_iO __P((SCR *, VICMD *));
+int v_io __P((SCR *, VICMD *));
+int v_change __P((SCR *, VICMD *));
+int v_Replace __P((SCR *, VICMD *));
+int v_subst __P((SCR *, VICMD *));
+int v_left __P((SCR *, VICMD *));
+int v_cfirst __P((SCR *, VICMD *));
+int v_first __P((SCR *, VICMD *));
+int v_ncol __P((SCR *, VICMD *));
+int v_zero __P((SCR *, VICMD *));
+int v_mark __P((SCR *, VICMD *));
+int v_bmark __P((SCR *, VICMD *));
+int v_fmark __P((SCR *, VICMD *));
+int v_match __P((SCR *, VICMD *));
+int v_paragraphf __P((SCR *, VICMD *));
+int v_paragraphb __P((SCR *, VICMD *));
+int v_buildps __P((SCR *, char *, char *));
+int v_Put __P((SCR *, VICMD *));
+int v_put __P((SCR *, VICMD *));
+int v_redraw __P((SCR *, VICMD *));
+int v_replace __P((SCR *, VICMD *));
+int v_right __P((SCR *, VICMD *));
+int v_dollar __P((SCR *, VICMD *));
+int v_screen __P((SCR *, VICMD *));
+int v_lgoto __P((SCR *, VICMD *));
+int v_home __P((SCR *, VICMD *));
+int v_middle __P((SCR *, VICMD *));
+int v_bottom __P((SCR *, VICMD *));
+int v_up __P((SCR *, VICMD *));
+int v_cr __P((SCR *, VICMD *));
+int v_down __P((SCR *, VICMD *));
+int v_hpageup __P((SCR *, VICMD *));
+int v_hpagedown __P((SCR *, VICMD *));
+int v_pagedown __P((SCR *, VICMD *));
+int v_pageup __P((SCR *, VICMD *));
+int v_lineup __P((SCR *, VICMD *));
+int v_linedown __P((SCR *, VICMD *));
+int v_searchb __P((SCR *, VICMD *));
+int v_searchf __P((SCR *, VICMD *));
+int v_searchN __P((SCR *, VICMD *));
+int v_searchn __P((SCR *, VICMD *));
+int v_searchw __P((SCR *, VICMD *));
+int v_correct __P((SCR *, VICMD *, int));
+int v_sectionf __P((SCR *, VICMD *));
+int v_sectionb __P((SCR *, VICMD *));
+int v_sentencef __P((SCR *, VICMD *));
+int v_sentenceb __P((SCR *, VICMD *));
+int v_status __P((SCR *, VICMD *));
+int v_tcmd __P((SCR *, VICMD *, ARG_CHAR_T, u_int));
+int v_txt __P((SCR *, VICMD *, MARK *,
+   const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t));
+int v_txt_auto __P((SCR *, recno_t, TEXT *, size_t, TEXT *));
+int v_ulcase __P((SCR *, VICMD *));
+int v_mulcase __P((SCR *, VICMD *));
+int v_Undo __P((SCR *, VICMD *));
+int v_undo __P((SCR *, VICMD *));
+void v_eof __P((SCR *, MARK *));
+void v_eol __P((SCR *, MARK *));
+void v_nomove __P((SCR *));
+void v_sof __P((SCR *, MARK *));
+void v_sol __P((SCR *));
+int v_isempty __P((char *, size_t));
+void v_emsg __P((SCR *, char *, vim_t));
+int v_wordW __P((SCR *, VICMD *));
+int v_wordw __P((SCR *, VICMD *));
+int v_wordE __P((SCR *, VICMD *));
+int v_worde __P((SCR *, VICMD *));
+int v_wordB __P((SCR *, VICMD *));
+int v_wordb __P((SCR *, VICMD *));
+int v_xchar __P((SCR *, VICMD *));
+int v_Xchar __P((SCR *, VICMD *));
+int v_yank __P((SCR *, VICMD *));
+int v_z __P((SCR *, VICMD *));
+int vs_crel __P((SCR *, long));
+int v_zexit __P((SCR *, VICMD *));
+int vi __P((SCR **));
+int vs_line __P((SCR *, SMAP *, size_t *, size_t *));
+int vs_number __P((SCR *));
+void vs_busy __P((SCR *, const char *, busy_t));
+void vs_home __P((SCR *));
+void vs_update __P((SCR *, const char *, const char *));
+void vs_msg __P((SCR *, mtype_t, char *, size_t));
+int vs_ex_resolve __P((SCR *, int *));
+int vs_resolve __P((SCR *, SCR *, int));
+int vs_repaint __P((SCR *, EVENT *));
+int vs_refresh __P((SCR *, int));
+int vs_column __P((SCR *, size_t *));
+size_t vs_screens __P((SCR *, recno_t, size_t *));
+size_t vs_columns __P((SCR *, char *, recno_t, size_t *, size_t *));
+size_t vs_rcm __P((SCR *, recno_t, int));
+size_t vs_colpos __P((SCR *, recno_t, size_t));
+int vs_change __P((SCR *, recno_t, lnop_t));
+int vs_sm_fill __P((SCR *, recno_t, pos_t));
+int vs_sm_scroll __P((SCR *, MARK *, recno_t, scroll_t));
+int vs_sm_1up __P((SCR *));
+int vs_sm_1down __P((SCR *));
+int vs_sm_next __P((SCR *, SMAP *, SMAP *));
+int vs_sm_prev __P((SCR *, SMAP *, SMAP *));
+int vs_sm_cursor __P((SCR *, SMAP **));
+int vs_sm_position __P((SCR *, MARK *, u_long, pos_t));
+recno_t vs_sm_nlines __P((SCR *, SMAP *, recno_t, size_t));
+int vs_split __P((SCR *, SCR *, int));
+int vs_discard __P((SCR *, SCR **));
+int vs_fg __P((SCR *, SCR **, CHAR_T *, int));
+int vs_bg __P((SCR *));
+int vs_swap __P((SCR *, SCR **, char *));
+int vs_resize __P((SCR *, long, adj_t));

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/vi.h
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/vi.h	Tue Jun 14 20:20:30 2011	(r223242)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/vi/vi.h	Tue Jun 14 20:22:03 2011	(r223243)
@@ -374,4 +374,4 @@
 	VIM_NOCOM, VIM_NOCOM_B, VIM_USAGE, VIM_WRESIZE
 } vim_t;
 
-#include "vi_extern.h"
+#include "extern.h"


More information about the svn-soc-all mailing list