Date: Tue, 13 Nov 2012 15:14:28 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242977 - in projects/efika_mx: . bin/sh contrib/less etc/root games/fortune/fortune lib/libpmc libexec/rtld-elf sbin/hastd sbin/mdconfig share/examples/ses/sesd share/examples/ses/srcs... Message-ID: <201211131514.qADFESsU068814@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Tue Nov 13 15:14:27 2012 New Revision: 242977 URL: http://svnweb.freebsd.org/changeset/base/242977 Log: MFC @r242678. Added: projects/efika_mx/sys/boot/forth/menusets.4th - copied unchanged from r242678, head/sys/boot/forth/menusets.4th projects/efika_mx/sys/boot/forth/menusets.4th.8 - copied unchanged from r242678, head/sys/boot/forth/menusets.4th.8 projects/efika_mx/tools/build/options/WITHOUT_CLANG_IS_CC - copied unchanged from r242678, head/tools/build/options/WITHOUT_CLANG_IS_CC Modified: projects/efika_mx/UPDATING projects/efika_mx/bin/sh/exec.c projects/efika_mx/contrib/less/NEWS projects/efika_mx/contrib/less/README projects/efika_mx/contrib/less/configure projects/efika_mx/contrib/less/configure.ac projects/efika_mx/contrib/less/defines.ds projects/efika_mx/contrib/less/defines.h.in projects/efika_mx/contrib/less/defines.o2 projects/efika_mx/contrib/less/defines.o9 projects/efika_mx/contrib/less/defines.wn projects/efika_mx/contrib/less/less.man projects/efika_mx/contrib/less/less.nro projects/efika_mx/contrib/less/lessecho.man projects/efika_mx/contrib/less/lessecho.nro projects/efika_mx/contrib/less/lesskey.man projects/efika_mx/contrib/less/lesskey.nro projects/efika_mx/contrib/less/option.c projects/efika_mx/contrib/less/output.c projects/efika_mx/contrib/less/position.c projects/efika_mx/contrib/less/screen.c projects/efika_mx/contrib/less/version.c projects/efika_mx/etc/root/dot.cshrc projects/efika_mx/games/fortune/fortune/fortune.6 projects/efika_mx/games/fortune/fortune/fortune.c projects/efika_mx/lib/libpmc/libpmc.c projects/efika_mx/libexec/rtld-elf/libmap.c projects/efika_mx/libexec/rtld-elf/rtld.c projects/efika_mx/sbin/hastd/pjdlog.h projects/efika_mx/sbin/mdconfig/mdconfig.8 projects/efika_mx/share/examples/ses/sesd/sesd.0 projects/efika_mx/share/examples/ses/srcs/eltsub.c projects/efika_mx/share/examples/ses/srcs/sesd.c projects/efika_mx/share/man/man5/src.conf.5 projects/efika_mx/share/man/man9/domain.9 projects/efika_mx/share/misc/committers-ports.dot projects/efika_mx/share/misc/committers-src.dot projects/efika_mx/share/mk/bsd.compiler.mk projects/efika_mx/share/mk/bsd.own.mk projects/efika_mx/share/skel/dot.cshrc projects/efika_mx/sys/amd64/amd64/pmap.c projects/efika_mx/sys/boot/forth/loader.4th projects/efika_mx/sys/boot/forth/menu-commands.4th projects/efika_mx/sys/boot/forth/menu.4th projects/efika_mx/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c projects/efika_mx/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/efika_mx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/efika_mx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/efika_mx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/efika_mx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/efika_mx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/efika_mx/sys/contrib/ngatm/netnatm/msg/uni_ie.c projects/efika_mx/sys/dev/ale/if_ale.c projects/efika_mx/sys/dev/ata/ata-card.c projects/efika_mx/sys/dev/ata/chipsets/ata-acard.c projects/efika_mx/sys/dev/ata/chipsets/ata-acerlabs.c projects/efika_mx/sys/dev/ata/chipsets/ata-adaptec.c projects/efika_mx/sys/dev/ata/chipsets/ata-amd.c projects/efika_mx/sys/dev/ata/chipsets/ata-ati.c projects/efika_mx/sys/dev/ata/chipsets/ata-highpoint.c projects/efika_mx/sys/dev/ata/chipsets/ata-intel.c projects/efika_mx/sys/dev/ata/chipsets/ata-ite.c projects/efika_mx/sys/dev/ata/chipsets/ata-jmicron.c projects/efika_mx/sys/dev/ata/chipsets/ata-marvell.c projects/efika_mx/sys/dev/ata/chipsets/ata-nvidia.c projects/efika_mx/sys/dev/ata/chipsets/ata-promise.c projects/efika_mx/sys/dev/ata/chipsets/ata-serverworks.c projects/efika_mx/sys/dev/ata/chipsets/ata-siliconimage.c projects/efika_mx/sys/dev/ata/chipsets/ata-sis.c projects/efika_mx/sys/dev/ata/chipsets/ata-via.c projects/efika_mx/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/efika_mx/sys/dev/ath/if_ath_debug.c projects/efika_mx/sys/dev/ath/if_ath_tx.c projects/efika_mx/sys/dev/ath/if_ath_tx_edma.c projects/efika_mx/sys/dev/bge/if_bge.c projects/efika_mx/sys/dev/cas/if_cas.c projects/efika_mx/sys/dev/cpuctl/cpuctl.c projects/efika_mx/sys/dev/cxgbe/tom/t4_cpl_io.c projects/efika_mx/sys/dev/cxgbe/tom/t4_listen.c projects/efika_mx/sys/dev/dc/if_dc.c projects/efika_mx/sys/dev/flash/at45d.c projects/efika_mx/sys/dev/fxp/if_fxp.c projects/efika_mx/sys/dev/gem/if_gem_pci.c projects/efika_mx/sys/dev/lge/if_lge.c projects/efika_mx/sys/dev/mii/mii.c projects/efika_mx/sys/dev/nge/if_nge.c projects/efika_mx/sys/dev/pci/pci.c projects/efika_mx/sys/dev/re/if_re.c projects/efika_mx/sys/dev/sis/if_sis.c projects/efika_mx/sys/dev/ste/if_ste.c projects/efika_mx/sys/dev/stge/if_stge.c projects/efika_mx/sys/dev/ti/if_ti.c projects/efika_mx/sys/dev/tl/if_tl.c projects/efika_mx/sys/dev/uart/uart_bus_acpi.c projects/efika_mx/sys/dev/usb/quirk/usb_quirk.c projects/efika_mx/sys/dev/usb/quirk/usb_quirk.h projects/efika_mx/sys/dev/usb/serial/usb_serial.c projects/efika_mx/sys/dev/usb/serial/usb_serial.h projects/efika_mx/sys/dev/usb/storage/umass.c projects/efika_mx/sys/dev/usb/usbdevs projects/efika_mx/sys/dev/vr/if_vr.c projects/efika_mx/sys/dev/wb/if_wb.c projects/efika_mx/sys/dev/xl/if_xl.c projects/efika_mx/sys/fs/fuse/fuse_io.c projects/efika_mx/sys/fs/fuse/fuse_vnops.c projects/efika_mx/sys/i386/i386/pmap.c projects/efika_mx/sys/ia64/ia64/pmap.c projects/efika_mx/sys/kern/kern_malloc.c projects/efika_mx/sys/kern/vfs_subr.c projects/efika_mx/sys/mips/mips/pmap.c projects/efika_mx/sys/net/bpf.c projects/efika_mx/sys/netinet/sctp_input.c projects/efika_mx/sys/netinet/sctp_output.c projects/efika_mx/sys/netinet/sctp_structs.h projects/efika_mx/sys/netinet/sctputil.c projects/efika_mx/sys/netinet/tcp_input.c projects/efika_mx/sys/netpfil/ipfw/ip_fw_dynamic.c projects/efika_mx/sys/netpfil/ipfw/ip_fw_nat.c projects/efika_mx/sys/netpfil/ipfw/ip_fw_private.h projects/efika_mx/sys/pci/if_rl.c projects/efika_mx/sys/powerpc/aim/mmu_oea.c projects/efika_mx/sys/powerpc/booke/pmap.c projects/efika_mx/sys/sparc64/include/pmap.h projects/efika_mx/sys/sparc64/pci/fire.c projects/efika_mx/sys/sparc64/pci/psycho.c projects/efika_mx/sys/sparc64/pci/schizo.c projects/efika_mx/sys/sparc64/sparc64/pmap.c projects/efika_mx/sys/sys/param.h projects/efika_mx/usr.bin/calendar/calendars/calendar.freebsd projects/efika_mx/usr.bin/du/du.1 projects/efika_mx/usr.bin/less/defines.h Directory Properties: projects/efika_mx/ (props changed) projects/efika_mx/contrib/less/ (props changed) projects/efika_mx/sbin/ (props changed) projects/efika_mx/sys/ (props changed) projects/efika_mx/sys/boot/ (props changed) projects/efika_mx/sys/cddl/contrib/opensolaris/ (props changed) projects/efika_mx/usr.bin/calendar/ (props changed) Modified: projects/efika_mx/UPDATING ============================================================================== --- projects/efika_mx/UPDATING Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/UPDATING Tue Nov 13 15:14:27 2012 (r242977) @@ -24,6 +24,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20121105: + On i386 and amd64 systems WITH_CLANG_IS_CC is now the default. + This means that the world and kernel will be compiled with clang + and that clang will be installed as /usr/bin/cc, /usr/bin/c++, + and /usr/bin/cpp. To disable this behavior and revert to building + with gcc, compile with WITHOUT_CLANG_IS_CC. + 20121102: The IPFIREWALL_FORWARD kernel option has been removed. Its functionality now turned on by default. Modified: projects/efika_mx/bin/sh/exec.c ============================================================================== --- projects/efika_mx/bin/sh/exec.c Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/bin/sh/exec.c Tue Nov 13 15:14:27 2012 (r242977) @@ -85,7 +85,7 @@ struct tblentry { struct tblentry *next; /* next entry in hash chain */ union param param; /* definition of builtin function */ int special; /* flag for special builtin commands */ - short cmdtype; /* index identifying command */ + signed char cmdtype; /* index identifying command */ char rehash; /* if set, cd done since entry created */ char cmdname[]; /* name of command */ }; Modified: projects/efika_mx/contrib/less/NEWS ============================================================================== --- projects/efika_mx/contrib/less/NEWS Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/NEWS Tue Nov 13 15:14:27 2012 (r242977) @@ -11,6 +11,22 @@ ====================================================================== + Major changes between "less" versions 451 and 453 + +* Allow backslash escaping of metacharacters in LESS environment variable. + +* Don't quit if syntax errors are found in command line options. + +* Increase sizes of some internal buffers. + +* Fix configure bug with --with-regex=none. + +* Fix crash with "stty rows 0". + +* Fix Win32 attribute display bug. + +====================================================================== + Major changes between "less" versions 444 and 451 * Add ESC-F command to keep reading data until a pattern is found. Modified: projects/efika_mx/contrib/less/README ============================================================================== --- projects/efika_mx/contrib/less/README Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/README Tue Nov 13 15:14:27 2012 (r242977) @@ -7,9 +7,9 @@ ************************************************************************** ************************************************************************** - Less, version 451 + Less, version 453 - This is the distribution of less, version 451, released 21 Jul 2012. + This is the distribution of less, version 453, released 27 Oct 2012. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or Modified: projects/efika_mx/contrib/less/configure ============================================================================== --- projects/efika_mx/contrib/less/configure Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/configure Tue Nov 13 15:14:27 2012 (r242977) @@ -5188,8 +5188,7 @@ fi # Checks for regular expression functions. have_regex=no have_posix_regex=unknown -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp" >&5 -$as_echo_n "checking for regcomp... " >&6; } +supported_regex="" # Select a regular expression library. WANT_REGEX=auto @@ -5204,6 +5203,8 @@ if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then # Some versions of Solaris have a regcomp() function, but it doesn't work! # So we run a test program. If we're cross-compiling, do it the old way. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX regcomp" >&5 +$as_echo_n "checking for POSIX regcomp... " >&6; } if test "$cross_compiling" = yes; then : have_posix_regex=unknown else @@ -5232,10 +5233,10 @@ rm -f core *.core core.conftest.* gmon.o fi if test $have_posix_regex = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using POSIX regcomp" >&5 -$as_echo "using POSIX regcomp" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h - + supported_regex="$supported_regex posix" have_regex=yes elif test $have_posix_regex = unknown; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5252,10 +5253,10 @@ regex_t *r; regfree(r); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using POSIX regcomp" >&5 -$as_echo "using POSIX regcomp" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h - have_regex=yes + have_regex=yes; supported_regex="$supported_regex posix" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -5267,14 +5268,14 @@ fi fi if test $have_regex = no; then -if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_compile_pattern in -lc" >&5 -$as_echo_n "checking for re_compile_pattern in -lc... " >&6; } -if ${ac_cv_lib_c_re_compile_pattern+:} false; then : +if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5 +$as_echo_n "checking for pcre_compile in -lpcre... " >&6; } +if ${ac_cv_lib_pcre_pcre_compile+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" +LIBS="-lpcre $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5284,44 +5285,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char re_compile_pattern (); +char pcre_compile (); int main () { -return re_compile_pattern (); +return pcre_compile (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_re_compile_pattern=yes + ac_cv_lib_pcre_pcre_compile=yes else - ac_cv_lib_c_re_compile_pattern=no + ac_cv_lib_pcre_pcre_compile=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_re_compile_pattern" >&5 -$as_echo "$ac_cv_lib_c_re_compile_pattern" >&6; } -if test "x$ac_cv_lib_c_re_compile_pattern" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using gnu" >&5 -$as_echo "using gnu" >&6; }; $as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h - have_regex=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5 +$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; } +if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then : + $as_echo "#define HAVE_PCRE 1" >>confdefs.h + LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre" fi fi fi if test $have_regex = no; then -if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5 -$as_echo_n "checking for pcre_compile in -lpcre... " >&6; } -if ${ac_cv_lib_pcre_pcre_compile+:} false; then : +if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_compile_pattern in -lc" >&5 +$as_echo_n "checking for re_compile_pattern in -lc... " >&6; } +if ${ac_cv_lib_c_re_compile_pattern+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcre $LIBS" +LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5331,30 +5331,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char pcre_compile (); +char re_compile_pattern (); int main () { -return pcre_compile (); +return re_compile_pattern (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pcre_pcre_compile=yes + ac_cv_lib_c_re_compile_pattern=yes else - ac_cv_lib_pcre_pcre_compile=no + ac_cv_lib_c_re_compile_pattern=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5 -$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; } -if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using pcre" >&5 -$as_echo "using pcre" >&6; }; $as_echo "#define HAVE_PCRE 1" >>confdefs.h - LIBS="$LIBS -lpcre" have_regex=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_re_compile_pattern" >&5 +$as_echo "$ac_cv_lib_c_re_compile_pattern" >&6; } +if test "x$ac_cv_lib_c_re_compile_pattern" = xyes; then : + $as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h + have_regex=yes; supported_regex="$supported_regex gnu" fi fi @@ -5364,9 +5363,8 @@ if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then ac_fn_c_check_func "$LINENO" "regcmp" "ac_cv_func_regcmp" if test "x$ac_cv_func_regcmp" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using regcmp" >&5 -$as_echo "using regcmp" >&6; }; $as_echo "#define HAVE_REGCMP 1" >>confdefs.h - have_regex=yes + $as_echo "#define HAVE_REGCMP 1" >>confdefs.h + have_regex=yes; supported_regex="$supported_regex regcmp" fi fi @@ -5374,6 +5372,8 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for V8 regcomp" >&5 +$as_echo_n "checking for V8 regcomp... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5387,9 +5387,12 @@ regcomp(""); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp" >&5 -$as_echo "using V8 regcomp" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h - have_regex=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h + have_regex=yes; supported_regex="$supported_regex regcomp" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -5400,18 +5403,21 @@ if test $have_regex = no && test -f ${sr if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp -- local source" >&5 $as_echo "using V8 regcomp -- local source" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h - $as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h + +supported_regex="$supported_regex regcomp-local" +$as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h REGEX_O='regexp.$(O)' have_regex=yes fi fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using re_comp" >&5 -$as_echo "using re_comp" >&6; }; ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_comp" >&5 +$as_echo_n "checking for re_comp... " >&6; } +ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp" if test "x$ac_cv_func_re_comp" = xyes; then : $as_echo "#define HAVE_RE_COMP 1" >>confdefs.h - have_regex=yes + have_regex=yes; supported_regex="$supported_regex re_comp" fi fi @@ -5420,15 +5426,17 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = none; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: using no regex" >&5 -$as_echo "using no regex" >&6; }; have_regex=yes; +$as_echo "using no regex" >&6; } +else +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find regular expression library" >&5 +$as_echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi +$as_echo "#define NO_REGEX 1" >>confdefs.h + supported_regex="$supported_regex none" fi -if test $have_regex = no; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find regular expression library" >&5 -$as_echo "cannot find regular expression library" >&6; }; $as_echo "#define NO_REGEX 1" >>confdefs.h - -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: regular expression library: $supported_regex" >&5 +$as_echo "regular expression library: $supported_regex" >&6; } # Check whether --with-editor was given. Modified: projects/efika_mx/contrib/less/configure.ac ============================================================================== --- projects/efika_mx/contrib/less/configure.ac Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/configure.ac Tue Nov 13 15:14:27 2012 (r242977) @@ -383,7 +383,7 @@ fi # Checks for regular expression functions. have_regex=no have_posix_regex=unknown -AC_MSG_CHECKING(for regcomp) +supported_regex="" # Select a regular expression library. WANT_REGEX=auto @@ -395,6 +395,7 @@ if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then # Some versions of Solaris have a regcomp() function, but it doesn't work! # So we run a test program. If we're cross-compiling, do it the old way. +AC_MSG_CHECKING(for POSIX regcomp) AC_TRY_RUN([ #include <sys/types.h> #include <regex.h> @@ -409,16 +410,16 @@ if (rm.rm_sp != text + 1) exit(1); /* ch exit(0); }], have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown) if test $have_posix_regex = yes; then - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_POSIX_REGCOMP) supported_regex="$supported_regex posix" have_regex=yes elif test $have_posix_regex = unknown; then AC_TRY_LINK([ #include <sys/types.h> #include <regex.h>], [regex_t *r; regfree(r);], - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes; supported_regex="$supported_regex posix") else AC_MSG_RESULT(no) fi @@ -426,55 +427,61 @@ fi fi if test $have_regex = no; then -if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then -AC_CHECK_LIB(c, re_compile_pattern, -[AC_MSG_RESULT(using gnu); AC_DEFINE(HAVE_GNU_REGEX) have_regex=yes], []) +if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then +AC_CHECK_LIB(pcre, pcre_compile, +[AC_DEFINE(HAVE_PCRE) LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre"], []) fi fi if test $have_regex = no; then -if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then -AC_CHECK_LIB(pcre, pcre_compile, -[AC_MSG_RESULT(using pcre); AC_DEFINE(HAVE_PCRE) LIBS="$LIBS -lpcre" have_regex=yes], []) +if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then +AC_CHECK_LIB(c, re_compile_pattern, +[AC_DEFINE(HAVE_GNU_REGEX) have_regex=yes; supported_regex="$supported_regex gnu"], []) fi fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then AC_CHECK_FUNC(regcmp, -AC_MSG_RESULT(using regcmp); AC_DEFINE(HAVE_REGCMP) have_regex=yes) +[AC_DEFINE(HAVE_REGCMP) have_regex=yes; supported_regex="$supported_regex regcmp"],[]) fi fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then +AC_MSG_CHECKING(for V8 regcomp) AC_TRY_LINK([ #include "regexp.h"], [regcomp("");], -AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes) +[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes; supported_regex="$supported_regex regcomp"],[AC_MSG_RESULT(no)]) fi fi if test $have_regex = no && test -f ${srcdir}/regexp.c; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then -AC_MSG_RESULT(using V8 regcomp -- local source); AC_DEFINE(HAVE_V8_REGCOMP) AC_DEFINE(HAVE_REGEXEC2) REGEX_O='regexp.$(O)' AC_SUBST(REGEX_O) have_regex=yes +AC_MSG_RESULT(using V8 regcomp -- local source); AC_DEFINE(HAVE_V8_REGCOMP) +supported_regex="$supported_regex regcomp-local" +AC_DEFINE(HAVE_REGEXEC2) REGEX_O='regexp.$(O)' AC_SUBST(REGEX_O) have_regex=yes fi fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then -AC_MSG_RESULT(using re_comp); AC_CHECK_FUNC(re_comp, AC_DEFINE(HAVE_RE_COMP) have_regex=yes) +AC_MSG_CHECKING(for re_comp) +AC_CHECK_FUNC(re_comp, +[AC_DEFINE(HAVE_RE_COMP) have_regex=yes; supported_regex="$supported_regex re_comp"],[]) fi fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = none; then -AC_MSG_RESULT(using no regex); have_regex=yes; +AC_MSG_RESULT(using no regex) +else +AC_MSG_WARN(cannot find regular expression library) fi +AC_DEFINE(NO_REGEX) supported_regex="$supported_regex none" fi -if test $have_regex = no; then -AC_MSG_RESULT(cannot find regular expression library); AC_DEFINE(NO_REGEX) -fi +AC_MSG_RESULT(regular expression library: $supported_regex) AC_ARG_WITH(editor, [ --with-editor=PROGRAM use PROGRAM as the default editor [vi]], @@ -662,6 +669,7 @@ AH_TOP([ /* * Sizes of various buffers. */ +#if 0 /* old sizes for small memory machines #define CMDBUF_SIZE 512 /* Buffer for multichar commands */ #define UNGOT_SIZE 100 /* Max chars to unget() */ #define LINEBUF_SIZE 1024 /* Max size of line in input file */ @@ -671,6 +679,17 @@ AH_TOP([ #define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ #define TAGLINE_SIZE 512 /* Max size of line in tags file */ #define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#else /* more reasonable sizes for modern machines */ +#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */ +#define UNGOT_SIZE 200 /* Max chars to unget() */ +#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 2048 /* Max size of prompt string */ +#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */ +#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ +#define TAGLINE_SIZE 1024 /* Max size of line in tags file */ +#define TABSTOP_MAX 128 /* Max number of custom tab stops */ +#endif /* Settings automatically determined by configure. */ ]) Modified: projects/efika_mx/contrib/less/defines.ds ============================================================================== --- projects/efika_mx/contrib/less/defines.ds Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/defines.ds Tue Nov 13 15:14:27 2012 (r242977) @@ -185,6 +185,7 @@ /* * Sizes of various buffers. */ +#if 0 /* old sizes for small memory machines #define CMDBUF_SIZE 512 /* Buffer for multichar commands */ #define UNGOT_SIZE 100 /* Max chars to unget() */ #define LINEBUF_SIZE 1024 /* Max size of line in input file */ @@ -194,6 +195,17 @@ #define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ #define TAGLINE_SIZE 512 /* Max size of line in tags file */ #define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#else /* more reasonable sizes for modern machines */ +#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */ +#define UNGOT_SIZE 200 /* Max chars to unget() */ +#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 2048 /* Max size of prompt string */ +#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */ +#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ +#define TAGLINE_SIZE 1024 /* Max size of line in tags file */ +#define TABSTOP_MAX 128 /* Max number of custom tab stops */ +#endif /* Define to `long' if <sys/types.h> doesn't define. */ #if MSDOS_COMPILER==BORLANDC Modified: projects/efika_mx/contrib/less/defines.h.in ============================================================================== --- projects/efika_mx/contrib/less/defines.h.in Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/defines.h.in Tue Nov 13 15:14:27 2012 (r242977) @@ -182,6 +182,7 @@ /* * Sizes of various buffers. */ +#if 0 /* old sizes for small memory machines #define CMDBUF_SIZE 512 /* Buffer for multichar commands */ #define UNGOT_SIZE 100 /* Max chars to unget() */ #define LINEBUF_SIZE 1024 /* Max size of line in input file */ @@ -191,6 +192,17 @@ #define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ #define TAGLINE_SIZE 512 /* Max size of line in tags file */ #define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#else /* more reasonable sizes for modern machines */ +#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */ +#define UNGOT_SIZE 200 /* Max chars to unget() */ +#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 2048 /* Max size of prompt string */ +#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */ +#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ +#define TAGLINE_SIZE 1024 /* Max size of line in tags file */ +#define TABSTOP_MAX 128 /* Max number of custom tab stops */ +#endif /* Settings automatically determined by configure. */ Modified: projects/efika_mx/contrib/less/defines.o2 ============================================================================== --- projects/efika_mx/contrib/less/defines.o2 Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/defines.o2 Tue Nov 13 15:14:27 2012 (r242977) @@ -166,6 +166,7 @@ /* * Sizes of various buffers. */ +#if 0 /* old sizes for small memory machines #define CMDBUF_SIZE 512 /* Buffer for multichar commands */ #define UNGOT_SIZE 100 /* Max chars to unget() */ #define LINEBUF_SIZE 1024 /* Max size of line in input file */ @@ -175,6 +176,17 @@ #define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ #define TAGLINE_SIZE 512 /* Max size of line in tags file */ #define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#else /* more reasonable sizes for modern machines */ +#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */ +#define UNGOT_SIZE 200 /* Max chars to unget() */ +#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 2048 /* Max size of prompt string */ +#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */ +#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ +#define TAGLINE_SIZE 1024 /* Max size of line in tags file */ +#define TABSTOP_MAX 128 /* Max number of custom tab stops */ +#endif /* Define to `long' if <sys/types.h> doesn't define. */ /* #define off_t long */ Modified: projects/efika_mx/contrib/less/defines.o9 ============================================================================== --- projects/efika_mx/contrib/less/defines.o9 Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/defines.o9 Tue Nov 13 15:14:27 2012 (r242977) @@ -173,6 +173,7 @@ /* * Sizes of various buffers. */ +#if 0 /* old sizes for small memory machines #define CMDBUF_SIZE 512 /* Buffer for multichar commands */ #define UNGOT_SIZE 100 /* Max chars to unget() */ #define LINEBUF_SIZE 1024 /* Max size of line in input file */ @@ -182,6 +183,17 @@ #define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ #define TAGLINE_SIZE 512 /* Max size of line in tags file */ #define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#else /* more reasonable sizes for modern machines */ +#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */ +#define UNGOT_SIZE 200 /* Max chars to unget() */ +#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 2048 /* Max size of prompt string */ +#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */ +#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ +#define TAGLINE_SIZE 1024 /* Max size of line in tags file */ +#define TABSTOP_MAX 128 /* Max number of custom tab stops */ +#endif /* Define to `long' if <sys/types.h> doesn't define. */ #define off_t long Modified: projects/efika_mx/contrib/less/defines.wn ============================================================================== --- projects/efika_mx/contrib/less/defines.wn Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/defines.wn Tue Nov 13 15:14:27 2012 (r242977) @@ -167,6 +167,7 @@ /* * Sizes of various buffers. */ +#if 0 /* old sizes for small memory machines #define CMDBUF_SIZE 512 /* Buffer for multichar commands */ #define UNGOT_SIZE 100 /* Max chars to unget() */ #define LINEBUF_SIZE 1024 /* Max size of line in input file */ @@ -176,6 +177,17 @@ #define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ #define TAGLINE_SIZE 512 /* Max size of line in tags file */ #define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#else /* more reasonable sizes for modern machines */ +#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */ +#define UNGOT_SIZE 200 /* Max chars to unget() */ +#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 2048 /* Max size of prompt string */ +#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */ +#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */ +#define TAGLINE_SIZE 1024 /* Max size of line in tags file */ +#define TABSTOP_MAX 128 /* Max number of custom tab stops */ +#endif /* Define to `long' if <sys/types.h> doesn't define. */ /* #define off_t long */ Modified: projects/efika_mx/contrib/less/less.man ============================================================================== --- projects/efika_mx/contrib/less/less.man Tue Nov 13 14:44:29 2012 (r242976) +++ projects/efika_mx/contrib/less/less.man Tue Nov 13 15:14:27 2012 (r242977) @@ -437,63 +437,69 @@ LESS(1) appears in the LESS variable, it can be reset to its default value on the command line by beginning the command line option with "-+". - For options like -P or -D which take a following string, a dollar sign - ($) must be used to signal the end of the string. For example, to set - two -D options on MS-DOS, you must have a dollar sign between them, - like this: + Some options like -k or -D require a string to follow the option let- + ter. The string for that option is considered to end when a space, + tab, dash or dollar sign ($) is found. For example, to set two -D + options on MS-DOS, you can separate them with a dollar sign, like this: - LESS="-Dn9.1$-Ds4.1" + LESS="Dn9.1$Ds4.1" + or a space like this: + + LESS="Dn9.1 Ds4.1" + + Any character may be included literally in an option string by preced- + ing it with a backslash. -? or --help - This option displays a summary of the commands accepted by [4mless[0m - (the same as the h command). (Depending on how your shell - interprets the question mark, it may be necessary to quote the + This option displays a summary of the commands accepted by [4mless[0m + (the same as the h command). (Depending on how your shell + interprets the question mark, it may be necessary to quote the question mark, thus: "-\?".) -a or --search-skip-screen - By default, forward searches start at the top of the displayed - screen and backwards searches start at the bottom of the dis- - played screen (except for repeated searches invoked by the n or - N commands, which start after or before the "target" line + By default, forward searches start at the top of the displayed + screen and backwards searches start at the bottom of the dis- + played screen (except for repeated searches invoked by the n or + N commands, which start after or before the "target" line respectively; see the -j option for more about the target line). - The -a option causes forward searches to instead start at the - bottom of the screen and backward searches to start at the top + The -a option causes forward searches to instead start at the + bottom of the screen and backward searches to start at the top of the screen, thus skipping all lines displayed on the screen. -A or --SEARCH-SKIP-SCREEN - Causes all forward searches (not just non-repeated searches) to - start just after the target line, and all backward searches to - start just before the target line. Thus, forward searches will + Causes all forward searches (not just non-repeated searches) to + start just after the target line, and all backward searches to + start just before the target line. Thus, forward searches will skip part of the displayed screen (from the first line up to and - including the target line). Similarly backwards searches will + including the target line). Similarly backwards searches will skip the displayed screen from the last line up to and including the target line. This was the default behavior in less versions prior to 441. -b[4mn[24m or --buffers=[4mn[0m - Specifies the amount of buffer space [4mless[24m will use for each - file, in units of kilobytes (1024 bytes). By default 64K of - buffer space is used for each file (unless the file is a pipe; - see the -B option). The -b option specifies instead that [4mn[0m + Specifies the amount of buffer space [4mless[24m will use for each + file, in units of kilobytes (1024 bytes). By default 64K of + buffer space is used for each file (unless the file is a pipe; + see the -B option). The -b option specifies instead that [4mn[0m kilobytes of buffer space should be used for each file. If [4mn[24m is - -1, buffer space is unlimited; that is, the entire file can be + -1, buffer space is unlimited; that is, the entire file can be read into memory. -B or --auto-buffers By default, when data is read from a pipe, buffers are allocated automatically as needed. If a large amount of data is read from - the pipe, this can cause a large amount of memory to be allo- + the pipe, this can cause a large amount of memory to be allo- cated. The -B option disables this automatic allocation of buf- - fers for pipes, so that only 64K (or the amount of space speci- + fers for pipes, so that only 64K (or the amount of space speci- fied by the -b option) is used for the pipe. Warning: use of -B - can result in erroneous display, since only the most recently - viewed part of the piped data is kept in memory; any earlier + can result in erroneous display, since only the most recently + viewed part of the piped data is kept in memory; any earlier data is lost. -c or --clear-screen - Causes full screen repaints to be painted from the top line - down. By default, full screen repaints are done by scrolling + Causes full screen repaints to be painted from the top line + down. By default, full screen repaints are done by scrolling from the bottom of the screen. -C or --CLEAR-SCREEN @@ -501,24 +507,24 @@ LESS(1) -d or --dumb The -d option suppresses the error message normally displayed if - the terminal is dumb; that is, lacks some important capability, + the terminal is dumb; that is, lacks some important capability, such as the ability to clear the screen or scroll backward. The - -d option does not otherwise change the behavior of [4mless[24m on a + -d option does not otherwise change the behavior of [4mless[24m on a dumb terminal. -D[1mx[4m[22mcolor[24m or --color=[1mx[4m[22mcolor[0m [MS-DOS only] Sets the color of the text displayed. [1mx [22mis a sin- - gle character which selects the type of text whose color is - being set: n=normal, s=standout, d=bold, u=underlined, k=blink. - [4mcolor[24m is a pair of numbers separated by a period. The first - number selects the foreground color and the second selects the - background color of the text. A single number [4mN[24m is the same as + gle character which selects the type of text whose color is + being set: n=normal, s=standout, d=bold, u=underlined, k=blink. + [4mcolor[24m is a pair of numbers separated by a period. The first + number selects the foreground color and the second selects the + background color of the text. A single number [4mN[24m is the same as [4mN.M[24m, where [4mM[24m is the normal background color. -e or --quit-at-eof - Causes [4mless[24m to automatically exit the second time it reaches - end-of-file. By default, the only way to exit [4mless[24m is via the + Causes [4mless[24m to automatically exit the second time it reaches + end-of-file. By default, the only way to exit [4mless[24m is via the "q" command. -E or --QUIT-AT-EOF @@ -527,7 +533,7 @@ LESS(1) -f or --force Forces non-regular files to be opened. (A non-regular file is a - directory or a device special file.) Also suppresses the warn- + directory or a device special file.) Also suppresses the warn- ing message when a binary file is opened. By default, [4mless[24m will refuse to open non-regular files. Note that some operating sys- tems will not allow directories to be read, even if -f is set. @@ -537,236 +543,236 @@ LESS(1) played on the first screen. -g or --hilite-search - Normally, [4mless[24m will highlight ALL strings which match the last - search command. The -g option changes this behavior to high- - light only the particular string which was found by the last + Normally, [4mless[24m will highlight ALL strings which match the last + search command. The -g option changes this behavior to high- + light only the particular string which was found by the last search command. This can cause [4mless[24m to run somewhat faster than the default. -G or --HILITE-SEARCH - The -G option suppresses all highlighting of strings found by + The -G option suppresses all highlighting of strings found by search commands. -h[4mn[24m or --max-back-scroll=[4mn[0m - Specifies a maximum number of lines to scroll backward. If it + Specifies a maximum number of lines to scroll backward. If it is necessary to scroll backward more than [4mn[24m lines, the screen is repainted in a forward direction instead. (If the terminal does not have the ability to scroll backward, -h0 is implied.) -i or --ignore-case Causes searches to ignore case; that is, uppercase and lowercase - are considered identical. This option is ignored if any upper- - case letters appear in the search pattern; in other words, if a - pattern contains uppercase letters, then that search does not + are considered identical. This option is ignored if any upper- + case letters appear in the search pattern; in other words, if a + pattern contains uppercase letters, then that search does not ignore case. -I or --IGNORE-CASE - Like -i, but searches ignore case even if the pattern contains + Like -i, but searches ignore case even if the pattern contains uppercase letters. -j[4mn[24m or --jump-target=[4mn[0m - Specifies a line on the screen where the "target" line is to be - positioned. The target line is the line specified by any com- - mand to search for a pattern, jump to a line number, jump to a + Specifies a line on the screen where the "target" line is to be + positioned. The target line is the line specified by any com- + mand to search for a pattern, jump to a line number, jump to a file percentage or jump to a tag. The screen line may be speci- - fied by a number: the top line on the screen is 1, the next is + fied by a number: the top line on the screen is 1, the next is 2, and so on. The number may be negative to specify a line rel- ative to the bottom of the screen: the bottom line on the screen - is -1, the second to the bottom is -2, and so on. Alternately, - the screen line may be specified as a fraction of the height of - the screen, starting with a decimal point: .5 is in the middle - of the screen, .3 is three tenths down from the first line, and - so on. If the line is specified as a fraction, the actual line - number is recalculated if the terminal window is resized, so - that the target line remains at the specified fraction of the - screen height. If any form of the -j option is used, forward - searches begin at the line immediately after the target line, - and backward searches begin at the target line, unless changed - by -a or -A. For example, if "-j4" is used, the target line is - the fourth line on the screen, so forward searches begin at the + is -1, the second to the bottom is -2, and so on. Alternately, + the screen line may be specified as a fraction of the height of + the screen, starting with a decimal point: .5 is in the middle + of the screen, .3 is three tenths down from the first line, and + so on. If the line is specified as a fraction, the actual line + number is recalculated if the terminal window is resized, so + that the target line remains at the specified fraction of the + screen height. If any form of the -j option is used, forward + searches begin at the line immediately after the target line, + and backward searches begin at the target line, unless changed + by -a or -A. For example, if "-j4" is used, the target line is + the fourth line on the screen, so forward searches begin at the fifth line on the screen. -J or --status-column - Displays a status column at the left edge of the screen. The - status column shows the lines that matched the current search. - The status column is also used if the -w or -W option is in + Displays a status column at the left edge of the screen. The + status column shows the lines that matched the current search. + The status column is also used if the -w or -W option is in effect. -k[4mfilename[24m or --lesskey-file=[4mfilename[0m - Causes [4mless[24m to open and interpret the named file as a [4mlesskey[0m + Causes [4mless[24m to open and interpret the named file as a [4mlesskey[0m (1) file. Multiple -k options may be specified. If the LESSKEY - or LESSKEY_SYSTEM environment variable is set, or if a lesskey + or LESSKEY_SYSTEM environment variable is set, or if a lesskey file is found in a standard place (see KEY BINDINGS), it is also used as a [4mlesskey[24m file. -K or --quit-on-intr - Causes [4mless[24m to exit immediately (with status 2) when an inter- - rupt character (usually ^C) is typed. Normally, an interrupt + Causes [4mless[24m to exit immediately (with status 2) when an inter- + rupt character (usually ^C) is typed. Normally, an interrupt character causes [4mless[24m to stop whatever it is doing and return to - its command prompt. Note that use of this option makes it + its command prompt. Note that use of this option makes it impossible to return to the command prompt from the "F" command. -L or --no-lessopen - Ignore the LESSOPEN environment variable (see the INPUT PRE- - PROCESSOR section below). This option can be set from within - [4mless[24m, but it will apply only to files opened subsequently, not + Ignore the LESSOPEN environment variable (see the INPUT PRE- + PROCESSOR section below). This option can be set from within + [4mless[24m, but it will apply only to files opened subsequently, not to the file which is currently open. -m or --long-prompt - Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent + Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent into the file. By default, [4mless[24m prompts with a colon. -M or --LONG-PROMPT Causes [4mless[24m to prompt even more verbosely than [4mmore.[0m -n or --line-numbers - Suppresses line numbers. The default (to use line numbers) may - cause [4mless[24m to run more slowly in some cases, especially with a - very large input file. Suppressing line numbers with the -n - option will avoid this problem. Using line numbers means: the + Suppresses line numbers. The default (to use line numbers) may + cause [4mless[24m to run more slowly in some cases, especially with a + very large input file. Suppressing line numbers with the -n + option will avoid this problem. Using line numbers means: the line number will be displayed in the verbose prompt and in the = - command, and the v command will pass the current line number to - the editor (see also the discussion of LESSEDIT in PROMPTS + command, and the v command will pass the current line number to + the editor (see also the discussion of LESSEDIT in PROMPTS below). -N or --LINE-NUMBERS - Causes a line number to be displayed at the beginning of each + Causes a line number to be displayed at the beginning of each line in the display. -o[4mfilename[24m or --log-file=[4mfilename[0m - Causes [4mless[24m to copy its input to the named file as it is being + Causes [4mless[24m to copy its input to the named file as it is being viewed. This applies only when the input file is a pipe, not an - ordinary file. If the file already exists, [4mless[24m will ask for + ordinary file. If the file already exists, [4mless[24m will ask for confirmation before overwriting it. -O[4mfilename[24m or --LOG-FILE=[4mfilename[0m The -O option is like -o, but it will overwrite an existing file without asking for confirmation. - If no log file has been specified, the -o and -O options can be - used from within [4mless[24m to specify a log file. Without a file + If no log file has been specified, the -o and -O options can be + used from within [4mless[24m to specify a log file. Without a file name, they will simply report the name of the log file. The "s" command is equivalent to specifying -o from within [4mless.[0m -p[4mpattern[24m or --pattern=[4mpattern[0m - The -p option on the command line is equivalent to specifying - +/[4mpattern[24m; that is, it tells [4mless[24m to start at the first occur- + The -p option on the command line is equivalent to specifying + +/[4mpattern[24m; that is, it tells [4mless[24m to start at the first occur- rence of [4mpattern[24m in the file. -P[4mprompt[24m or --prompt=[4mprompt[0m - Provides a way to tailor the three prompt styles to your own + Provides a way to tailor the three prompt styles to your own preference. This option would normally be put in the LESS envi- ronment variable, rather than being typed in with each [4mless[24m com- mand. Such an option must either be the last option in the LESS - variable, or be terminated by a dollar sign. -Ps followed by a - string changes the default (short) prompt to that string. -Pm - changes the medium (-m) prompt. -PM changes the long (-M) - prompt. -Ph changes the prompt for the help screen. -P= - changes the message printed by the = command. -Pw changes the - message printed while waiting for data (in the F command). All - prompt strings consist of a sequence of letters and special + variable, or be terminated by a dollar sign. -Ps followed by a + string changes the default (short) prompt to that string. -Pm + changes the medium (-m) prompt. -PM changes the long (-M) + prompt. -Ph changes the prompt for the help screen. -P= + changes the message printed by the = command. -Pw changes the + message printed while waiting for data (in the F command). All + prompt strings consist of a sequence of letters and special escape sequences. See the section on PROMPTS for more details. -q or --quiet or --silent - Causes moderately "quiet" operation: the terminal bell is not + Causes moderately "quiet" operation: the terminal bell is not rung if an attempt is made to scroll past the end of the file or before the beginning of the file. If the terminal has a "visual - bell", it is used instead. The bell will be rung on certain - other errors, such as typing an invalid character. The default + bell", it is used instead. The bell will be rung on certain + other errors, such as typing an invalid character. The default is to ring the terminal bell in all such cases. -Q or --QUIET or --SILENT - Causes totally "quiet" operation: the terminal bell is never + Causes totally "quiet" operation: the terminal bell is never rung. -r or --raw-control-chars Causes "raw" control characters to be displayed. The default is - to display control characters using the caret notation; for + to display control characters using the caret notation; for example, a control-A (octal 001) is displayed as "^A". Warning: when the -r option is used, [4mless[24m cannot keep track of the actual - appearance of the screen (since this depends on how the screen + appearance of the screen (since this depends on how the screen responds to each type of control character). Thus, various dis- - play problems may result, such as long lines being split in the + play problems may result, such as long lines being split in the wrong place. -R or --RAW-CONTROL-CHARS - Like -r, but only ANSI "color" escape sequences are output in + Like -r, but only ANSI "color" escape sequences are output in "raw" form. Unlike -r, the screen appearance is maintained cor- rectly in most cases. ANSI "color" escape sequences are sequences of the form: ESC [ ... m - where the "..." is zero or more color specification characters - For the purpose of keeping track of screen appearance, ANSI - color escape sequences are assumed to not move the cursor. You - can make [4mless[24m think that characters other than "m" can end ANSI - color escape sequences by setting the environment variable + where the "..." is zero or more color specification characters + For the purpose of keeping track of screen appearance, ANSI + color escape sequences are assumed to not move the cursor. You + can make [4mless[24m think that characters other than "m" can end ANSI + color escape sequences by setting the environment variable LESSANSIENDCHARS to the list of characters which can end a color - escape sequence. And you can make [4mless[24m think that characters - other than the standard ones may appear between the ESC and the - m by setting the environment variable LESSANSIMIDCHARS to the + escape sequence. And you can make [4mless[24m think that characters + other than the standard ones may appear between the ESC and the + m by setting the environment variable LESSANSIMIDCHARS to the list of characters which can appear. -s or --squeeze-blank-lines - Causes consecutive blank lines to be squeezed into a single + Causes consecutive blank lines to be squeezed into a single blank line. This is useful when viewing [4mnroff[24m output. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211131514.qADFESsU068814>