the bitrig master branch has been updated by natano with 13 new commits: commit 951f60452faeb5c261c6e998b576b7afc7b70b70 diff: https://github.com/bitrig/bitrig/commit/951f604 author: Martin Natano <[email protected]> date: Sat Jan 3 18:21:07 2015 +0100
Remove config.h; ok pedro@ M usr.bin/vi/build/Makefile D usr.bin/vi/build/config.h M usr.bin/vi/cl/cl_funcs.c M usr.bin/vi/cl/cl_main.c M usr.bin/vi/cl/cl_read.c M usr.bin/vi/cl/cl_screen.c M usr.bin/vi/cl/cl_term.c M usr.bin/vi/common/cut.c M usr.bin/vi/common/delete.c M usr.bin/vi/common/exf.c M usr.bin/vi/common/key.c M usr.bin/vi/common/line.c M usr.bin/vi/common/log.c M usr.bin/vi/common/main.c M usr.bin/vi/common/mark.c M usr.bin/vi/common/msg.c M usr.bin/vi/common/options.c M usr.bin/vi/common/options_f.c M usr.bin/vi/common/put.c M usr.bin/vi/common/recover.c M usr.bin/vi/common/screen.c M usr.bin/vi/common/search.c M usr.bin/vi/common/seq.c M usr.bin/vi/common/util.c M usr.bin/vi/ex/ex.c M usr.bin/vi/ex/ex_abbrev.c M usr.bin/vi/ex/ex_append.c M usr.bin/vi/ex/ex_args.c M usr.bin/vi/ex/ex_argv.c M usr.bin/vi/ex/ex_at.c M usr.bin/vi/ex/ex_bang.c M usr.bin/vi/ex/ex_cd.c M usr.bin/vi/ex/ex_cmd.c M usr.bin/vi/ex/ex_cscope.c M usr.bin/vi/ex/ex_delete.c M usr.bin/vi/ex/ex_display.c M usr.bin/vi/ex/ex_edit.c M usr.bin/vi/ex/ex_equal.c M usr.bin/vi/ex/ex_file.c M usr.bin/vi/ex/ex_filter.c M usr.bin/vi/ex/ex_global.c M usr.bin/vi/ex/ex_init.c M usr.bin/vi/ex/ex_join.c M usr.bin/vi/ex/ex_map.c M usr.bin/vi/ex/ex_mark.c M usr.bin/vi/ex/ex_mkexrc.c M usr.bin/vi/ex/ex_move.c M usr.bin/vi/ex/ex_open.c M usr.bin/vi/ex/ex_preserve.c M usr.bin/vi/ex/ex_print.c M usr.bin/vi/ex/ex_put.c M usr.bin/vi/ex/ex_quit.c M usr.bin/vi/ex/ex_read.c M usr.bin/vi/ex/ex_screen.c M usr.bin/vi/ex/ex_script.c M usr.bin/vi/ex/ex_set.c M usr.bin/vi/ex/ex_shell.c M usr.bin/vi/ex/ex_shift.c M usr.bin/vi/ex/ex_source.c M usr.bin/vi/ex/ex_stop.c M usr.bin/vi/ex/ex_subst.c M usr.bin/vi/ex/ex_tag.c M usr.bin/vi/ex/ex_txt.c M usr.bin/vi/ex/ex_undo.c M usr.bin/vi/ex/ex_usage.c M usr.bin/vi/ex/ex_util.c M usr.bin/vi/ex/ex_version.c M usr.bin/vi/ex/ex_visual.c M usr.bin/vi/ex/ex_write.c M usr.bin/vi/ex/ex_yank.c M usr.bin/vi/ex/ex_z.c M usr.bin/vi/vi/getc.c M usr.bin/vi/vi/v_at.c M usr.bin/vi/vi/v_ch.c M usr.bin/vi/vi/v_cmd.c M usr.bin/vi/vi/v_delete.c M usr.bin/vi/vi/v_ex.c M usr.bin/vi/vi/v_increment.c M usr.bin/vi/vi/v_init.c M usr.bin/vi/vi/v_itxt.c M usr.bin/vi/vi/v_left.c M usr.bin/vi/vi/v_mark.c M usr.bin/vi/vi/v_match.c M usr.bin/vi/vi/v_paragraph.c M usr.bin/vi/vi/v_put.c M usr.bin/vi/vi/v_redraw.c M usr.bin/vi/vi/v_replace.c M usr.bin/vi/vi/v_right.c M usr.bin/vi/vi/v_screen.c M usr.bin/vi/vi/v_scroll.c M usr.bin/vi/vi/v_search.c M usr.bin/vi/vi/v_section.c M usr.bin/vi/vi/v_sentence.c M usr.bin/vi/vi/v_status.c M usr.bin/vi/vi/v_txt.c M usr.bin/vi/vi/v_ulcase.c M usr.bin/vi/vi/v_undo.c M usr.bin/vi/vi/v_util.c M usr.bin/vi/vi/v_word.c M usr.bin/vi/vi/v_xchar.c M usr.bin/vi/vi/v_yank.c M usr.bin/vi/vi/v_z.c M usr.bin/vi/vi/v_zexit.c M usr.bin/vi/vi/vi.c M usr.bin/vi/vi/vs_line.c M usr.bin/vi/vi/vs_msg.c M usr.bin/vi/vi/vs_refresh.c M usr.bin/vi/vi/vs_relative.c M usr.bin/vi/vi/vs_smap.c M usr.bin/vi/vi/vs_split.c commit 9c3c619f285f6a369660d3687af82250251a6b42 diff: https://github.com/bitrig/bitrig/commit/9c3c619 author: Martin Natano <[email protected]> date: Sat Jan 3 17:53:06 2015 +0100 Remove compiler workaround; ok pedro@ M usr.bin/vi/build/Makefile commit 4caa9ec43bafa1cf03586a92baf8ace36913ba9d diff: https://github.com/bitrig/bitrig/commit/4caa9ec author: Martin Natano <[email protected]> date: Sat Jan 3 17:48:15 2015 +0100 Remove SunOS portability code; ok pedro@ M usr.bin/vi/cl/cl_main.c commit d859c46202d82ca00ea3db41100dffd21b8853b4 diff: https://github.com/bitrig/bitrig/commit/d859c46 author: Martin Natano <[email protected]> date: Sat Jan 3 16:52:55 2015 +0100 Remove cl_clrtoeol(), cl_insertln() and cl_putchar(). They were used by the screen interface mechanism, but don't serve any purpose now. ok pedro@ M usr.bin/vi/cl/cl_funcs.c M usr.bin/vi/cl/cl_screen.c M usr.bin/vi/cl/cl_term.c M usr.bin/vi/include/cl_extern.h M usr.bin/vi/vi/v_txt.c M usr.bin/vi/vi/vs_line.c M usr.bin/vi/vi/vs_msg.c M usr.bin/vi/vi/vs_refresh.c M usr.bin/vi/vi/vs_smap.c commit d6badeb9f51ca878c284cc26243db476d737629c diff: https://github.com/bitrig/bitrig/commit/d6badeb author: Martin Natano <[email protected]> date: Sat Jan 3 16:27:40 2015 +0100 Clean up global state. The 'struct _gs' type (aka. GS) contains pointers to screen interface functions, which are set by cl_func_std(), but this mechanism isn't necessary anymore, because the other frontends (tk, motif, ipc) have been removed. The only remaining frontend is curses, which can be used without indirection. Also, the tcl_interp, ip_private and tk_private fields are unused and can be removed. This diff is mostly a mechanical change from scr_* to cl_* (or vs_* in the cases of scr_busy and scr_msg). The benefit is, that the global state is used less, and the code should be more readable, as less indirections are involved when a function is called. ok pedro@ M usr.bin/vi/cl/cl_funcs.c M usr.bin/vi/cl/cl_main.c M usr.bin/vi/cl/cl_read.c M usr.bin/vi/common/gs.h M usr.bin/vi/common/key.c M usr.bin/vi/common/main.c M usr.bin/vi/common/msg.c M usr.bin/vi/common/options.c M usr.bin/vi/common/options_f.c M usr.bin/vi/common/recover.c M usr.bin/vi/common/search.c M usr.bin/vi/common/seq.c M usr.bin/vi/ex/ex.c M usr.bin/vi/ex/ex_append.c M usr.bin/vi/ex/ex_file.c M usr.bin/vi/ex/ex_map.c M usr.bin/vi/ex/ex_print.c M usr.bin/vi/ex/ex_read.c M usr.bin/vi/ex/ex_shell.c M usr.bin/vi/ex/ex_stop.c M usr.bin/vi/ex/ex_txt.c M usr.bin/vi/ex/ex_util.c M usr.bin/vi/ex/ex_write.c M usr.bin/vi/vi/v_ex.c M usr.bin/vi/vi/v_redraw.c M usr.bin/vi/vi/v_txt.c M usr.bin/vi/vi/vi.c M usr.bin/vi/vi/vs_line.c M usr.bin/vi/vi/vs_msg.c M usr.bin/vi/vi/vs_refresh.c M usr.bin/vi/vi/vs_smap.c M usr.bin/vi/vi/vs_split.c commit 71de7a330b65409caac97d883bc984db3912b061 diff: https://github.com/bitrig/bitrig/commit/71de7a3 author: Martin Natano <[email protected]> date: Sat Jan 3 16:20:02 2015 +0100 Remove mvchgat() workaround; ok pedro@ M usr.bin/vi/cl/cl_funcs.c commit 5ec5fffbdf553d0319aac2b6e79544a2afa2a567 diff: https://github.com/bitrig/bitrig/commit/5ec5fff author: Martin Natano <[email protected]> date: Sat Jan 3 16:17:38 2015 +0100 Use DEFFILEMODE where apropriate; ok pedro@ M usr.bin/vi/common/exf.c commit 35cf6abab5aab6431a7cf037e6b094258704efbf diff: https://github.com/bitrig/bitrig/commit/35cf6ab author: Martin Natano <[email protected]> date: Sat Jan 3 16:11:35 2015 +0100 Revise memory handling. The macros in mem.h use "{ ... }" for protection of multiple statements, instead of the safer "do { ... } while (0)" variant. Change the macros to use the latter one and fixes a missing semicolon at a ADD_SPACE_RET() call site. The casts in the allocation macros can be removed, because they are a workaround for systems whose malloc() implementation doesn't return 'void *'. MALLOC_NOMSG and CALLOC_NOMSG do the same as malloc/calloc (after the casts have been removed), thus they should be removed to not confuse the casual reader. The MEMMOVE macro is only used by one caller and the MEMSET macro is never called. Both can be removed (expanding the MEMMOVE caller in place). Also, the diff features some strlen + malloc + strlcpy to strdup, and strlen + malloc + manual memcpy + strlcpy to asprintf conversion. with input from Todd C. Miller (discussed on [email protected]) ok pedro@ M usr.bin/vi/cl/cl_main.c M usr.bin/vi/cl/cl_screen.c M usr.bin/vi/common/cut.c M usr.bin/vi/common/exf.c M usr.bin/vi/common/key.c M usr.bin/vi/common/main.c M usr.bin/vi/common/mark.c M usr.bin/vi/common/mem.h M usr.bin/vi/common/screen.c M usr.bin/vi/common/seq.c M usr.bin/vi/common/util.c M usr.bin/vi/ex/ex_args.c M usr.bin/vi/ex/ex_argv.c M usr.bin/vi/ex/ex_at.c M usr.bin/vi/ex/ex_cscope.c M usr.bin/vi/ex/ex_global.c M usr.bin/vi/ex/ex_init.c M usr.bin/vi/ex/ex_script.c M usr.bin/vi/ex/ex_source.c M usr.bin/vi/ex/ex_subst.c M usr.bin/vi/ex/ex_tag.c M usr.bin/vi/vi/v_init.c M usr.bin/vi/vi/v_paragraph.c M usr.bin/vi/vi/vi.c M usr.bin/vi/vi/vs_msg.c M usr.bin/vi/vi/vs_split.c commit a7a32ea4db8734f0015b5ab299fcf24fd88a43be diff: https://github.com/bitrig/bitrig/commit/a7a32ea author: Martin Natano <[email protected]> date: Sat Jan 3 16:03:37 2015 +0100 The 'conf_t' and 'bmsg_t' types are unused and can be removed. ok pedro@ M usr.bin/vi/common/common.h M usr.bin/vi/common/util.h commit 23682612bb3c1893c830173197aeaabc27d335c7 diff: https://github.com/bitrig/bitrig/commit/2368261 author: Martin Natano <[email protected]> date: Sat Jan 3 16:01:55 2015 +0100 Remove #include workarounds; no binary change; ok pedro@ M usr.bin/vi/common/exf.c M usr.bin/vi/common/recover.c M usr.bin/vi/ex/ex_script.c commit ff28bcd79271155a8463baecde928fca688670d3 diff: https://github.com/bitrig/bitrig/commit/ff28bcd author: Martin Natano <[email protected]> date: Sat Jan 3 15:57:21 2015 +0100 sscr_pty() has been removed; ok pedro@ M usr.bin/vi/ex/ex_script.c commit 1478284cf2b14715ab16c96699a117fcbefb78d6 diff: https://github.com/bitrig/bitrig/commit/1478284 author: Martin Natano <[email protected]> date: Sat Jan 3 15:56:05 2015 +0100 Remove prototypes from comments, we have them two lines below anyways. ok pedro@ M usr.bin/vi/cl/cl_funcs.c M usr.bin/vi/cl/cl_main.c M usr.bin/vi/cl/cl_read.c M usr.bin/vi/cl/cl_screen.c M usr.bin/vi/cl/cl_term.c M usr.bin/vi/common/cut.c M usr.bin/vi/common/delete.c M usr.bin/vi/common/exf.c M usr.bin/vi/common/key.c M usr.bin/vi/common/line.c M usr.bin/vi/common/log.c M usr.bin/vi/common/main.c M usr.bin/vi/common/mark.c M usr.bin/vi/common/msg.c M usr.bin/vi/common/options.c M usr.bin/vi/common/options_f.c M usr.bin/vi/common/put.c M usr.bin/vi/common/recover.c M usr.bin/vi/common/screen.c M usr.bin/vi/common/search.c M usr.bin/vi/common/seq.c M usr.bin/vi/common/util.c M usr.bin/vi/ex/ex.c M usr.bin/vi/ex/ex_abbrev.c M usr.bin/vi/ex/ex_append.c M usr.bin/vi/ex/ex_args.c M usr.bin/vi/ex/ex_argv.c M usr.bin/vi/ex/ex_at.c M usr.bin/vi/ex/ex_bang.c M usr.bin/vi/ex/ex_cd.c M usr.bin/vi/ex/ex_cscope.c M usr.bin/vi/ex/ex_delete.c M usr.bin/vi/ex/ex_display.c M usr.bin/vi/ex/ex_edit.c M usr.bin/vi/ex/ex_equal.c M usr.bin/vi/ex/ex_file.c M usr.bin/vi/ex/ex_filter.c M usr.bin/vi/ex/ex_global.c M usr.bin/vi/ex/ex_init.c M usr.bin/vi/ex/ex_join.c M usr.bin/vi/ex/ex_map.c M usr.bin/vi/ex/ex_mark.c M usr.bin/vi/ex/ex_mkexrc.c M usr.bin/vi/ex/ex_move.c M usr.bin/vi/ex/ex_open.c M usr.bin/vi/ex/ex_preserve.c M usr.bin/vi/ex/ex_print.c M usr.bin/vi/ex/ex_put.c M usr.bin/vi/ex/ex_quit.c M usr.bin/vi/ex/ex_read.c M usr.bin/vi/ex/ex_screen.c M usr.bin/vi/ex/ex_script.c M usr.bin/vi/ex/ex_set.c M usr.bin/vi/ex/ex_shell.c M usr.bin/vi/ex/ex_shift.c M usr.bin/vi/ex/ex_source.c M usr.bin/vi/ex/ex_stop.c M usr.bin/vi/ex/ex_subst.c M usr.bin/vi/ex/ex_tag.c M usr.bin/vi/ex/ex_txt.c M usr.bin/vi/ex/ex_undo.c M usr.bin/vi/ex/ex_usage.c M usr.bin/vi/ex/ex_util.c M usr.bin/vi/ex/ex_version.c M usr.bin/vi/ex/ex_visual.c M usr.bin/vi/ex/ex_write.c M usr.bin/vi/ex/ex_yank.c M usr.bin/vi/ex/ex_z.c M usr.bin/vi/vi/getc.c M usr.bin/vi/vi/v_at.c M usr.bin/vi/vi/v_ch.c M usr.bin/vi/vi/v_delete.c M usr.bin/vi/vi/v_ex.c M usr.bin/vi/vi/v_increment.c M usr.bin/vi/vi/v_init.c M usr.bin/vi/vi/v_itxt.c M usr.bin/vi/vi/v_left.c M usr.bin/vi/vi/v_mark.c M usr.bin/vi/vi/v_match.c M usr.bin/vi/vi/v_paragraph.c M usr.bin/vi/vi/v_put.c M usr.bin/vi/vi/v_redraw.c M usr.bin/vi/vi/v_replace.c M usr.bin/vi/vi/v_right.c M usr.bin/vi/vi/v_screen.c M usr.bin/vi/vi/v_scroll.c M usr.bin/vi/vi/v_search.c M usr.bin/vi/vi/v_section.c M usr.bin/vi/vi/v_sentence.c M usr.bin/vi/vi/v_status.c M usr.bin/vi/vi/v_txt.c M usr.bin/vi/vi/v_ulcase.c M usr.bin/vi/vi/v_undo.c M usr.bin/vi/vi/v_util.c M usr.bin/vi/vi/v_word.c M usr.bin/vi/vi/v_xchar.c M usr.bin/vi/vi/v_yank.c M usr.bin/vi/vi/v_z.c M usr.bin/vi/vi/v_zexit.c M usr.bin/vi/vi/vi.c M usr.bin/vi/vi/vs_line.c M usr.bin/vi/vi/vs_msg.c M usr.bin/vi/vi/vs_refresh.c M usr.bin/vi/vi/vs_relative.c M usr.bin/vi/vi/vs_smap.c M usr.bin/vi/vi/vs_split.c commit 2185eab4947def454aa82c0a64d5f527d1bfdf44 diff: https://github.com/bitrig/bitrig/commit/2185eab author: Martin Natano <[email protected]> date: Sat Jan 3 15:51:11 2015 +0100 Use '\a' for bell characters, not '\07'; ok pedro@ M usr.bin/vi/cl/cl_funcs.c M usr.bin/vi/common/main.c
