Date: Mon, 18 Oct 2004 20:20:28 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63330 for review Message-ID: <200410182020.i9IKKSR7003071@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63330 Change 63330 by peter@peter_daintree on 2004/10/18 20:19:39 IFC @63327 Affected files ... .. //depot/projects/hammer/Makefile#25 integrate .. //depot/projects/hammer/UPDATING#62 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/hammer/contrib/libreadline/MANIFEST#3 integrate .. //depot/projects/hammer/contrib/libreadline/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/NEWS#1 branch .. //depot/projects/hammer/contrib/libreadline/README#3 integrate .. //depot/projects/hammer/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/hammer/contrib/libreadline/bind.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/callback.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/chardefs.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/complete.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/configure#3 integrate .. //depot/projects/hammer/contrib/libreadline/configure.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/doc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/fdl.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hist.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/history.3#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/history.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hstech.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hstech.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/hsuser.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hsuser.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/manvers.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rlman.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rlman.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/version.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/histexamp.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rl-fgets.c#1 branch .. //depot/projects/hammer/contrib/libreadline/funmap.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/histfile.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/history.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/history.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/histsearch.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/input.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/keymaps.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/kill.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/mbutil.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/misc.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/nls.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/parens.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/posixdir.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/readline.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/readline.h#5 integrate .. //depot/projects/hammer/contrib/libreadline/rldefs.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rlstdc.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rltypedefs.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/search.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/shlib/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/signals.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.guess#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.rpath#1 branch .. //depot/projects/hammer/contrib/libreadline/support/config.sub#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/hammer/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/text.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/hammer/etc/etc.ia64/ttys#4 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#30 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#6 integrate .. //depot/projects/hammer/etc/rc.shutdown#7 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#6 integrate .. //depot/projects/hammer/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/hammer/gnu/lib/libreadline/history/doc/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libreadline/readline/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libreadline/readline/doc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/doc/Makefile#2 integrate .. //depot/projects/hammer/include/Makefile#32 integrate .. //depot/projects/hammer/include/rune.h#5 delete .. //depot/projects/hammer/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#8 integrate .. //depot/projects/hammer/lib/libc/Makefile#17 integrate .. //depot/projects/hammer/lib/libc/i386/net/htonl.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/net/ntohl.S#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#22 integrate .. //depot/projects/hammer/lib/libc/locale/frune.c#6 delete .. //depot/projects/hammer/lib/libc/locale/mblocal.h#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbrune.3#7 delete .. //depot/projects/hammer/lib/libc/locale/mbrune.c#5 delete .. //depot/projects/hammer/lib/libc/locale/multibyte.3#11 integrate .. //depot/projects/hammer/lib/libc/locale/rune.3#9 delete .. //depot/projects/hammer/lib/libc/locale/setinvalidrune.c#5 delete .. //depot/projects/hammer/lib/libc/locale/setlocale.3#9 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#17 integrate .. //depot/projects/hammer/lib/libc/locale/srune.c#5 delete .. //depot/projects/hammer/lib/libc/locale/table.c#11 integrate .. //depot/projects/hammer/lib/libc/locale/utf2.5#4 delete .. //depot/projects/hammer/lib/libc/locale/utf2.c#6 delete .. //depot/projects/hammer/lib/libc/locale/utf8.5#6 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#10 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#13 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_main.c#4 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_misc.c#4 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#24 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#27 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#37 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#23 integrate .. //depot/projects/hammer/share/mklocale/Makefile#14 integrate .. //depot/projects/hammer/share/msgdef/Makefile#16 integrate .. //depot/projects/hammer/share/numericdef/Makefile#14 integrate .. //depot/projects/hammer/share/zoneinfo/asia#5 integrate .. //depot/projects/hammer/share/zoneinfo/backward#3 integrate .. //depot/projects/hammer/share/zoneinfo/europe#4 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#4 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#5 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#6 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#13 integrate .. //depot/projects/hammer/sys/dev/random/harvest.c#8 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#26 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#35 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/hammer/tools/tools/README#11 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#12 integrate .. //depot/projects/hammer/usr.bin/mklocale/mklocale.1#11 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#10 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#20 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#12 integrate .. //depot/projects/hammer/usr.bin/vi/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/xargs/strnsubst.c#2 integrate .. //depot/projects/hammer/usr.sbin/mailwrapper/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/info.h#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/global.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/perform.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbupdate.c#4 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#8 integrate .. //depot/projects/hammer/usr.sbin/ypbind/ypbind.c#3 integrate .. //depot/projects/hammer/usr.sbin/yppush/yppush_main.c#3 integrate .. //depot/projects/hammer/usr.sbin/ypset/ypset.c#5 integrate Differences ... ==== //depot/projects/hammer/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.308 2004/08/18 07:17:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ # # The user-driven targets are: # @@ -86,7 +86,8 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ +_MAKEOBJDIRPREFIX!= /usr/bin/env -i \ + PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ ==== //depot/projects/hammer/UPDATING#62 (text+ko) ==== @@ -52,16 +52,6 @@ have all your ports/packages rebuilt before removing the old libraries. - As a temporary measure, if you do not have any 4.X executables, - you can add the following lines to /etc/libmap.conf to force - 5.X executables to use the new libraries: - - libhistory.so.4 libhistory.so.5 - libm.so.2 libm.so.3 - libopie.so.2 libopie.so.3 - libpcap.so.2 libpcap.so.3 - libreadline.so.4 libreadline.so.5 - 20040929: The pfil API has gained an additional argument to pass an inpcb. You should rebuild all pfil consuming modules: ipfw, ipfilter @@ -1953,4 +1943,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.373 2004/10/10 16:12:09 mtm Exp $ +$FreeBSD: src/UPDATING,v 1.374 2004/10/17 14:59:18 obrien Exp $ ==== //depot/projects/hammer/contrib/libreadline/CHANGELOG#3 (text+ko) ==== @@ -697,3 +697,114 @@ - new maybe-clean target that removes the generated documentation if the build directory differs from the source directory - distclean target now depends on maybe-clean + + 7/17 + ---- +[readline-4.3 released] + + 7/18 + ---- +shlib/Makefile.in + - fix bad dependency: text.so: terminal.c, make it depend on text.c + + 8/7 + --- +support/shlib-install + - break `linux' out into its own stanza: it seems that linux + distributions are all moving to the following scheme: + + libreadline.so.4.3 installed version + libreadline.so.4 -> libreadline.so.4.3 symlink + libreadline.so -> libreadline.so.4 symlink + + 10/29 + ----- +support/shlib-install + - change INSTALL_LINK[12] to use `&&' instead of `;' so it only + tries the link if the cd succeeds; put ${echo} in there, too + - use $LN instead of `ln -s' so it works on machines without symlinks + - change special linux stanza to use cd before ln also + - change to use $INSTALL_LINK1 and $INSTALL_LINK2 appropriately + instead of explicit commands in various stanzas + + 2/1 + --- +config.h.in + - add HAVE_MBRTOWC and HAVE_MBRLEN + - add NO_MULTIBYTE_SUPPORT for new configure argument + - add STDC_HEADERS + +configure.in + - new argument --enable-multibyte (enabled by default), allows + multibyte support to be turned off even on systems that support it + - add check for ansi stdc headers with call to AC_HEADER_STDC + + 2/3 + --- +configure.in + - add call to BASH_FUNC_CTYPE_NONASCII + +config.h.in + - add CTYPE_NON_ASCII + + 2/20 + ---- + +doc/manvers.texinfo + - renamed to version.texi to match other GNU software + - UPDATE-MONTH variable is now `UPDATED-MONTH' + +doc/{hist,rlman,rluserman}.texinfo + - include version.texi + +doc/{rltech,rluser,hstech,hsuser}.texi + - changed the suffix from `texinfo' to `texi' + +doc/Makefile.in + - made appropriate changes for {{rl,hs}tech,{rl,hs}user}.texi + +doc/{rlman,rluserman}.texinfo + - changed the suffix from `texinfo' to `texi' + +doc/hist.texinfo + - renamed to history.texi to be more consistent + + 6/11 + ---- +shlib/Makefile.in + - have configure substitute value of `@LDFLAGS@' into the assignment + to SHLIB_XLDFLAGS + + 6/16 + ---- +configure.in + - readline and history libraries are now at version 5.0 + + 8/18 + ---- +support/shlib-install + - support for FreeBSD-gnu (from Robert Millan) + + 12/4 + ---- +Makefile.in + - add variables for localedir and the PACKAGE_* variables, auto-set + by configure + + 12/9 + ---- +Makefile.in + - use mkinstalldirs instead of mkdirs + + 4/22 + ---- +Makefile.in + - separate doc install/uninstall out into two new targets: + install-doc and uninstall-doc + - make install-doc and uninstall-doc prerequisites of appropriate + install and uninstall targets + +examples/rl-fgets.c + - new example from Harold Levy that wraps fgets replacement functions + that call readline in a shared library that can be interposed with + LD_PRELOAD ==== //depot/projects/hammer/contrib/libreadline/CHANGES#3 (text+ko) ==== @@ -1,3 +1,183 @@ +This document details the changes between this version, readline-5.0, +and the previous version, readline-4.3. + +1. Changes to Readline + +a. Fixes to avoid core dumps because of null pointer references in the + multibyte character code. + +b. Fix to avoid infinite recursion caused by certain key combinations. + +c. Fixed a bug that caused the vi-mode `last command' to be set incorrectly. + +d. Readline no longer tries to read ahead more than one line of input, even + when more is available. + +e. Fixed the code that adjusts the point to not mishandle null wide + characters. + +f. Fixed a bug in the history expansion `g' modifier that caused it to skip + every other match. + +g. Fixed a bug that caused the prompt to overwrite previous output when the + output doesn't contain a newline and the locale supports multibyte + characters. This same change fixes the problem of readline redisplay + slowing down dramatically as the line gets longer in multibyte locales. + +h. History traversal with arrow keys in vi insertion mode causes the cursor + to be placed at the end of the new line, like in emacs mode. + +i. The locale initialization code does a better job of using the right + precedence and defaulting when checking the appropriate environment + variables. + +j. Fixed the history word tokenizer to handle <( and >( better when used as + part of bash. + +k. The overwrite mode code received several bug fixes to improve undo. + +l. Many speedups to the multibyte character redisplay code. + +m. The callback character reading interface should not hang waiting to read + keyboard input. + +n. Fixed a bug with redoing vi-mode `s' command. + +o. The code that initializes the terminal tracks changes made to the terminal + special characters with stty(1) (or equivalent), so that these changes + are reflected in the readline bindings. New application-callable function + to make it work: rl_tty_unset_default_bindings(). + +p. Fixed a bug that could cause garbage to be inserted in the buffer when + changing character case in vi mode when using a multibyte locale. + +q. Fixed a bug in the redisplay code that caused problems on systems + supporting multibyte characters when moving between history lines when the + new line has more glyphs but fewer bytes. + +r. Undo and redo now work better after exiting vi insertion mode. + +s. Make sure system calls are restarted after a SIGWINCH is received using + SA_RESTART. + +t. Improvements to the code that displays possible completions when using + multibyte characters. + +u. Fixed a problem when parsing nested if statements in inputrc files. + +v. The completer now takes multibyte characters into account when looking for + quoted substrings on which to perform completion. + +w. The history search functions now perform better bounds checking on the + history list. + +x. Change to history expansion functions to treat `^' as equivalent to word + one, as the documention states. + +y. Some changes to the display code to improve display and redisplay of + multibyte characters. + +z. Changes to speed up the multibyte character redisplay code. + +aa. Fixed a bug in the vi-mode `E' command that caused it to skip over the + last character of a word if invoked while point was on the word's + next-to-last character. + +bb. Fixed a bug that could cause incorrect filename quoting when + case-insensitive completion was enabled and the word being completed + contained backslashes quoting word break characters. + +cc. Fixed a bug in redisplay triggered when the prompt string contains + invisible characters. + +dd. Fixed some display (and other) bugs encountered in multibyte locales + when a non-ascii character was the last character on a line. + +ee. Fixed some display bugs caused by multibyte characters in prompt strings. + +ff. Fixed a problem with history expansion caused by non-whitespace characters + used as history word delimiters. + +gg. Fixed a problem that could cause readline to refer to freed memory when + moving between history lines while doing searches. + +hh. Improvements to the code that expands and displays prompt strings + containing multibyte characters. + +ii. Fixed a problem with vi-mode not correctly remembering the numeric argument + to the last `c'hange command for later use with `.'. + +jj. Fixed a bug in vi-mode that caused multi-digit count arguments to work + incorrectly. + +kk. Fixed a problem in vi-mode that caused the last text modification command + to not be remembered across different command lines. + +ll. Fixed problems with changing characters and changing case at the end of + the line. + +mm. Fixed a problem with readline saving the contents of the current line + before beginning a non-interactive search. + +nn. Fixed a problem with EOF detection when using rl_event_hook. + +oo. Fixed a problem with the vi mode `p' and `P' commands ignoring numeric + arguments. + +2. New Features in Readline + +a. History expansion has a new `a' modifier equivalent to the `g' modifier + for compatibility with the BSD csh. + +b. History expansion has a new `G' modifier equivalent to the BSD csh `g' + modifier, which performs a substitution once per word. + +c. All non-incremental search operations may now undo the operation of + replacing the current line with the history line. + +d. The text inserted by an `a' command in vi mode can be reinserted with + `.'. + +e. New bindable variable, `show-all-if-unmodified'. If set, the readline + completer will list possible completions immediately if there is more + than one completion and partial completion cannot be performed. + +f. There is a new application-callable `free_history_entry()' function. + +g. History list entries now contain timestamp information; the history file + functions know how to read and write timestamp information associated + with each entry. + +h. Four new key binding functions have been added: + + rl_bind_key_if_unbound() + rl_bind_key_if_unbound_in_map() + rl_bind_keyseq_if_unbound() + rl_bind_keyseq_if_unbound_in_map() + +i. New application variable, rl_completion_quote_character, set to any + quote character readline finds before it calls the application completion + function. + +j. New application variable, rl_completion_suppress_quote, settable by an + application completion function. If set to non-zero, readline does not + attempt to append a closing quote to a completed word. + +k. New application variable, rl_completion_found_quote, set to a non-zero + value if readline determines that the word to be completed is quoted. + Set before readline calls any application completion function. + +l. New function hook, rl_completion_word_break_hook, called when readline + needs to break a line into words when completion is attempted. Allows + the word break characters to vary based on position in the line. + +m. New bindable command: unix-filename-rubout. Does the same thing as + unix-word-rubout, but adds `/' to the set of word delimiters. + +n. When listing completions, directories have a `/' appended if the + `mark-directories' option has been enabled. + +------------------------------------------------------------------------------- This document details the changes between this version, readline-4.3, and the previous version, readline-4.2a. ==== //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.5 2004/02/13 01:16:12 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.6 2004/10/18 07:15:43 ache Exp $ # -# Official patches 001-005 imported as v4_3_p1_p5 +# Official patches 001-005 imported as v5_0_p1_p5 # -rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* +rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf rm savestring.c cvs import \ - -m "Virgin import of GNU Readline 4.3" \ - src/contrib/libreadline FSF v4_3 + -m "Virgin import of GNU Readline 5.0" \ + src/contrib/libreadline FSF v5_0 ==== //depot/projects/hammer/contrib/libreadline/INSTALL#3 (text+ko) ==== @@ -1,7 +1,7 @@ Basic Installation ================== -These are installation instructions for Readline-4.3. +These are installation instructions for Readline-5.0. The simplest way to compile readline is: ==== //depot/projects/hammer/contrib/libreadline/MANIFEST#3 (text+ko) ==== @@ -11,6 +11,7 @@ INSTALL f CHANGELOG f CHANGES f +NEWS f USAGE f aclocal.m4 f config.h.in f @@ -74,23 +75,26 @@ histsearch.c f shlib/Makefile.in f support/config.guess f +support/config.rpath f support/config.sub f support/install.sh f support/mkdirs f support/mkdist f +support/mkinstalldirs f support/shobj-conf f support/shlib-install f support/wcwidth.c f doc/Makefile.in f doc/texinfo.tex f -doc/manvers.texinfo f -doc/rlman.texinfo f -doc/rltech.texinfo f -doc/rluser.texinfo f -doc/rluserman.texinfo f -doc/hist.texinfo f -doc/hstech.texinfo f -doc/hsuser.texinfo f +doc/version.texi f +doc/fdl.texi f +doc/rlman.texi f +doc/rltech.texi f +doc/rluser.texi f +doc/rluserman.texi f +doc/history.texi f +doc/hstech.texi f +doc/hsuser.texi f doc/readline.3 f doc/history.3 f doc/texi2dvi f @@ -100,6 +104,7 @@ examples/fileman.c f examples/manexamp.c f examples/readlinebuf.h f +examples/rl-fgets.c f examples/rlcat.c f examples/rlfe.c f examples/rltest.c f @@ -124,3 +129,6 @@ doc/history.0 f doc/readline_3.ps f doc/history_3.ps f +doc/history.pdf f +doc/readline.pdf f +doc/rluserman.pdf f ==== //depot/projects/hammer/contrib/libreadline/Makefile.in#3 (text+ko) ==== @@ -1,6 +1,6 @@ ## -*- text -*- ## # Master Makefile for the GNU readline library. -# Copyright (C) 1994 Free Software Foundation, Inc. +# Copyright (C) 1994-2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,14 @@ RL_LIBRARY_VERSION = @LIBVERSION@ RL_LIBRARY_NAME = readline +PACKAGE = @PACKAGE_NAME@ +VERSION = @PACKAGE_VERSION@ + +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_VERSION = @PACKAGE_VERSION@ + srcdir = @srcdir@ VPATH = .:@srcdir@ top_srcdir = @top_srcdir@ @@ -45,6 +53,8 @@ libdir = @libdir@ mandir = @mandir@ includedir = @includedir@ +datadir = @datadir@ +localedir = $(datadir)/locale infodir = @infodir@ @@ -207,38 +217,42 @@ install: $(INSTALL_TARGETS) -install-static: installdirs $(STATIC_LIBS) install-headers +install-static: installdirs $(STATIC_LIBS) install-headers install-doc -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old $(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a -$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old $(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a - -( if test -d doc ; then \ - cd doc && \ - ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ - fi ) -installdirs: $(srcdir)/support/mkdirs - -$(SHELL) $(srcdir)/support/mkdirs $(DESTDIR)$(includedir) \ +installdirs: $(srcdir)/support/mkinstalldirs + -$(SHELL) $(srcdir)/support/mkinstalldirs $(DESTDIR)$(includedir) \ $(DESTDIR)$(includedir)/readline $(DESTDIR)$(libdir) \ $(DESTDIR)$(infodir) $(DESTDIR)$(man3dir) -uninstall: uninstall-headers +uninstall: uninstall-headers uninstall-doc -test -n "$(DESTDIR)$(libdir)" && cd $(DESTDIR)$(libdir) && \ ${RM} libreadline.a libreadline.old libhistory.a libhistory.old $(SHARED_LIBS) - -( if test -d doc ; then \ - cd doc && \ - ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} $@; \ - fi ) -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) -install-shared: installdirs install-headers shared +install-shared: installdirs install-headers shared install-doc -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) - + uninstall-shared: maybe-uninstall-headers -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) +install-doc: installdirs + -( if test -d doc ; then \ + cd doc && \ + ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ + fi ) + +uninstall-doc: + -( if test -d doc ; then \ + cd doc && \ + ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} uninstall; \ + fi ) + TAGS: force $(ETAGS) $(CSOURCES) $(HSOURCES) ==== //depot/projects/hammer/contrib/libreadline/README#3 (text+ko) ==== @@ -1,7 +1,7 @@ Introduction ============ -This is the Gnu Readline library, version 4.3. +This is the Gnu Readline library, version 5.0. The Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both ==== //depot/projects/hammer/contrib/libreadline/aclocal.m4#3 (text+ko) ==== @@ -685,65 +685,26 @@ ]) AC_DEFUN(BASH_FUNC_GETCWD, -[AC_MSG_CHECKING([if getcwd() calls popen()]) -AC_CACHE_VAL(bash_cv_getcwd_calls_popen, +[AC_MSG_CHECKING([if getcwd() will dynamically allocate memory]) +AC_CACHE_VAL(bash_cv_getcwd_malloc, [AC_TRY_RUN([ #include <stdio.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifndef __STDC__ -#ifndef const -#define const -#endif -#endif - -int popen_called; - -FILE * -popen(command, type) - const char *command; - const char *type; -{ - popen_called = 1; - return (FILE *)NULL; -} - -FILE *_popen(command, type) - const char *command; - const char *type; -{ - return (popen (command, type)); -} - -int -pclose(stream) -FILE *stream; -{ - return 0; -} - -int -_pclose(stream) -FILE *stream; -{ - return 0; -} - main() { - char lbuf[32]; - popen_called = 0; - getcwd(lbuf, 32); - exit (popen_called); + char *xpwd; + xpwd = getcwd(0, 0); + exit (xpwd == 0); } -], bash_cv_getcwd_calls_popen=no, bash_cv_getcwd_calls_popen=yes, - [AC_MSG_WARN(cannot check whether getcwd calls popen if cross compiling -- defaulting to no) - bash_cv_getcwd_calls_popen=no] +], bash_cv_getcwd_malloc=yes, bash_cv_getcwd_malloc=no, + [AC_MSG_WARN(cannot check whether getcwd allocates memory when cross-compiling -- defaulting to no) + bash_cv_getcwd_malloc=no] )]) -AC_MSG_RESULT($bash_cv_getcwd_calls_popen) -if test $bash_cv_getcwd_calls_popen = yes; then +AC_MSG_RESULT($bash_cv_getcwd_malloc) +if test $bash_cv_getcwd_malloc = no; then AC_DEFINE(GETCWD_BROKEN) AC_LIBOBJ(getcwd) fi @@ -981,11 +942,12 @@ _bash_needmsg= fi AC_CACHE_VAL(bash_cv_termcap_lib, -[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, +[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc, + [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo, [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses, [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses, - bash_cv_termcap_lib=gnutermcap)])])])]) + bash_cv_termcap_lib=gnutermcap)])])])])]) if test "X$_bash_needmsg" = "Xyes"; then AC_MSG_CHECKING(which library has the termcap functions) fi @@ -1003,6 +965,9 @@ elif test $bash_cv_termcap_lib = libncurses; then TERMCAP_LIB=-lncurses TERMCAP_DEP= +elif test $bash_cv_termcap_lib = libc; then +TERMCAP_LIB= +TERMCAP_DEP= else TERMCAP_LIB=-lcurses TERMCAP_DEP= @@ -1061,7 +1026,7 @@ AC_DEFUN(BASH_STRUCT_DIRENT_D_INO, [AC_REQUIRE([AC_HEADER_DIRENT]) -AC_MSG_CHECKING(if struct dirent has a d_ino member) +AC_MSG_CHECKING(for struct dirent.d_ino) AC_CACHE_VAL(bash_cv_dirent_has_dino, [AC_TRY_COMPILE([ #include <stdio.h> @@ -1088,13 +1053,13 @@ ], bash_cv_dirent_has_dino=yes, bash_cv_dirent_has_dino=no)]) AC_MSG_RESULT($bash_cv_dirent_has_dino) if test $bash_cv_dirent_has_dino = yes; then -AC_DEFINE(STRUCT_DIRENT_HAS_D_INO) +AC_DEFINE(HAVE_STRUCT_DIRENT_D_INO) fi ]) AC_DEFUN(BASH_STRUCT_DIRENT_D_FILENO, [AC_REQUIRE([AC_HEADER_DIRENT]) -AC_MSG_CHECKING(if struct dirent has a d_fileno member) +AC_MSG_CHECKING(for struct dirent.d_fileno) AC_CACHE_VAL(bash_cv_dirent_has_d_fileno, [AC_TRY_COMPILE([ #include <stdio.h> @@ -1121,7 +1086,40 @@ ], bash_cv_dirent_has_d_fileno=yes, bash_cv_dirent_has_d_fileno=no)]) AC_MSG_RESULT($bash_cv_dirent_has_d_fileno) if test $bash_cv_dirent_has_d_fileno = yes; then -AC_DEFINE(STRUCT_DIRENT_HAS_D_FILENO) +AC_DEFINE(HAVE_STRUCT_DIRENT_D_FILENO) +fi +]) + +AC_DEFUN(BASH_STRUCT_DIRENT_D_NAMLEN, +[AC_REQUIRE([AC_HEADER_DIRENT]) +AC_MSG_CHECKING(for struct dirent.d_namlen) +AC_CACHE_VAL(bash_cv_dirent_has_d_namlen, +[AC_TRY_COMPILE([ +#include <stdio.h> +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* HAVE_UNISTD_H */ +#if defined(HAVE_DIRENT_H) +# include <dirent.h> +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif /* SYSNDIR */ +# ifdef HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif /* SYSDIR */ +# ifdef HAVE_NDIR_H +# include <ndir.h> +# endif +#endif /* HAVE_DIRENT_H */ +],[ +struct dirent d; int z; z = d.d_namlen; +], bash_cv_dirent_has_d_namlen=yes, bash_cv_dirent_has_d_namlen=no)]) +AC_MSG_RESULT($bash_cv_dirent_has_d_namlen) +if test $bash_cv_dirent_has_d_namlen = yes; then +AC_DEFINE(HAVE_STRUCT_DIRENT_D_NAMLEN) fi ]) @@ -1141,6 +1139,22 @@ fi ]) +AC_DEFUN(BASH_STRUCT_TIMEZONE, +[AC_MSG_CHECKING(for struct timezone in sys/time.h and time.h) +AC_CACHE_VAL(bash_cv_struct_timezone, +[ +AC_EGREP_HEADER(struct timezone, sys/time.h, + bash_cv_struct_timezone=yes, + AC_EGREP_HEADER(struct timezone, time.h, + bash_cv_struct_timezone=yes, + bash_cv_struct_timezone=no)) +]) +AC_MSG_RESULT($bash_cv_struct_timezone) +if test $bash_cv_struct_timezone = yes; then + AC_DEFINE(HAVE_STRUCT_TIMEZONE) +fi +]) + AC_DEFUN(BASH_STRUCT_WINSIZE, [AC_MSG_CHECKING(for struct winsize in sys/ioctl.h and termios.h) AC_CACHE_VAL(bash_cv_struct_winsize_header, @@ -1526,9 +1540,9 @@ AC_DEFUN(BASH_CHECK_DEV_FD, [AC_MSG_CHECKING(whether /dev/fd is available) AC_CACHE_VAL(bash_cv_dev_fd, -[if test -d /dev/fd && test -r /dev/fd/0; then +[if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then bash_cv_dev_fd=standard - elif test -d /proc/self/fd && test -r /proc/self/fd/0; then + elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then bash_cv_dev_fd=whacky else bash_cv_dev_fd=absent @@ -1547,9 +1561,9 @@ AC_DEFUN(BASH_CHECK_DEV_STDIN, [AC_MSG_CHECKING(whether /dev/stdin stdout stderr are available) AC_CACHE_VAL(bash_cv_dev_stdin, -[if test -d /dev/fd && test -r /dev/stdin; then +[if test -d /dev/fd && test -r /dev/stdin < /dev/null; then bash_cv_dev_stdin=present - elif test -d /proc/self/fd && test -r /dev/stdin; then + elif test -d /proc/self/fd && test -r /dev/stdin < /dev/null; then bash_cv_dev_stdin=present else bash_cv_dev_stdin=absent @@ -1653,17 +1667,19 @@ AC_CHECK_HEADERS(langinfo.h) AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) +AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC)) +AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN)) +AC_CHECK_FUNC(wctomb, AC_DEFINE(HAVE_WCTOMB)) AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) +AC_CHECK_FUNC(wcsdup, AC_DEFINE(HAVE_WCSDUP)) AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t, -[AC_TRY_RUN([ -#include <wchar.h> -int -main () -{ +[AC_TRY_COMPILE([ +#include <wchar.h>], [ mbstate_t ps; - return 0; -}], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)]) + mbstate_t *psp; + psp = (mbstate_t *)0; +], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)]) if test $bash_cv_have_mbstate_t = yes; then AC_DEFINE(HAVE_MBSTATE_T) fi @@ -1712,7 +1728,8 @@ CFLAGS="$CFLAGS -I${ac_cv_rl_includedir}" LDFLAGS="$LDFLAGS -L${ac_cv_rl_libdir}" -AC_TRY_RUN([ +AC_CACHE_VAL(ac_cv_rl_version, +[AC_TRY_RUN([ #include <stdio.h> #include <readline/readline.h> @@ -1728,7 +1745,7 @@ ], ac_cv_rl_version=`cat conftest.rlv`, ac_cv_rl_version='0.0', -ac_cv_rl_version='4.2') +ac_cv_rl_version='4.2')]) CFLAGS="$_save_CFLAGS" LDFLAGS="$_save_LDFLAGS" @@ -1790,3 +1807,2107 @@ fi ]) + +AC_DEFUN(BASH_FUNC_CTYPE_NONASCII, +[ +AC_MSG_CHECKING(whether the ctype macros accept non-ascii characters) +AC_CACHE_VAL(bash_cv_func_ctype_nonascii, +[AC_TRY_RUN([ +#ifdef HAVE_LOCALE_H +#include <locale.h> +#endif +#include <stdio.h> +#include <ctype.h> + +main(c, v) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410182020.i9IKKSR7003071>