From 534c923e035a2aa3aa3007e1fe03a7a19b190bc8 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Thu, 25 Aug 2022 17:10:13 -0500 Subject: [PATCH 1/4] less v608 (from http://www.greenwoodsoftware.com/less) --- Makefile.aut | 8 +- NEWS | 14 +- cmdbuf.c | 3 + command.c | 10 + compose.uni | 20 +- configure | 766 ++++++++++++++++++++++++++------------------------- configure.ac | 42 +-- filename.c | 12 +- fmt.uni | 3 +- help.c | 4 +- less.hlp | 2 +- less.man | 4 +- less.nro | 4 +- lessecho.man | 2 +- lessecho.nro | 2 +- lesskey.man | 82 +++--- lesskey.nro | 11 +- line.c | 7 +- screen.c | 36 ++- ubin.uni | 2 +- version.c | 8 +- wide.uni | 25 +- 22 files changed, 576 insertions(+), 491 deletions(-) diff --git a/Makefile.aut b/Makefile.aut index 4aa1c3a..948532e 100644 --- a/Makefile.aut +++ b/Makefile.aut @@ -114,15 +114,17 @@ wide.uni: unicode/EastAsianWidth.txt unicode/UnicodeData.txt: mkdir -p unicode - curl -s -u 'anonymous:${EMAIL}' -o $@ ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt + lftp -c 'open -u "anonymous:${EMAIL}" ftp.unicode.org ; get Public/UNIDATA/UnicodeData.txt -o $@' + touch $@ unicode/EastAsianWidth.txt: mkdir -p unicode - curl -s -u 'anonymous:${EMAIL}' -o $@ ftp://ftp.unicode.org/Public/UNIDATA/EastAsianWidth.txt + lftp -c 'open -u "anonymous:${EMAIL}" ftp.unicode.org ; get Public/UNIDATA/EastAsianWidth.txt -o $@' + touch $@ distfiles: ${DISTFILES} echo_distfiles: - @echo ${DISTFILES} + @echo $(subst .nro,.nro.VER,${DISTFILES}) dist: ${DISTFILES} if [ ! -d ${srcdir}/release ]; then mkdir ${srcdir}/release; fi diff --git a/NEWS b/NEWS index 83ea946..bcfe4c6 100644 --- a/NEWS +++ b/NEWS @@ -11,7 +11,7 @@ ====================================================================== - Major changes between "less" versions 590 and 603 + Major changes between "less" versions 590 and 608 * Add the --header option (github #43). @@ -56,6 +56,8 @@ * Fix buffer overflow when invoking lessecho with more than 63 -m/-n options (github #198). +* Fix buffer overflow in bin_file (github #271). + * Fix bug restoring color at end of highlighted text. * Fix bug in parsing lesskey file. @@ -64,6 +66,16 @@ * Suppress TAB filename expansion in some cases where it doesn't make sense. +* Fix termlib detection when compiler doesn't accept + calls to undeclared functions. + +* Fix bug in input of non-ASCII characters on Windows (github #247) + +* Escape filenames when invoking LESSCLOSE. + +* Fix bug using multibyte UTF-8 char in search string + with --incsearch (github #273). + ====================================================================== Major changes between "less" versions 581 and 590 diff --git a/cmdbuf.c b/cmdbuf.c index a1c4156..5b57046 100644 --- a/cmdbuf.c +++ b/cmdbuf.c @@ -1378,6 +1378,9 @@ cmd_int(frac) public char * get_cmdbuf(VOID_PARAM) { + if (cmd_mbc_buf_index < cmd_mbc_buf_len) + /* Don't return buffer containing an incomplete multibyte char. */ + return (NULL); return (cmdbuf); } diff --git a/command.c b/command.c index 2e6ad91..524b938 100644 --- a/command.c +++ b/command.c @@ -242,6 +242,8 @@ exec_mca(VOID_PARAM) cmd_exec(); cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; switch (mca) { @@ -423,6 +425,8 @@ mca_opt_nonfirst_char(c) if (cmd_char(c) == CC_QUIT) return (MCA_DONE); p = get_cmdbuf(); + if (p == NULL) + return (MCA_MORE); opt_lower = ASCII_IS_LOWER(p[0]); err = 0; curropt = findopt_name(&p, &oname, &err); @@ -478,6 +482,8 @@ mca_opt_char(c) if (curropt == NULL) { parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); error("There is no --%s option", &parg); return (MCA_DONE); } @@ -702,6 +708,8 @@ mca_char(c) /* Incremental search: do a search after every input char. */ int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP)); char *pattern = get_cmdbuf(); + if (pattern == NULL) + return (MCA_MORE); /* * Must save updown_match because mca_search * reinits it. That breaks history scrolling. @@ -1308,6 +1316,8 @@ commands(VOID_PARAM) if (cmd_char(c) == CC_QUIT || len_cmdbuf() == 0) continue; cbuf = get_cmdbuf(); + if (cbuf == NULL) + continue; } else { /* diff --git a/compose.uni b/compose.uni index bbf4b20..cc7ddcf 100644 --- a/compose.uni +++ b/compose.uni @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Tue May 19 14:47:34 PDT 2020 */ +/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Tue Jul 19 12:45:16 PDT 2022 */ { 0x0300, 0x036f }, /* Mn */ { 0x0483, 0x0487 }, /* Mn */ { 0x0488, 0x0489 }, /* Me */ @@ -24,7 +24,8 @@ { 0x0825, 0x0827 }, /* Mn */ { 0x0829, 0x082d }, /* Mn */ { 0x0859, 0x085b }, /* Mn */ - { 0x08d3, 0x08e1 }, /* Mn */ + { 0x0898, 0x089f }, /* Mn */ + { 0x08ca, 0x08e1 }, /* Mn */ { 0x08e3, 0x0902 }, /* Mn */ { 0x093a, 0x093a }, /* Mn */ { 0x093c, 0x093c }, /* Mn */ @@ -65,6 +66,7 @@ { 0x0bcd, 0x0bcd }, /* Mn */ { 0x0c00, 0x0c00 }, /* Mn */ { 0x0c04, 0x0c04 }, /* Mn */ + { 0x0c3c, 0x0c3c }, /* Mn */ { 0x0c3e, 0x0c40 }, /* Mn */ { 0x0c46, 0x0c48 }, /* Mn */ { 0x0c4a, 0x0c4d }, /* Mn */ @@ -115,7 +117,7 @@ { 0x1160, 0x11ff }, /* Mn */ { 0x135d, 0x135f }, /* Mn */ { 0x1712, 0x1714 }, /* Mn */ - { 0x1732, 0x1734 }, /* Mn */ + { 0x1732, 0x1733 }, /* Mn */ { 0x1752, 0x1753 }, /* Mn */ { 0x1772, 0x1773 }, /* Mn */ { 0x17b4, 0x17b5 }, /* Mn */ @@ -124,6 +126,7 @@ { 0x17c9, 0x17d3 }, /* Mn */ { 0x17dd, 0x17dd }, /* Mn */ { 0x180b, 0x180d }, /* Mn */ + { 0x180f, 0x180f }, /* Mn */ { 0x1885, 0x1886 }, /* Mn */ { 0x18a9, 0x18a9 }, /* Mn */ { 0x1920, 0x1922 }, /* Mn */ @@ -141,7 +144,7 @@ { 0x1a7f, 0x1a7f }, /* Mn */ { 0x1ab0, 0x1abd }, /* Mn */ { 0x1abe, 0x1abe }, /* Me */ - { 0x1abf, 0x1ac0 }, /* Mn */ + { 0x1abf, 0x1ace }, /* Mn */ { 0x1b00, 0x1b03 }, /* Mn */ { 0x1b34, 0x1b34 }, /* Mn */ { 0x1b36, 0x1b3a }, /* Mn */ @@ -164,8 +167,7 @@ { 0x1ced, 0x1ced }, /* Mn */ { 0x1cf4, 0x1cf4 }, /* Mn */ { 0x1cf8, 0x1cf9 }, /* Mn */ - { 0x1dc0, 0x1df9 }, /* Mn */ - { 0x1dfb, 0x1dff }, /* Mn */ + { 0x1dc0, 0x1dff }, /* Mn */ { 0x20d0, 0x20dc }, /* Mn */ { 0x20dd, 0x20e0 }, /* Me */ { 0x20e1, 0x20e1 }, /* Mn */ @@ -229,11 +231,15 @@ { 0x10d24, 0x10d27 }, /* Mn */ { 0x10eab, 0x10eac }, /* Mn */ { 0x10f46, 0x10f50 }, /* Mn */ + { 0x10f82, 0x10f85 }, /* Mn */ { 0x11001, 0x11001 }, /* Mn */ { 0x11038, 0x11046 }, /* Mn */ + { 0x11070, 0x11070 }, /* Mn */ + { 0x11073, 0x11074 }, /* Mn */ { 0x1107f, 0x11081 }, /* Mn */ { 0x110b3, 0x110b6 }, /* Mn */ { 0x110b9, 0x110ba }, /* Mn */ + { 0x110c2, 0x110c2 }, /* Mn */ { 0x11100, 0x11102 }, /* Mn */ { 0x11127, 0x1112b }, /* Mn */ { 0x1112d, 0x11134 }, /* Mn */ @@ -313,6 +319,8 @@ { 0x16f8f, 0x16f92 }, /* Mn */ { 0x16fe4, 0x16fe4 }, /* Mn */ { 0x1bc9d, 0x1bc9e }, /* Mn */ + { 0x1cf00, 0x1cf2d }, /* Mn */ + { 0x1cf30, 0x1cf46 }, /* Mn */ { 0x1d167, 0x1d169 }, /* Mn */ { 0x1d17b, 0x1d182 }, /* Mn */ { 0x1d185, 0x1d18b }, /* Mn */ diff --git a/configure b/configure index ea63b34..eb346f8 100644 --- a/configure +++ b/configure @@ -4048,434 +4048,143 @@ if test "$ac_res" != no; then : fi -# Checks for terminal libraries -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working terminal libraries" >&5 -$as_echo_n "checking for working terminal libraries... " >&6; } -TERMLIBS= - -# Check for systems where curses is broken. -curses_broken=0 -if test x`uname -s` = "xHP-UX" >/dev/null 2>&1; then -if test x`uname -r` = "xB.11.00" >/dev/null 2>&1; then - curses_broken=1 -fi -if test x`uname -r` = "xB.11.11" >/dev/null 2>&1; then - curses_broken=1 -fi -fi - -if test $curses_broken = 0; then - -# -- Try tinfo. -if test "x$TERMLIBS" = x; then - if test $have_tinfo = yes; then - TERMLIBS="-ltinfo" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +# Checks for header files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#include +#include int main () { -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - termok=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi + ac_cv_header_stdc=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# -- Try tinfow. -if test "x$TERMLIBS" = x; then - if test $have_tinfow = yes; then - TERMLIBS="-ltinfow" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + else - termok=no + ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi +rm -f conftest* + fi -# -- Try xcurses. -if test "x$TERMLIBS" = x; then - if test $have_xcurses = yes; then - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + else - termok=no + ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi +rm -f conftest* + fi -# -- Try ncursesw. -if test "x$TERMLIBS" = x; then - if test $have_ncursesw = yes; then - TERMLIBS="-lncursesw" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes +if ac_fn_c_try_run "$LINENO"; then : + else - termok=no + ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -# -- Try ncurses. -if test "x$TERMLIBS" = x; then - if test $have_ncurses = yes; then - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes -else - termok=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -# -- Try curses. -if test "x$TERMLIBS" = x; then - if test $have_curses = yes; then - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes -else - termok=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi -# -- Try curses & termcap. -if test "x$TERMLIBS" = x; then - if test $have_curses = yes; then - if test $have_termcap = yes; then - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +done -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes -else - termok=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi - fi -fi -fi - -# -- Try termcap. -if test "x$TERMLIBS" = x; then - if test $have_termcap = yes; then - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes -else - termok=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -fi - -# -- Try termlib. -if test "x$TERMLIBS" = x; then - if test $have_termlib = yes; then - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - termok=yes -else - termok=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -fi - -if test "x$TERMLIBS" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cannot find terminal libraries - configure failed" >&5 -$as_echo "Cannot find terminal libraries - configure failed" >&6; } - exit 1 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $TERMLIBS" >&5 -$as_echo "using $TERMLIBS" >&6; } -LIBS="$LIBS $TERMLIBS" - -# Checks for header files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + +for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -4665,6 +4374,299 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi +# Checks for terminal libraries +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working terminal libraries" >&5 +$as_echo_n "checking for working terminal libraries... " >&6; } +TERMLIBS= +include_termcap_h= +if test "x$ac_cv_header_termcap_h" = xyes; then include_termcap_h="#include "; fi + +# Check for systems where curses is broken. +curses_broken=0 +if test x`uname -s` = "xHP-UX" >/dev/null 2>&1; then +if test x`uname -r` = "xB.11.00" >/dev/null 2>&1; then + curses_broken=1 +fi +if test x`uname -r` = "xB.11.11" >/dev/null 2>&1; then + curses_broken=1 +fi +fi + +if test $curses_broken = 0; then + +# -- Try tinfo. +if test "x$TERMLIBS" = x; then + if test $have_tinfo = yes; then + TERMLIBS="-ltinfo" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try tinfow. +if test "x$TERMLIBS" = x; then + if test $have_tinfow = yes; then + TERMLIBS="-ltinfow" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try xcurses. +if test "x$TERMLIBS" = x; then + if test $have_xcurses = yes; then + TERMLIBS="-lxcurses" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try ncursesw. +if test "x$TERMLIBS" = x; then + if test $have_ncursesw = yes; then + TERMLIBS="-lncursesw" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try ncurses. +if test "x$TERMLIBS" = x; then + if test $have_ncurses = yes; then + TERMLIBS="-lncurses" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try curses. +if test "x$TERMLIBS" = x; then + if test $have_curses = yes; then + TERMLIBS="-lcurses" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try curses & termcap. +if test "x$TERMLIBS" = x; then + if test $have_curses = yes; then + if test $have_termcap = yes; then + TERMLIBS="-lcurses -ltermcap" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi + fi +fi +fi + +# -- Try termcap. +if test "x$TERMLIBS" = x; then + if test $have_termcap = yes; then + TERMLIBS="-ltermcap" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +# -- Try termlib. +if test "x$TERMLIBS" = x; then + if test $have_termlib = yes; then + TERMLIBS="-lcurses -ltermlib" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$include_termcap_h +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + +if test "x$TERMLIBS" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cannot find terminal libraries - configure failed" >&5 +$as_echo "Cannot find terminal libraries - configure failed" >&6; } + exit 1 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $TERMLIBS" >&5 +$as_echo "using $TERMLIBS" >&6; } +LIBS="$LIBS $TERMLIBS" + # Autoheader templates for symbols defined later by AC_DEFINE. diff --git a/configure.ac b/configure.ac index 15da486..f7c6481 100644 --- a/configure.ac +++ b/configure.ac @@ -35,9 +35,22 @@ AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no]) # at least on Solaris 10 (2.10)) and in -lintl on SCO Unix. AC_SEARCH_LIBS([regcmp], [gen intl PW]) +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STAT +AC_C_CONST +AC_TYPE_OFF_T +AC_TYPE_SIZE_T +AC_HEADER_TIME + # Checks for terminal libraries AC_MSG_CHECKING([for working terminal libraries]) TERMLIBS= +include_termcap_h= +if test "x$ac_cv_header_termcap_h" = xyes; then include_termcap_h="#include "; fi # Check for systems where curses is broken. curses_broken=0 @@ -58,7 +71,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-ltinfo" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -71,7 +84,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-ltinfow" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -84,7 +97,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-lxcurses" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -97,7 +110,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-lncursesw" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -110,7 +123,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-lncurses" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK([#include ], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -123,7 +136,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-lcurses" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -137,7 +150,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-lcurses -ltermcap" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -152,7 +165,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-ltermcap" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -165,7 +178,7 @@ if test "x$TERMLIBS" = x; then TERMLIBS="-lcurses -ltermlib" SAVE_LIBS=$LIBS LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + AC_TRY_LINK([$include_termcap_h], [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], [termok=yes], [termok=no]) LIBS=$SAVE_LIBS if test $termok = no; then TERMLIBS=""; fi @@ -179,17 +192,6 @@ fi AC_MSG_RESULT(using $TERMLIBS) LIBS="$LIBS $TERMLIBS" -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STAT -AC_C_CONST -AC_TYPE_OFF_T -AC_TYPE_SIZE_T -AC_HEADER_TIME - # Autoheader templates for symbols defined later by AC_DEFINE. AH_TEMPLATE([HAVE_GNU_REGEX], [GNU regex library]) diff --git a/filename.c b/filename.c index 5824e38..6d29753 100644 --- a/filename.c +++ b/filename.c @@ -477,7 +477,7 @@ bin_file(f) edata = &data[n]; for (p = data; p < edata; ) { - if (utf_mode && !is_utf8_well_formed(p, edata-data)) + if (utf_mode && !is_utf8_well_formed(p, edata-p)) { bin_count++; utf_skip_to_lead(&p, edata); @@ -972,6 +972,8 @@ close_altfile(altfilename, filename) { #if HAVE_POPEN char *lessclose; + char *qfilename; + char *qaltfilename; FILE *fd; char *cmd; int len; @@ -986,9 +988,13 @@ close_altfile(altfilename, filename) error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG); return; } - len = (int) (strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2); + qfilename = shell_quote(filename); + qaltfilename = shell_quote(altfilename); + len = (int) (strlen(lessclose) + strlen(qfilename) + strlen(qaltfilename) + 2); cmd = (char *) ecalloc(len, sizeof(char)); - SNPRINTF2(cmd, len, lessclose, filename, altfilename); + SNPRINTF2(cmd, len, lessclose, qfilename, qaltfilename); + free(qaltfilename); + free(qfilename); fd = shellcmd(cmd); free(cmd); if (fd != NULL) diff --git a/fmt.uni b/fmt.uni index bef4227..c482294 100644 --- a/fmt.uni +++ b/fmt.uni @@ -1,9 +1,10 @@ -/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Tue May 19 14:47:34 PDT 2020 */ +/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Tue Jul 19 12:45:17 PDT 2022 */ { 0x00ad, 0x00ad }, /* Cf */ { 0x0600, 0x0605 }, /* Cf */ { 0x061c, 0x061c }, /* Cf */ { 0x06dd, 0x06dd }, /* Cf */ { 0x070f, 0x070f }, /* Cf */ + { 0x0890, 0x0891 }, /* Cf */ { 0x08e2, 0x08e2 }, /* Cf */ { 0x180e, 0x180e }, /* Cf */ { 0x200b, 0x200f }, /* Cf */ diff --git a/help.c b/help.c index eab7101..75a91d1 100644 --- a/help.c +++ b/help.c @@ -1,4 +1,4 @@ -/* This file was generated by mkhelp.pl from less.hlp at 20:55 on 2022/3/14 */ +/* This file was generated by mkhelp.pl from less.hlp at 19:26 on 2022/7/22 */ #include "less.h" constant char helpdata[] = { '\n', @@ -79,7 +79,7 @@ constant char helpdata[] = { ' ',' ','\'','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','G','o',' ','t','o',' ','a',' ','p','r','e','v','i','o','u','s','l','y',' ','m','a','r','k','e','d',' ','p','o','s','i','t','i','o','n','.','\n', ' ',' ','\'','\'',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','G','o',' ','t','o',' ','t','h','e',' ','p','r','e','v','i','o','u','s',' ','p','o','s','i','t','i','o','n','.','\n', ' ',' ','^','X','^','X',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','a','m','e',' ','a','s',' ','\'','.','\n', -' ',' ','E','S','C','-','M','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ','C','l','e','a','r',' ','a',' ','m','a','r','k','.','\n', +' ',' ','E','S','C','-','m','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ','C','l','e','a','r',' ','a',' ','m','a','r','k','.','\n', ' ',' ',' ',' ',' ',' ',' ',' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n', ' ',' ',' ',' ',' ',' ',' ',' ','A',' ','m','a','r','k',' ','i','s',' ','a','n','y',' ','u','p','p','e','r','-','c','a','s','e',' ','o','r',' ','l','o','w','e','r','-','c','a','s','e',' ','l','e','t','t','e','r','.','\n', ' ',' ',' ',' ',' ',' ',' ',' ','C','e','r','t','a','i','n',' ','m','a','r','k','s',' ','a','r','e',' ','p','r','e','d','e','f','i','n','e','d',':','\n', diff --git a/less.hlp b/less.hlp index bce7b16..5972578 100644 --- a/less.hlp +++ b/less.hlp @@ -76,7 +76,7 @@ '_<_l_e_t_t_e_r_> Go to a previously marked position. '' Go to the previous position. ^X^X Same as '. - ESC-M_<_l_e_t_t_e_r_> Clear a mark. + ESC-m_<_l_e_t_t_e_r_> Clear a mark. --------------------------------------------------- A mark is any upper-case or lower-case letter. Certain marks are predefined: diff --git a/less.man b/less.man index 71751a2..f5f90f1 100644 --- a/less.man +++ b/less.man @@ -1881,7 +1881,7 @@ LESS(1) General Commands Manual LESS(1) lesskey(1) COPYRIGHT - Copyright (C) 1984-2021 Mark Nudelman + Copyright (C) 1984-2022 Mark Nudelman less is part of the GNU project and is free software. You can redis- tribute it and/or modify it under the terms of either (1) the GNU Gen- @@ -1906,4 +1906,4 @@ LESS(1) General Commands Manual LESS(1) - Version 603: 14 Mar 2022 LESS(1) + Version 608: 22 Jul 2022 LESS(1) diff --git a/less.nro b/less.nro index 81214e7..b6dfa43 100644 --- a/less.nro +++ b/less.nro @@ -1,5 +1,5 @@ '\" t -.TH LESS 1 "Version 603: 14 Mar 2022" +.TH LESS 1 "Version 608: 22 Jul 2022" .SH NAME less \- opposite of more .SH SYNOPSIS @@ -2057,7 +2057,7 @@ The name of the editor (used for the v command). .BR lesskey (1) . .SH COPYRIGHT -Copyright (C) 1984-2021 Mark Nudelman +Copyright (C) 1984-2022 Mark Nudelman .PP less is part of the GNU project and is free software. You can redistribute it and/or modify it diff --git a/lessecho.man b/lessecho.man index f9cea13..e18b7fb 100644 --- a/lessecho.man +++ b/lessecho.man @@ -51,4 +51,4 @@ LESSECHO(1) General Commands Manual LESSECHO(1) - Version 603: 14 Mar 2022 LESSECHO(1) + Version 608: 22 Jul 2022 LESSECHO(1) diff --git a/lessecho.nro b/lessecho.nro index ccba753..5b16d4a 100644 --- a/lessecho.nro +++ b/lessecho.nro @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 603: 14 Mar 2022" +.TH LESSECHO 1 "Version 608: 22 Jul 2022" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS diff --git a/lesskey.man b/lesskey.man index 5eb1c92..c5a90a4 100644 --- a/lesskey.man +++ b/lesskey.man @@ -101,7 +101,8 @@ LESSKEY(1) General Commands Manual LESSKEY(1) EXAMPLE The following input file describes the set of default command keys used - by less: + by less. Documentation on each command can be found in the man page, + under the key sequence which invokes the command. #command @@ -128,8 +129,8 @@ LESSKEY(1) General Commands Manual LESSKEY(1) f forw-screen ^F forw-screen ^V forw-screen - \kD forw-screen + \kD forw-screen b back-screen ^B back-screen \ev back-screen @@ -194,14 +195,16 @@ LESSKEY(1) General Commands Manual LESSKEY(1) ^X^V examine :n next-file :p prev-file - t next-tag + t next-tag T prev-tag :x index-file :d remove-file - toggle-option :t toggle-option t s toggle-option o + ## Use a long option name by starting the extra string with ONE dash; eg: + ## s toggle-option -log-file _ display-option | pipe v visual @@ -228,20 +231,20 @@ LESSKEY(1) General Commands Manual LESSKEY(1) PRECEDENCE - Commands specified by lesskey take precedence over the default com- - mands. A default command key may be disabled by including it in the - input file with the action "invalid". Alternatively, a key may be de- + Commands specified by lesskey take precedence over the default com- + mands. A default command key may be disabled by including it in the + input file with the action "invalid". Alternatively, a key may be de- fined to do nothing by using the action "noaction". "noaction" is sim- - ilar to "invalid", but less will give an error beep for an "invalid" - command, but not for a "noaction" command. In addition, ALL default + ilar to "invalid", but less will give an error beep for an "invalid" + command, but not for a "noaction" command. In addition, ALL default commands may be disabled by adding this control line to the input file: #stop - This will cause all default commands to be ignored. The #stop line + This will cause all default commands to be ignored. The #stop line should be the last line in that section of the file. - Be aware that #stop can be dangerous. Since all default commands are + Be aware that #stop can be dangerous. Since all default commands are disabled, you must provide sufficient commands before the #stop line to enable all necessary actions. For example, failure to provide a "quit" command can lead to frustration. @@ -251,9 +254,9 @@ LESSKEY(1) General Commands Manual LESSKEY(1) #line-edit - This section specifies new key bindings for the line editing commands, - in a manner similar to the way key bindings for ordinary commands are - specified in the #command section. The line-editing section consists + This section specifies new key bindings for the line editing commands, + in a manner similar to the way key bindings for ordinary commands are + specified in the #command section. The line-editing section consists of a list of keys and actions, one per line as in the example below. EXAMPLE @@ -261,7 +264,6 @@ LESSKEY(1) General Commands Manual LESSKEY(1) used by less: - #line-edit \t forw-complete \17 back-complete @@ -298,30 +300,30 @@ LESSKEY(1) General Commands Manual LESSKEY(1) #env - Following this line is a list of environment variable assignments. - Each line consists of an environment variable name, an equals sign (=) - and the value to be assigned to the environment variable. White space - before and after the equals sign is ignored. Variables assigned in - this way are visible only to less. If a variable is specified in the + Following this line is a list of environment variable assignments. + Each line consists of an environment variable name, an equals sign (=) + and the value to be assigned to the environment variable. White space + before and after the equals sign is ignored. Variables assigned in + this way are visible only to less. If a variable is specified in the system environment and also in a lesskey file, the value in the lesskey file takes precedence. If the variable name is followed by += rather than =, the string is ap- - pended to the variable's existing value. This currently works only if + pended to the variable's existing value. This currently works only if any += lines immediately follow the same variable's original definition - (with an = line), without any intervening definitions of other vari- - ables. It can append only to a variable defined earlier in the file; + (with an = line), without any intervening definitions of other vari- + ables. It can append only to a variable defined earlier in the file; it cannot append to a variable in the system environment. CONDITIONAL CONFIGURATION - If a line begins with #version followed by a relational operator and a - version number, the remainder of the line is parsed if and only if the + If a line begins with #version followed by a relational operator and a + version number, the remainder of the line is parsed if and only if the running version of less (or lesskey) matches the operator. This can be helpful if a lesskey file is used by different versions of less. - For example, suppose that a new command named 'sideways-search' is - added in less version 777. Then the following line would assign the - command to the Q key, but only in versions of less which support it. + For example, suppose that a new command named 'sideways-search' is + added in less version 777. Then the following line would assign the + command to the Q key, but only in versions of less which support it. The line would be ignored by versions earlier than 777. #version >= 777 Q sideways-search @@ -335,7 +337,7 @@ LESSKEY(1) General Commands Manual LESSKEY(1) = Equal to != Not equal to - The #version feature is not supported in less and lesskey before ver- + The #version feature is not supported in less and lesskey before ver- sion 594. In those older versions, all #version lines are ignored. EXAMPLE @@ -350,26 +352,26 @@ LESSKEY(1) General Commands Manual LESSKEY(1) less(1) WARNINGS - On MS-DOS and OS/2 systems, certain keys send a sequence of characters - which start with a NUL character (0). This NUL character should be + On MS-DOS and OS/2 systems, certain keys send a sequence of characters + which start with a NUL character (0). This NUL character should be represented as \340 in a lesskey file. COPYRIGHT - Copyright (C) 1984-2021 Mark Nudelman + Copyright (C) 1984-2022 Mark Nudelman - less is part of the GNU project and is free software. You can redis- - tribute it and/or modify it under the terms of either (1) the GNU Gen- - eral Public License as published by the Free Software Foundation; or + less is part of the GNU project and is free software. You can redis- + tribute it and/or modify it under the terms of either (1) the GNU Gen- + eral Public License as published by the Free Software Foundation; or (2) the Less License. See the file README in the less distribution for more details regarding redistribution. You should have received a copy - of the GNU General Public License along with the source for less; see - the file COPYING. If not, write to the Free Software Foundation, 59 - Temple Place, Suite 330, Boston, MA 02111-1307, USA. You should also + of the GNU General Public License along with the source for less; see + the file COPYING. If not, write to the Free Software Foundation, 59 + Temple Place, Suite 330, Boston, MA 02111-1307, USA. You should also have received a copy of the Less License; see the file LICENSE. less is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FIT- - NESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + WARRANTY; without even the implied warranty of MERCHANTABILITY or FIT- + NESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. AUTHOR @@ -378,4 +380,4 @@ LESSKEY(1) General Commands Manual LESSKEY(1) - Version 603: 14 Mar 2022 LESSKEY(1) + Version 608: 22 Jul 2022 LESSKEY(1) diff --git a/lesskey.nro b/lesskey.nro index 43a110d..0e8cb1b 100644 --- a/lesskey.nro +++ b/lesskey.nro @@ -1,5 +1,5 @@ '\" t -.TH LESSKEY 1 "Version 603: 14 Mar 2022" +.TH LESSKEY 1 "Version 608: 22 Jul 2022" .SH NAME lesskey \- customize key bindings for less .SH "SYNOPSIS (deprecated)" @@ -127,7 +127,10 @@ quits, the first character of the extra string is used as its exit status. .SH EXAMPLE The following input file describes the set of default command keys used by -.IR less : +.IR less . +Documentation on each command can be found in the +.less +man page, under the key sequence which invokes the command. .sp .RS 5m .TS @@ -228,6 +231,8 @@ T prev-tag - toggle-option :t toggle-option t s toggle-option o + ## Use a long option name by starting the extra string with ONE dash; eg: + ## s toggle-option -log-file\n \&_ display-option | pipe v visual @@ -416,7 +421,7 @@ which start with a NUL character (0). This NUL character should be represented as \e340 in a lesskey file. . .SH COPYRIGHT -Copyright (C) 1984-2021 Mark Nudelman +Copyright (C) 1984-2022 Mark Nudelman .PP less is part of the GNU project and is free software. You can redistribute it and/or modify it diff --git a/line.c b/line.c index c22cdc1..2f1b3fb 100644 --- a/line.c +++ b/line.c @@ -1035,15 +1035,13 @@ store_ansi(ch, rep, pos) switch (ansi_step(line_ansi, ch)) { case ANSI_MID: - if (!in_hilite) - STORE_CHAR(ch, AT_ANSI, rep, pos); + STORE_CHAR(ch, AT_ANSI, rep, pos); if (line_ansi->hlink) hlink_in_line = 1; xbuf_add(&last_ansi, ch); break; case ANSI_END: - if (!in_hilite) - STORE_CHAR(ch, AT_ANSI, rep, pos); + STORE_CHAR(ch, AT_ANSI, rep, pos); ansi_done(line_ansi); line_ansi = NULL; xbuf_add(&last_ansi, ch); @@ -1052,7 +1050,6 @@ store_ansi(ch, rep, pos) curr_last_ansi = (curr_last_ansi + 1) % NUM_LAST_ANSIS; break; case ANSI_ERR: - if (!in_hilite) { /* Remove whole unrecognized sequence. */ char *start = (cshift < hshift) ? shifted_ansi.data : linebuf.buf; diff --git a/screen.c b/screen.c index aa31804..7c903ab 100644 --- a/screen.c +++ b/screen.c @@ -128,8 +128,10 @@ extern int sc_height; #endif #if MSDOS_COMPILER==WIN32C +#define UTF8_MAX_LENGTH 4 struct keyRecord { + WCHAR unicode; int ascii; int scan; } currentKey; @@ -2847,10 +2849,10 @@ win32_kbhit(VOID_PARAM) */ do { - PeekConsoleInput(tty, &ip, 1, &read); + PeekConsoleInputW(tty, &ip, 1, &read); if (read == 0) return (FALSE); - ReadConsoleInput(tty, &ip, 1, &read); + ReadConsoleInputW(tty, &ip, 1, &read); /* generate an X11 mouse sequence from the mouse event */ if (mousecap && ip.EventType == MOUSE_EVENT && ip.Event.MouseEvent.dwEventFlags != MOUSE_MOVED) @@ -2881,11 +2883,13 @@ win32_kbhit(VOID_PARAM) } } while (ip.EventType != KEY_EVENT || ip.Event.KeyEvent.bKeyDown != TRUE || - ip.Event.KeyEvent.wVirtualScanCode == 0 || + (ip.Event.KeyEvent.wVirtualScanCode == 0 && ip.Event.KeyEvent.uChar.UnicodeChar == 0) || + ip.Event.KeyEvent.wVirtualKeyCode == VK_KANJI || ip.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT || ip.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL || ip.Event.KeyEvent.wVirtualKeyCode == VK_MENU); + currentKey.unicode = ip.Event.KeyEvent.uChar.UnicodeChar; currentKey.ascii = ip.Event.KeyEvent.uChar.AsciiChar; currentKey.scan = ip.Event.KeyEvent.wVirtualScanCode; keyCount = ip.Event.KeyEvent.wRepeatCount; @@ -2933,7 +2937,18 @@ win32_kbhit(VOID_PARAM) public char WIN32getch(VOID_PARAM) { - int ascii; + char ascii; + static unsigned char utf8[UTF8_MAX_LENGTH]; + static int utf8_size = 0; + static int utf8_next_byte = 0; + + // Return the rest of multibyte character from the prior call + if (utf8_next_byte < utf8_size) + { + ascii = utf8[utf8_next_byte++]; + return ascii; + } + utf8_size = 0; if (pending_scancode) { @@ -2950,7 +2965,16 @@ WIN32getch(VOID_PARAM) continue; } keyCount --; - ascii = currentKey.ascii; + // If multibyte character, return its first byte + if (currentKey.ascii != currentKey.unicode) + { + utf8_size = WideCharToMultiByte(CP_UTF8, 0, ¤tKey.unicode, 1, &utf8, sizeof(utf8), NULL, NULL); + if (utf8_size == 0 ) + return '\0'; + ascii = utf8[0]; + utf8_next_byte = 1; + } else + ascii = currentKey.ascii; /* * On PC's, the extended keys return a 2 byte sequence beginning * with '00', so if the ascii code is 00, the next byte will be @@ -2960,7 +2984,7 @@ WIN32getch(VOID_PARAM) } while (pending_scancode && (currentKey.scan == PCK_CAPS_LOCK || currentKey.scan == PCK_NUM_LOCK)); - return ((char)ascii); + return ascii; } #endif diff --git a/ubin.uni b/ubin.uni index 10a48d5..661cccb 100644 --- a/ubin.uni +++ b/ubin.uni @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Cc Cs Co Zl Zp -- unicode/UnicodeData.txt" on Tue May 19 14:47:34 PDT 2020 */ +/* Generated by "./mkutable -f2 Cc Cs Co Zl Zp -- unicode/UnicodeData.txt" on Tue Jul 19 12:45:17 PDT 2022 */ { 0x0000, 0x0007 }, /* Cc */ { 0x000b, 0x000b }, /* Cc */ { 0x000e, 0x001f }, /* Cc */ diff --git a/version.c b/version.c index 6a72a52..44e8116 100644 --- a/version.c +++ b/version.c @@ -948,6 +948,12 @@ v600 1/7/22 Use /dev/tty if cannot open ttyname(). v601 1/31/22 Add --exit-follow-on-close option. v602 3/1/22 Doc changes. v603 3/14/22 Fix --header. +v604 5/14/22 Fix termlib detection; fix non-ASCII input on Windows. +v605 6/14/22 Update version number. +v606 7/17/22 Fix bug with multibyte chars and --incsearch; + escape filenames in LESSCLOSE; fix bin_file overrun. +v607 7/19/22 Update Unicode tables. +v608 7/22/22 Fix highlighting on colored text boundaries. */ -char version[] = "603"; +char version[] = "608"; diff --git a/wide.uni b/wide.uni index f1ec98d..0e99223 100644 --- a/wide.uni +++ b/wide.uni @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f1 W F -- unicode/EastAsianWidth.txt" on Tue May 19 14:47:35 PDT 2020 */ +/* Generated by "./mkutable -f1 W F -- unicode/EastAsianWidth.txt" on Tue Jul 19 12:45:19 PDT 2022 */ { 0x1100, 0x115f }, /* W */ { 0x231a, 0x231b }, /* W */ { 0x2329, 0x232a }, /* W */ @@ -64,7 +64,10 @@ { 0x17000, 0x187f7 }, /* W */ { 0x18800, 0x18cd5 }, /* W */ { 0x18d00, 0x18d08 }, /* W */ - { 0x1b000, 0x1b11e }, /* W */ + { 0x1aff0, 0x1aff3 }, /* W */ + { 0x1aff5, 0x1affb }, /* W */ + { 0x1affd, 0x1affe }, /* W */ + { 0x1b000, 0x1b122 }, /* W */ { 0x1b150, 0x1b152 }, /* W */ { 0x1b164, 0x1b167 }, /* W */ { 0x1b170, 0x1b2fb }, /* W */ @@ -99,20 +102,22 @@ { 0x1f6cc, 0x1f6cc }, /* W */ { 0x1f6d0, 0x1f6d2 }, /* W */ { 0x1f6d5, 0x1f6d7 }, /* W */ + { 0x1f6dd, 0x1f6df }, /* W */ { 0x1f6eb, 0x1f6ec }, /* W */ { 0x1f6f4, 0x1f6fc }, /* W */ { 0x1f7e0, 0x1f7eb }, /* W */ + { 0x1f7f0, 0x1f7f0 }, /* W */ { 0x1f90c, 0x1f93a }, /* W */ { 0x1f93c, 0x1f945 }, /* W */ - { 0x1f947, 0x1f978 }, /* W */ - { 0x1f97a, 0x1f9cb }, /* W */ - { 0x1f9cd, 0x1f9ff }, /* W */ + { 0x1f947, 0x1f9ff }, /* W */ { 0x1fa70, 0x1fa74 }, /* W */ - { 0x1fa78, 0x1fa7a }, /* W */ + { 0x1fa78, 0x1fa7c }, /* W */ { 0x1fa80, 0x1fa86 }, /* W */ - { 0x1fa90, 0x1faa8 }, /* W */ - { 0x1fab0, 0x1fab6 }, /* W */ - { 0x1fac0, 0x1fac2 }, /* W */ - { 0x1fad0, 0x1fad6 }, /* W */ + { 0x1fa90, 0x1faac }, /* W */ + { 0x1fab0, 0x1faba }, /* W */ + { 0x1fac0, 0x1fac5 }, /* W */ + { 0x1fad0, 0x1fad9 }, /* W */ + { 0x1fae0, 0x1fae7 }, /* W */ + { 0x1faf0, 0x1faf6 }, /* W */ { 0x20000, 0x2fffd }, /* W */ { 0x30000, 0x3fffd }, /* W */ From 1a75323b31e3ac4ca0bd2f2e5f53ac9e0670363c Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 2 Oct 2022 23:56:08 -0500 Subject: [PATCH 2/4] Maint ~ whitespace clean-up (`fix-repo-whitespace` + initial makefile TABS) --- INSTALL | 1 - LICENSE | 17 +- Makefile.aut | 22 +- Makefile.dsb | 5 +- Makefile.dsg | 1 - Makefile.dsu | 5 +- Makefile.in | 7 +- Makefile.o9c | 2 +- Makefile.wnb | 19 +- Makefile.wng | 42 +- Makefile.wnm | 6 +- NEWS | 205 ++- README | 36 +- brac.c | 148 +- ch.c | 1330 ++++++++-------- charset.c | 1127 +++++++------- cmdbuf.c | 2478 ++++++++++++++--------------- command.c | 3424 ++++++++++++++++++++-------------------- compose.uni | 688 ++++----- configure | 557 ++++--- configure.ac | 192 +-- cvt.c | 152 +- decode.c | 1591 ++++++++++--------- defines.ds | 204 +-- defines.h.in | 106 +- defines.o2 | 140 +- defines.o9 | 124 +- defines.wn | 162 +- edit.c | 1296 ++++++++-------- filename.c | 1646 ++++++++++---------- fmt.uni | 42 +- forwback.c | 810 +++++----- ifile.c | 424 ++--- input.c | 786 +++++----- install.sh | 72 +- jump.c | 482 +++--- less.h | 14 +- less.hlp | 6 +- less.nro | 144 +- lessecho.c | 436 +++--- lesskey.c | 426 ++--- lesskey.h | 18 +- lesskey.nro | 374 ++--- lesskey_parse.c | 1042 ++++++------- line.c | 2384 ++++++++++++++-------------- linenum.c | 698 ++++----- lsystem.c | 486 +++--- main.c | 600 +++---- mark.c | 586 +++---- mkfuncs.pl | 36 +- mkfuncs.py | 4 +- mkhelp.pl | 2 +- mkinstalldirs | 2 +- optfunc.c | 1609 ++++++++++--------- option.c | 1116 +++++++------- option.h | 1 - opttbl.c | 1144 +++++++------- os.c | 414 ++--- output.c | 1028 ++++++------ pattern.c | 596 +++---- pattern.h | 2 +- position.c | 272 ++-- prompt.c | 740 ++++----- regexp.c | 1736 ++++++++++----------- screen.c | 3947 +++++++++++++++++++++++------------------------ scrsize.c | 96 +- search.c | 2953 ++++++++++++++++++----------------- signal.c | 252 +-- tags.c | 1088 ++++++------- ttyin.c | 282 ++-- ubin.uni | 32 +- version.c | 72 +- wide.uni | 244 +-- xbuf.c | 80 +- xbuf.h | 6 +- 75 files changed, 21648 insertions(+), 21669 deletions(-) diff --git a/INSTALL b/INSTALL index 78ae932..19ecbd5 100644 --- a/INSTALL +++ b/INSTALL @@ -183,4 +183,3 @@ operates. script, and exit. `configure' also accepts some other, not widely useful, options. - diff --git a/LICENSE b/LICENSE index 65bce42..aeff484 100644 --- a/LICENSE +++ b/LICENSE @@ -10,18 +10,17 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright - notice in the documentation and/or other materials provided with + notice in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/Makefile.aut b/Makefile.aut index 948532e..b45b5b7 100644 --- a/Makefile.aut +++ b/Makefile.aut @@ -29,7 +29,7 @@ DISTFILES_W = \ defines.o2 Makefile.o2e \ defines.o9 Makefile.o9c Makefile.o9u \ defines.wn Makefile.wnm Makefile.wnb Makefile.wng \ - configure + configure UNICODE_FILES = \ compose.uni fmt.uni ubin.uni wide.uni DISTFILES = \ @@ -46,18 +46,18 @@ DISTFILES = \ mkutable $(UNICODE_FILES) \ ${DISTFILES_W} -all: help.c funcs.h $(UNICODE_FILES) ${srcdir}/configure +all: help.c funcs.h $(UNICODE_FILES) ${srcdir}/configure release: .FORCE @if grep -s 'Major changes between .*${REL}' NEWS ; then :; else echo '*** NEWS is not updated for ${REL}'; exit 1; fi - ${MAKE} -f Makefile.aut tagall - ${MAKE} -f Makefile.aut all - ${MAKE} -f Makefile.aut clean + ${MAKE} -f Makefile.aut tagall + ${MAKE} -f Makefile.aut all + ${MAKE} -f Makefile.aut clean ${MAKE} -f Makefile.aut dist .FORCE: -help.c: less.hlp +help.c: less.hlp -mv -f ${srcdir}/help.c ${srcdir}/help.c.old rm -rf help.c ${srcdir}/${MKHELP} < less.hlp > help.c @@ -73,10 +73,10 @@ funcs.h: ${SRC:%=${srcdir}/%} lint: lint -I. ${CPPFLAGS} ${SRC} -clean: +clean: rm -f Makefile config.status config.log config.cache defines.h stamp-h \ configure defines.h.in funcs.h help.c \ - less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man + less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man distclean: clean realclean: clean @@ -123,7 +123,7 @@ unicode/EastAsianWidth.txt: distfiles: ${DISTFILES} -echo_distfiles: +echo_distfiles: @echo $(subst .nro,.nro.VER,${DISTFILES}) dist: ${DISTFILES} @@ -152,10 +152,10 @@ tagall: gnu_upload: @if [ -z "${REL}" ]; then echo "Please set REL=nnn"; exit 1; fi; \ LESSREL=less-${REL} && RELDIR=release/$$LESSREL && \ - TARF=$$LESSREL-release.tar.gz && \ + TARF=$$LESSREL-release.tar.gz && \ if [ ! -s $$RELDIR/$$TARF ]; then echo "$$RELDIR/$$TARF does not exist"; exit 1; fi; \ cd $$RELDIR && \ gpg -b $$TARF && \ ( echo "version: 1.2"; echo "directory: less"; echo "filename: $$TARF" ) > $$TARF.directive && \ gpg --clearsign $$TARF.directive - @echo "upload ready: cd $$RELDIR; ftp ftp-upload.gnu.org; cd /incoming/ftp; put $$TARF $$TARF.sig $$TARF.directive.asc" + @echo "upload ready: cd $$RELDIR; ftp ftp-upload.gnu.org; cd /incoming/ftp; put $$TARF $$TARF.sig $$TARF.directive.asc" diff --git a/Makefile.dsb b/Makefile.dsb index 64bb1d8..ea9c755 100644 --- a/Makefile.dsb +++ b/Makefile.dsb @@ -28,7 +28,7 @@ OBJ = \ all: less$(EXT) lesskey$(EXT) -# This is really horrible, but the command line is too long for +# This is really horrible, but the command line is too long for # MS-DOS if we try to link $(OBJ). less$(EXT): $(OBJ) ren lesskey.obj lesskey.obo @@ -45,7 +45,6 @@ defines.h: defines.ds $(OBJ): less.h defines.h clean: - -del *.obj + -del *.obj -del less.exe -del lesskey.exe - diff --git a/Makefile.dsg b/Makefile.dsg index 4866d31..e75663e 100644 --- a/Makefile.dsg +++ b/Makefile.dsg @@ -85,4 +85,3 @@ distclean: clean realclean: distclean command.com /c if exist TAGS del TAGS - diff --git a/Makefile.dsu b/Makefile.dsu index ed71163..6a73de8 100644 --- a/Makefile.dsu +++ b/Makefile.dsu @@ -37,7 +37,7 @@ OBJ = \ all: less lesskey -# This is really horrible, but the command line is too long for +# This is really horrible, but the command line is too long for # MS-DOS if we try to link $(OBJ). less: $(OBJ) -if exist lesskey.obj del lesskey.obj @@ -53,7 +53,6 @@ defines.h: defines.ds $(OBJ): less.h defines.h clean: - -del *.obj + -del *.obj -del less.exe -del lesskey.exe - diff --git a/Makefile.in b/Makefile.in index d087e9e..9f8cc77 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,14 +24,14 @@ exec_prefix = @exec_prefix@ # Where the installed binary goes. bindir = @bindir@ -binprefix = +binprefix = sysconfdir = @sysconfdir@ datarootdir = @datarootdir@ mandir = @mandir@ manext = 1 -manprefix = +manprefix = DESTDIR = #### End of system configuration section. #### @@ -69,7 +69,7 @@ lessecho$(EXEEXT): lessecho.${O} version.${O} charset.${O}: compose.uni ubin.uni wide.uni -${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h +${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs ${INSTALL_PROGRAM} less$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT) @@ -126,4 +126,3 @@ distclean: clean realclean: distclean rm -f TAGS - diff --git a/Makefile.o9c b/Makefile.o9c index aa51cca..68f821f 100644 --- a/Makefile.o9c +++ b/Makefile.o9c @@ -6,7 +6,7 @@ CC = cc CPPFLAGS = -D_OSK_MWC32 -DDEBUG=0 -DSTRCSPN CFLAGS = -k=0 -v=. -CFLAGS_COMPILE_ONLY = -r +CFLAGS_COMPILE_ONLY = -r LDFLAGS = -igm=8 LIBS = -l=/dd/lib/termlib.l O = r diff --git a/Makefile.wnb b/Makefile.wnb index 5f9db1f..652a5eb 100644 --- a/Makefile.wnb +++ b/Makefile.wnb @@ -3,7 +3,7 @@ # Bolarnd C++ 5.5.1 free command line tools #### Start of system configuration section. #### -# +# # Borland's make knows its own location in the # filesystem. # @@ -18,10 +18,10 @@ LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\cw32.lib #### End of system configuration section. #### -# +# # This rule allows us to supply the necessary -D options # in addition to whatever the user asks for. -# +# .c.obj: ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $< @@ -35,10 +35,10 @@ OBJ = \ all: less lesskey lessecho -# -# This is really horrible, but the command line is too long for +# +# This is really horrible, but the command line is too long for # MS-DOS if we try to link ${OBJ}. -# +# less: ${OBJ} ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} @@ -55,9 +55,9 @@ defines.h: defines.wn ${OBJ}: less.h defines.h funcs.h cmd.h clean: - -del *.obj - -del *.il? - -del *.tds + -del *.obj + -del *.il? + -del *.tds -del defines.h spotless: clean @@ -68,4 +68,3 @@ spotless: clean realclean: spotless distclean: spotless - diff --git a/Makefile.wng b/Makefile.wng index d33378d..324df5e 100644 --- a/Makefile.wng +++ b/Makefile.wng @@ -5,20 +5,20 @@ # # Usage: mingw32-make -f Makefile.wng [REGEX_PACKAGE={posix|gnu|regcomp-local}] # -# The optional command line parameter "REGEX_PACKAGE" is used to specify +# The optional command line parameter "REGEX_PACKAGE" is used to specify # a regular expression package for compilation and linking. This parameter -# can assume one of three values. +# can assume one of three values. # # REGEX_PACKAGE == regcomp-local # This choice selects the regular expression package written by Henry -# Spencer. It is implemented by the repository file "regexp.c". +# Spencer. It is implemented by the repository file "regexp.c". # # REGEX_PACKAGE == posix -# This choice selects the POSIX implementation and is provided by MingW. -# This is the default choice. +# This choice selects the POSIX implementation and is provided by MingW. +# This is the default choice. # # REGEX_PACKAGE == gnu -# This choice selects the GNU implementation and is provided by MingW. +# This choice selects the GNU implementation and is provided by MingW. # #### Start of system configuration section. #### @@ -29,23 +29,23 @@ CC = gcc # MINGW_DEFINES = -DMINGW -DWIN32 -# This specifies the "root" directory of the MingW installation. +# This specifies the "root" directory of the MingW installation. # It is defined so that the compiler and linker can find the header files -# and library that provide regular expression support. +# and library that provide regular expression support. # MINGW_ROOT_PATH = /mingw-w64/mingw64 -# Determine the regular expression package to be used. +# Determine the regular expression package to be used. # REGEX_PACKAGE ?= posix ifeq (${REGEX_PACKAGE},regcomp-local) - MINGW_DEFINES += -DUSE_REGEXP_C + MINGW_DEFINES += -DUSE_REGEXP_C else ifeq (${REGEX_PACKAGE},posix) - MINGW_DEFINES += -DUSE_POSIX_REGCOMP + MINGW_DEFINES += -DUSE_POSIX_REGCOMP else ifeq (${REGEX_PACKAGE},gnu) - MINGW_DEFINES += -DUSE_GNU_REGEX + MINGW_DEFINES += -DUSE_GNU_REGEX else - $(error REGEX_PACKAGE must be posix, gnu or regcomp-local) + $(error REGEX_PACKAGE must be posix, gnu or regcomp-local) endif MINGW_REGEX_IPATH = -I${MINGW_ROOT_PATH}/opt/include @@ -57,7 +57,7 @@ ifneq (${REGEX_PACKAGE},regcomp-local) CFLAGS_MINGW += ${MINGW_REGEX_IPATH} endif -# MingW may use sh.exe instead of cmd.exe. +# MingW may use sh.exe instead of cmd.exe. # Make sure it does not. # SHELL = cmd.exe @@ -75,13 +75,13 @@ endif .c.o: ${CC} -c -I. ${CFLAGS} $< -LESS_SRC = brac.c ch.c charset.c cmdbuf.c command.c \ - cvt.c decode.c edit.c filename.c forwback.c \ - ifile.c input.c jump.c line.c linenum.c \ - lsystem.c main.c mark.c optfunc.c option.c \ - opttbl.c os.c output.c pattern.c position.c \ - prompt.c screen.c scrsize.c search.c \ - signal.c tags.c ttyin.c version.c xbuf.c +LESS_SRC = brac.c ch.c charset.c cmdbuf.c command.c \ + cvt.c decode.c edit.c filename.c forwback.c \ + ifile.c input.c jump.c line.c linenum.c \ + lsystem.c main.c mark.c optfunc.c option.c \ + opttbl.c os.c output.c pattern.c position.c \ + prompt.c screen.c scrsize.c search.c \ + signal.c tags.c ttyin.c version.c xbuf.c ifeq (${REGEX_PACKAGE},regcomp-local) LESS_SRC += regexp.c endif diff --git a/Makefile.wnm b/Makefile.wnm index a0148db..2695b92 100644 --- a/Makefile.wnm +++ b/Makefile.wnm @@ -6,7 +6,7 @@ CC = cl # Normal flags -CFLAGS = /nologo /W3 /EHsc /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c +CFLAGS = /nologo /W3 /EHsc /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c LDFLAGS = /nologo /subsystem:console /incremental:no # Debugging flags @@ -46,8 +46,6 @@ defines.h: defines.wn $(OBJ): less.h defines.h funcs.h cmd.h clean: - -del *.obj + -del *.obj -del less.exe -del lesskey.exe - - diff --git a/NEWS b/NEWS index bcfe4c6..9714046 100644 --- a/NEWS +++ b/NEWS @@ -6,12 +6,12 @@ For the latest news about less, see https://greenwoodsoftware.com/less You can also download the latest version of less from there. - Report bugs, suggestions or comments at + Report bugs, suggestions or comments at https://github.com/gwsw/less/issues. ====================================================================== - Major changes between "less" versions 590 and 608 + Major changes between "less" versions 590 and 608 * Add the --header option (github #43). @@ -53,7 +53,7 @@ * Fix bug scrolling history when --incsearch is set (github #214). -* Fix buffer overflow when invoking lessecho with more than 63 -m/-n +* Fix buffer overflow when invoking lessecho with more than 63 -m/-n options (github #198). * Fix buffer overflow in bin_file (github #271). @@ -66,26 +66,26 @@ * Suppress TAB filename expansion in some cases where it doesn't make sense. -* Fix termlib detection when compiler doesn't accept +* Fix termlib detection when compiler doesn't accept calls to undeclared functions. * Fix bug in input of non-ASCII characters on Windows (github #247) * Escape filenames when invoking LESSCLOSE. -* Fix bug using multibyte UTF-8 char in search string +* Fix bug using multibyte UTF-8 char in search string with --incsearch (github #273). ====================================================================== - Major changes between "less" versions 581 and 590 + Major changes between "less" versions 581 and 590 * Make less able to read lesskey source files (deprecating lesskey). -* If XDG_CONFIG_HOME is set, find lesskey source file +* If XDG_CONFIG_HOME is set, find lesskey source file in $XDG_CONFIG_HOME/lesskey rather than $HOME/.lesskey. -* If XDG_DATA_HOME is set, find and store history file +* If XDG_DATA_HOME is set, find and store history file in $XDG_DATA_HOME/lesshst rather than $HOME/.lesshst. * Add the --lesskey-src option. @@ -94,7 +94,7 @@ * With -F, if screen is resized to make file fit on one screen, don't exit. -* Fix bug which could leave terminal in mouse-reporting mode +* Fix bug which could leave terminal in mouse-reporting mode after exiting less. * Fix bug which caused failure to respond to window resize. @@ -103,11 +103,11 @@ ====================================================================== - Major changes between "less" versions 563 and 581 + Major changes between "less" versions 563 and 581 * Change ESC-u command to toggle, not disable, highlighting per man page. -* Add ESC-U command. +* Add ESC-U command. * Add ctrl-W search modifier for wrapping search. @@ -148,16 +148,16 @@ ====================================================================== - Major changes between "less" versions 551 and 563 + Major changes between "less" versions 551 and 563 * Update Unicode tables. * Treat Hangul Jamo medial vowels and final consonants as zero width. -* Display error message immediately when -o is toggled and +* Display error message immediately when -o is toggled and input is not a pipe. -* Fix regression: make screen repaint when "squished" and +* Fix regression: make screen repaint when "squished" and a no-movement command is given. * Fix erroneous EOF calculation when F command is interrupted. @@ -173,7 +173,7 @@ ====================================================================== - Major changes between "less" versions 530 and 551 + Major changes between "less" versions 530 and 551 * Add --mouse option. @@ -205,7 +205,7 @@ ====================================================================== - Major changes between "less" versions 487 and 530 + Major changes between "less" versions 487 and 530 * Don't output terminal init sequence if using -F and file fits on one screen. @@ -222,9 +222,9 @@ * A second ESC-u command will clear search match markers in the status column. -* Do same ANSI escape code filtering for tag matching that we do for +* Do same ANSI escape code filtering for tag matching that we do for searching, to help when viewing syntax-highlighted code. - + * Catch SIGTERM and clean up before exiting. * Fix bug initializing default charset on Windows. @@ -261,7 +261,7 @@ ====================================================================== - Major changes between "less" versions 481 and 487 + Major changes between "less" versions 481 and 487 * New commands ESC-{ and ESC-} to shift to start/end of displayed lines. @@ -281,7 +281,7 @@ ====================================================================== - Major changes between "less" versions 458 and 481 + Major changes between "less" versions 458 and 481 * Don't overwrite history file; just append to it. @@ -299,7 +299,7 @@ * Allow "extra" string in lesskey file to append to a multi-char command (like a search pattern), without executing the command. -* Ignore -u/-U setting while viewing help file, so that +* Ignore -u/-U setting while viewing help file, so that underline and bold chars are displayed correctly. * Improve detection of "binary" files in UTF-8 mode. @@ -308,7 +308,7 @@ * Fix bug where prompt was sometimes not displayed with +G. -* Fix possible memory corruption +* Fix possible memory corruption * Fix bugs and improve performance in ampersand filtering. @@ -318,7 +318,7 @@ ====================================================================== - Major changes between "less" versions 451 and 458 + Major changes between "less" versions 451 and 458 * Allow backslash escaping of metacharacters in LESS environment variable after the --use-backslash option. @@ -337,7 +337,7 @@ ====================================================================== - Major changes between "less" versions 444 and 451 + Major changes between "less" versions 444 and 451 * Add ESC-F command to keep reading data until a pattern is found. @@ -353,18 +353,18 @@ * Fix bugs handling SGR sequences in Win32. -* Fix possible crashes caused by malformed LESSOPEN or +* Fix possible crashes caused by malformed LESSOPEN or LESSCLOSE variables. -* Fix bug highlighting text which is discontiguous in the file +* Fix bug highlighting text which is discontiguous in the file due to backspace processing. -* Fix bug in displaying status column when scrolling backwards +* Fix bug in displaying status column when scrolling backwards with -J and -S in effect. ====================================================================== - Major changes between "less" versions 443 and 444 + Major changes between "less" versions 443 and 444 * Fix bug in unget handling that can cause strange effects on the command line. @@ -373,10 +373,10 @@ ====================================================================== - Major changes between "less" versions 436 and 443 + Major changes between "less" versions 436 and 443 -* Change search behavior such that when a search is given an explicit - pattern, the entire displayed screen is included in the search and +* Change search behavior such that when a search is given an explicit + pattern, the entire displayed screen is included in the search and not just the portion after the target line. * Add -A option to change search behavior to the old way: only @@ -391,7 +391,7 @@ * Fix "ungetc overflow" when passing long commands via the -p option. -* Fix bug in using line filtering via the & command +* Fix bug in using line filtering via the & command in combination with -i and -I. * Fix bug in handling negative arguments to the -j option. @@ -404,7 +404,7 @@ ====================================================================== - Major changes between "less" versions 429 and 436 + Major changes between "less" versions 429 and 436 * Don't pass "-" to non-pipe LESSOPEN unless it starts with "-". @@ -416,7 +416,7 @@ ====================================================================== - Major changes between "less" versions 424 and 429 + Major changes between "less" versions 424 and 429 * LESSOPEN pipe will now be used on standard input, if the LESSOPEN environment variable begins with "|-". @@ -439,7 +439,7 @@ ====================================================================== - Major changes between "less" versions 418 and 424 + Major changes between "less" versions 418 and 424 * New "&" command allows filtering of lines based on a pattern. @@ -457,7 +457,7 @@ ====================================================================== - Major changes between "less" versions 416 and 418 + Major changes between "less" versions 416 and 418 * Color escape sequences are now supported in WIN32 build. @@ -473,7 +473,7 @@ ====================================================================== - Major changes between "less" versions 409 and 416 + Major changes between "less" versions 409 and 416 * New --follow-name option makes F command follow the name of a file rather than the file descriptor if an open file is renamed. @@ -484,7 +484,7 @@ ====================================================================== - Major changes between "less" versions 406 and 409 + Major changes between "less" versions 406 and 409 * Support CSI escape sequences, like SGR escape sequences. @@ -498,7 +498,7 @@ ====================================================================== - Major changes between "less" versions 394 and 406 + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. @@ -545,7 +545,7 @@ ====================================================================== - Major changes between "less" versions 382 and 394 + Major changes between "less" versions 382 and 394 * Add history file to save search and shell command history between invocations of less. @@ -594,14 +594,14 @@ ====================================================================== - Major changes between "less" versions 381 and 382 + Major changes between "less" versions 381 and 382 * Removed some old copyrighted code. This probably breaks OS/9 support. ====================================================================== - Major changes between "less" versions 378 and 381 + Major changes between "less" versions 378 and 381 * New -L option to disable LESSOPEN processing. @@ -611,7 +611,7 @@ * Use autoconf 2.54. Replace configure.in, acconfig.h, defines.h.top with configure.ac. -* Overstriking underscore with underscore is now bold or underlined +* Overstriking underscore with underscore is now bold or underlined depending on context. * Use only 7 spaces for line numbers in -N mode, if possible. @@ -622,7 +622,7 @@ ====================================================================== - Major changes between "less" versions 376 and 378 + Major changes between "less" versions 376 and 378 * Bug fixes: Default buffer space is now 64K as documented. @@ -632,7 +632,7 @@ ====================================================================== - Major changes between "less" versions 358 and 376 + Major changes between "less" versions 358 and 376 * -x option can now specify multiple variable-width tab stops. @@ -643,10 +643,10 @@ Added support for "global(1)" tags (see http://www.gnu.org/software/global/global.html). -* New prompt style set by option -Pw defines the message printed +* New prompt style set by option -Pw defines the message printed while waiting for data in the F command. -* System-wide lesskey file now defaults to sysless in etc directory +* System-wide lesskey file now defaults to sysless in etc directory instead of .sysless in bin directory. Use "configure --sysconfdir=..." to change it. (For backwards compatibility, .sysless in bin is still recognized.) @@ -681,7 +681,7 @@ ====================================================================== - Major changes between "less" versions 354 and 358 + Major changes between "less" versions 354 and 358 * Add -J (--status-column) option to display a status column. @@ -695,7 +695,7 @@ ====================================================================== - Major changes between "less" versions 352 and 354 + Major changes between "less" versions 352 and 354 * Allow space after numeric-valued command line options. @@ -711,7 +711,7 @@ ====================================================================== - Major changes between "less" versions 346 and 352 + Major changes between "less" versions 346 and 352 * Enable UTF-8 if "UTF-8" appears in locale-related environment variables. @@ -725,7 +725,7 @@ * Fix bug in doing :d on a file which contains marks. -* Fix bug causing cleared lines to sometimes be filled with standout, +* Fix bug causing cleared lines to sometimes be filled with standout, bold, underline, etc. on certain terminals. * Fixes for MS-DOS (DJGPP) version. @@ -733,14 +733,14 @@ ====================================================================== - Major changes between "less" versions 340 and 346 + Major changes between "less" versions 340 and 346 * The UTF-8 character set is now supported. * The default character set is now latin1 rather than ascii. -* New option -R (--RAW-CONTROL-CHARS) is like -r but handles - long (wrapped) lines correctly, as long as the input contains only +* New option -R (--RAW-CONTROL-CHARS) is like -r but handles + long (wrapped) lines correctly, as long as the input contains only normal text and ANSI color escape sequences. * New option -F (--quit-if-one-screen) quits if the text fits on @@ -760,9 +760,9 @@ ====================================================================== - Major changes between "less" versions 337 and 340 + Major changes between "less" versions 337 and 340 -* Command line options for less may now be given in either the old +* Command line options for less may now be given in either the old single-letter form, or a new long name form (--option-name). See the less man page or "less --help" for the list of long option names. @@ -791,14 +791,14 @@ ====================================================================== - Major changes between "less" versions 335 and 337 + Major changes between "less" versions 335 and 337 * Fixed bugs in "make install". ====================================================================== - Major changes between "less" versions 332 and 335 + Major changes between "less" versions 332 and 335 * The old -w flag (suppress tildes after end-of-file) has been removed. @@ -806,7 +806,7 @@ * New -W flag highlights the first new line after any forward movement. -* Window resize works even if LINES and/or COLUMNS environment +* Window resize works even if LINES and/or COLUMNS environment variables are incorrect. * New percent escapes for prompt strings: @@ -822,7 +822,7 @@ ====================================================================== - Major changes between "less" versions 330 and 332 + Major changes between "less" versions 330 and 332 * Filenames from the command line are entered into the command history, so UPARROW/DOWNARROW can be used to retrieve them from the :e command. @@ -830,7 +830,7 @@ * Now works correctly on Windows when using a scrolling terminal window (buffer larger than display window). -* On Windows, now restores the console screen on exit. +* On Windows, now restores the console screen on exit. Use -X to get the old behavior. * Fixed bug on Windows when CAPS-LOCK or NUM-LOCK is pressed. @@ -845,7 +845,7 @@ ====================================================================== - Major changes between "less" versions 321 and 330 + Major changes between "less" versions 321 and 330 * Now supports filenames containing spaces (in double quotes). New option -" can be used to change the quoting characters. @@ -858,7 +858,7 @@ * Added commands ESC-( and ESC-), same as ESC-[ and ESC-]. -* A "quit" command defined in a lesskey file may now have an "extra" +* A "quit" command defined in a lesskey file may now have an "extra" string, which is used to return an exit code from less when it quits. * New environment variables LESSMETACHARS and LESSMETAESCAPE provide @@ -873,9 +873,9 @@ ====================================================================== - Major changes between "less" versions 291 and 321 + Major changes between "less" versions 291 and 321 -* Command line at bottom of screen now scrolls, so it can be longer +* Command line at bottom of screen now scrolls, so it can be longer than the screen width. * New commands ESC-] and ESC-[ scroll the display horizontally. @@ -900,7 +900,7 @@ * Command line argument "--" signals that the rest of the arguments are files (not option flags). -* Help file (less.hlp) is no longer installed. Help text is now +* Help file (less.hlp) is no longer installed. Help text is now embedded in the less executable itself. * Added -Ph to change the prompt for the help text. @@ -917,7 +917,7 @@ ====================================================================== - Major changes between "less" versions 290 and 291 + Major changes between "less" versions 290 and 291 * Less environment variables can be specified in lesskey files. @@ -926,7 +926,7 @@ ====================================================================== - Major changes between "less" versions 278 and 290 + Major changes between "less" versions 278 and 290 * Accepts GNU-style options "--help" and "--version". @@ -937,21 +937,21 @@ ====================================================================== - Major changes between "less" versions 252 and 278 + Major changes between "less" versions 252 and 278 * A LESSOPEN preprocessor may now pipe the converted file data to less, rather than writing it to a temporary file. -* Search pattern highlighting has been fixed. It now highlights +* Search pattern highlighting has been fixed. It now highlights reliably, even if a string is split across two screen lines, contains TABs, etc. -* The -F flag (which suppress search highlighting) has been changed - to -G. A new flag, -g, changes search highlighting to highlight - only the string found by the last search command, instead of all +* The -F flag (which suppress search highlighting) has been changed + to -G. A new flag, -g, changes search highlighting to highlight + only the string found by the last search command, instead of all strings which match the last search command. -* New flag -I acts like -i, but ignores case even if the search +* New flag -I acts like -i, but ignores case even if the search pattern contains uppercase letters. * Less now checks for the environment variable VISUAL before EDITOR. @@ -961,11 +961,11 @@ ====================================================================== - Major changes between "less" versions 237 and 252 + Major changes between "less" versions 237 and 252 * Changes in line-editing keys: The literal key is now ^V or ^A rather than \ (backslash). - Filename completion commands (TAB and ^L) are disabled + Filename completion commands (TAB and ^L) are disabled when typing a search pattern. * Line-editing command keys can be redefined using lesskey. @@ -977,14 +977,14 @@ * New option -V displays version number of lesskey. -* Help file less.hlp is now installed by default in /usr/local/share +* Help file less.hlp is now installed by default in /usr/local/share rather than /usr/local/lib. ====================================================================== - Major changes between "less" versions 170 and 237 + Major changes between "less" versions 170 and 237 * By popular demand, text which matches the current search pattern is highlighted. New -F flag disables this feature. @@ -993,17 +993,17 @@ have a regular expression library. regexp.c is Copyright (c) 1986 by University of Toronto. -* New line-editing keys, including command history (arrow keys) and +* New line-editing keys, including command history (arrow keys) and filename completion (TAB). * Input preprocessor allows modification of input files (e.g. uncompress) via LESSOPEN/LESSCLOSE environment variables. * New -X flag disables sending termcap "ti" and "te" (initialize and - deinitialize) strings to the terminal. + deinitialize) strings to the terminal. * Changing -i from within less now correctly affects a subsequent - repeated search. + repeated search. * Searching for underlined or overstruck text now works when the -u flag is in effect, rather than the -i flag. @@ -1023,25 +1023,25 @@ Things that may surprise you ******************************** -* When you enter text at the bottom of the screen (search string, - filename, etc.), some keys act different than previously. - Specifically, \ (backslash), ESC, TAB, BACKTAB, and control-L +* When you enter text at the bottom of the screen (search string, + filename, etc.), some keys act different than previously. + Specifically, \ (backslash), ESC, TAB, BACKTAB, and control-L now have line editing functions. * Some previous unofficial versions of less were able to display compressed files. The new LESSOPEN/LESSCLOSE feature now provides this functionality in a different way. -* Some previous unofficial versions of less provided a -Z flag to +* Some previous unofficial versions of less provided a -Z flag to set the number of lines of text to retain between full screen scrolls. - The -z-n flag (that is, -z with a negative number) provides this + The -z-n flag (that is, -z with a negative number) provides this functionality. ====================================================================== - Major changes between "less" versions 123 and 170 + Major changes between "less" versions 123 and 170 * New option -j allows target lines to be positioned anywhere on screen. @@ -1053,7 +1053,7 @@ * New option -T specifies a "tags" file. * Non-printable, non-control characters are displayed in octal. - Such characters, as well as control characters, are displayed + Such characters, as well as control characters, are displayed in blinking mode. * New command -+ sets an option to its default. @@ -1071,12 +1071,12 @@ * New command :x directly jumps to a file in the command line list. * Search commands have been enhanced and reorganized: - n Repeat search, same direction. - N Repeat search, opposite direction. - ESC-/ Search forward thru file boundaries - ESC-? Search backward thru file boundaries - ESC-n Repeat search thru file boundaries, same direction. - ESC-N Repeat search thru file boundaries, opposite direction. + n Repeat search, same direction. + N Repeat search, opposite direction. + ESC-/ Search forward thru file boundaries + ESC-? Search backward thru file boundaries + ESC-n Repeat search thru file boundaries, same direction. + ESC-N Repeat search thru file boundaries, opposite direction. Special character * causes search to search thru file boundaries. Special character @ causes search to begin at start/end of file list. @@ -1094,7 +1094,7 @@ ====================================================================== - Major changes between "less" versions 97 and 123 + Major changes between "less" versions 97 and 123 * New option (-N) causes line numbers to be displayed in the text of the file (like vi "set nu"). @@ -1115,19 +1115,19 @@ * File marks (set by the m command) are now preserved when a new file is edited. The ' command can thus be used to switch files. -* New command ESC-/ searches all files (on the command line) +* New command ESC-/ searches all files (on the command line) for a pattern. * New command ESC-n repeats previous search, spanning files. * The N command has been changed to repeat the previous search - in the reverse direction. The old N command is still available + in the reverse direction. The old N command is still available via :n. * New command ESC-N repeats previous search in the reverse direction and spanning files. -* 8 bit characters are now supported. A new option (-g) can be +* 8 bit characters are now supported. A new option (-g) can be used to strip off the eighth bit (the previous behavior). * Options which take a following string (like -t) may now @@ -1150,9 +1150,9 @@ * Examining a file which was previously examined will return to the same position in the file. -* A "%" is expanded to the current filename and a "#" to the +* A "%" is expanded to the current filename and a "#" to the previous filename, in both shell commands and the E command. - (Previously % worked only in shell commands and # worked + (Previously % worked only in shell commands and # worked only in the E command.) * New command ":ta" is equivalent to "-t". @@ -1165,8 +1165,3 @@ * Lesskey files may now include characters after the action as extra input to be parsed after the action; for example: "toggle-option X" to toggle a specific option X. - - - - - diff --git a/README b/README index a4443b6..0b03af1 100644 --- a/README +++ b/README @@ -17,7 +17,7 @@ ========================================================================= -You should build from a clone of a git repository +You should build from a clone of a git repository ONLY IF you are doing development on the less source itself. If you are merely using less as a tool, you should download a release from https://greenwoodsoftware.com and NOT from github. @@ -30,13 +30,13 @@ Major changes made since the last posted version are in NEWS. INSTALLATION (Unix & Linux systems only): 1. Move the distributed source to its own directory and unpack it, - if you have not already done so. + if you have not already done so. 2. If you are building from a clone of a git repository, type "make -f Makefile.aut distfiles". - If you are building from a numbered release package (a tar or - zip file with a name like less-999.tar.gz or less-999.zip downloaded - from greenwoodsoftware.com, not from github), you should skip this step. + If you are building from a numbered release package (a tar or + zip file with a name like less-999.tar.gz or less-999.zip downloaded + from greenwoodsoftware.com, not from github), you should skip this step. 3. Type "sh configure". This will generate a Makefile and a defines.h. @@ -51,7 +51,7 @@ INSTALLATION (Unix & Linux systems only): --with-regex=lib Specifies the regular expression library used by less for pattern - matching. The default is "auto", which means the configure program + matching. The default is "auto", which means the configure program finds a regular expression library automatically. Other values are: gnu Use the GNU regex library. pcre Use the PCRE library. @@ -73,21 +73,21 @@ INSTALLATION (Unix & Linux systems only): 4. It is a good idea to look over the generated Makefile and defines.h and make sure they look ok. If you know of any peculiarities of your system that configure might not have detected, you may fix the - Makefile now. Take particular notice of the list of "terminal" - libraries in the LIBS definition in the Makefile; these may need + Makefile now. Take particular notice of the list of "terminal" + libraries in the LIBS definition in the Makefile; these may need to be edited. The terminal libraries will be some subset of -lncurses -lcurses -ltermcap -ltermlib If you wish, you may edit defines.h to remove some optional features. If you choose not to include some features in your version, you may - wish to edit the manual page "less.nro" and the help page "less.hlp" + wish to edit the manual page "less.nro" and the help page "less.hlp" to remove the descriptions of the features which you are removing. If you edit less.hlp, you should run "make -f Makefile.aut help.c". 5. Type "make" and watch the fun. 6. If the make succeeds, it will generate the programs "less", - "lesskey" and "lessecho" in your current directory. Test the + "lesskey" and "lessecho" in your current directory. Test the generated programs. 7. When satisfied that it works, if you wish to install it @@ -103,8 +103,8 @@ INSTALLATION (Unix & Linux systems only): Note to hackers: comments noting possible improvements are enclosed in double curly brackets {{ like this }}. -(Note that the above note was originally written at a time when -"hackers" most commonly meant "enthusiastic and dedicated computer +(Note that the above note was originally written at a time when +"hackers" most commonly meant "enthusiastic and dedicated computer programmers", not "persons who attempt to circumvent computer security".) @@ -114,7 +114,7 @@ INSTALLATION (MS-DOS systems only, with Microsoft C, Borland C, or DJGPP) 1. Move the distributed source to its own directory. - Depending on your compiler, you may need to convert the source + Depending on your compiler, you may need to convert the source to have CR-LF rather than LF as line terminators. 2. If you are using Microsoft C, rename MAKEFILE.DSU to MAKEFILE. @@ -137,7 +137,7 @@ INSTALLATION (MS-DOS systems only, 5. Run your "make" program and watch the fun. If your "make" requires a flag to import environment variables, you should use that flag. - If your compiler runs out of memory, try running "make -n >cmds.bat" + If your compiler runs out of memory, try running "make -n >cmds.bat" and then run cmds.bat. 6. If the make succeeds, it will generate the programs "LESS.EXE" and @@ -199,11 +199,11 @@ INSTALLATION (OS/2 systems only, 7. Make sure you have the emx runtime installed. You need the emx DLLs emx.dll and emxlibcs.dll and also the termcap database, termcap.dat. Make sure you have termcap.dat either in the default location or - somewhere in a directory listed in the PATH or INIT environment + somewhere in a directory listed in the PATH or INIT environment variables. 8. When satisfied that it works, you may wish to install less.exe, - lesskey.exe and scrsize.exe in a directory which is included in + lesskey.exe and scrsize.exe in a directory which is included in your PATH. scrsize.exe is required only if you use a terminal emulator such as xterm or rxvt. @@ -239,8 +239,8 @@ INSTALLATION (OS-9 systems only, ======================================================================= ACKNOWLEDGMENTS: - Some versions of the less distribution are packaged using + Some versions of the less distribution are packaged using Info-ZIP's compression utility. - Info-ZIP's software is free and can be obtained as source + Info-ZIP's software is free and can be obtained as source code or executables from various anonymous-ftp sites, including ftp.uu.net:/pub/archiving/zip. diff --git a/brac.c b/brac.c index 58ecf17..20dff43 100644 --- a/brac.c +++ b/brac.c @@ -16,89 +16,89 @@ #include "position.h" /* - * Try to match the n-th open bracket + * Try to match the n-th open bracket * which appears in the top displayed line (forwdir), - * or the n-th close bracket + * or the n-th close bracket * which appears in the bottom displayed line (!forwdir). - * The characters which serve as "open bracket" and + * The characters which serve as "open bracket" and * "close bracket" are given. */ - public void + public void match_brac(obrac, cbrac, forwdir, n) - int obrac; - int cbrac; - int forwdir; - int n; + int obrac; + int cbrac; + int forwdir; + int n; { - int c; - int nest; - POSITION pos; - int (*chget)(); + int c; + int nest; + POSITION pos; + int (*chget)(); - extern int ch_forw_get(), ch_back_get(); + extern int ch_forw_get(), ch_back_get(); - /* - * Seek to the line containing the open bracket. - * This is either the top or bottom line on the screen, - * depending on the type of bracket. - */ - pos = position((forwdir) ? TOP : BOTTOM); - if (pos == NULL_POSITION || ch_seek(pos)) - { - if (forwdir) - error("Nothing in top line", NULL_PARG); - else - error("Nothing in bottom line", NULL_PARG); - return; - } + /* + * Seek to the line containing the open bracket. + * This is either the top or bottom line on the screen, + * depending on the type of bracket. + */ + pos = position((forwdir) ? TOP : BOTTOM); + if (pos == NULL_POSITION || ch_seek(pos)) + { + if (forwdir) + error("Nothing in top line", NULL_PARG); + else + error("Nothing in bottom line", NULL_PARG); + return; + } - /* - * Look thru the line to find the open bracket to match. - */ - do - { - if ((c = ch_forw_get()) == '\n' || c == EOI) - { - if (forwdir) - error("No bracket in top line", NULL_PARG); - else - error("No bracket in bottom line", NULL_PARG); - return; - } - } while (c != obrac || --n > 0); + /* + * Look thru the line to find the open bracket to match. + */ + do + { + if ((c = ch_forw_get()) == '\n' || c == EOI) + { + if (forwdir) + error("No bracket in top line", NULL_PARG); + else + error("No bracket in bottom line", NULL_PARG); + return; + } + } while (c != obrac || --n > 0); - /* - * Position the file just "after" the open bracket - * (in the direction in which we will be searching). - * If searching forward, we are already after the bracket. - * If searching backward, skip back over the open bracket. - */ - if (!forwdir) - (void) ch_back_get(); + /* + * Position the file just "after" the open bracket + * (in the direction in which we will be searching). + * If searching forward, we are already after the bracket. + * If searching backward, skip back over the open bracket. + */ + if (!forwdir) + (void) ch_back_get(); - /* - * Search the file for the matching bracket. - */ - chget = (forwdir) ? ch_forw_get : ch_back_get; - nest = 0; - while ((c = (*chget)()) != EOI) - { - if (c == obrac) - { - if (nest == INT_MAX) - break; - nest++; - } - else if (c == cbrac && --nest < 0) - { - /* - * Found the matching bracket. - * If searching backward, put it on the top line. - * If searching forward, put it on the bottom line. - */ - jump_line_loc(ch_tell(), forwdir ? -1 : 1); - return; - } - } - error("No matching bracket", NULL_PARG); + /* + * Search the file for the matching bracket. + */ + chget = (forwdir) ? ch_forw_get : ch_back_get; + nest = 0; + while ((c = (*chget)()) != EOI) + { + if (c == obrac) + { + if (nest == INT_MAX) + break; + nest++; + } + else if (c == cbrac && --nest < 0) + { + /* + * Found the matching bracket. + * If searching backward, put it on the top line. + * If searching forward, put it on the bottom line. + */ + jump_line_loc(ch_tell(), forwdir ? -1 : 1); + return; + } + } + error("No matching bracket", NULL_PARG); } diff --git a/ch.c b/ch.c index bfad09c..5a0b71c 100644 --- a/ch.c +++ b/ch.c @@ -41,16 +41,16 @@ public int ignore_eoi; * The circular list is anchored by the file state "thisfile". */ struct bufnode { - struct bufnode *next, *prev; - struct bufnode *hnext, *hprev; + struct bufnode *next, *prev; + struct bufnode *hnext, *hprev; }; #define LBUFSIZE 8192 struct buf { - struct bufnode node; - BLOCKNUM block; - unsigned int datasize; - unsigned char data[LBUFSIZE]; + struct bufnode node; + BLOCKNUM block; + unsigned int datasize; + unsigned char data[LBUFSIZE]; }; #define bufnode_buf(bn) ((struct buf *) bn) @@ -60,15 +60,15 @@ struct buf { */ #define BUFHASH_SIZE 1024 struct filestate { - struct bufnode buflist; - struct bufnode hashtbl[BUFHASH_SIZE]; - int file; - int flags; - POSITION fpos; - int nbufs; - BLOCKNUM block; - unsigned int offset; - POSITION fsize; + struct bufnode buflist; + struct bufnode hashtbl[BUFHASH_SIZE]; + int file; + int flags; + POSITION fpos; + int nbufs; + BLOCKNUM block; + unsigned int offset; + POSITION fsize; }; #define ch_bufhead thisfile->buflist.next @@ -89,40 +89,40 @@ struct filestate { * Macros to manipulate the list of buffers in thisfile->buflist. */ #define FOR_BUFS(bn) \ - for (bn = ch_bufhead; bn != END_OF_CHAIN; bn = bn->next) + for (bn = ch_bufhead; bn != END_OF_CHAIN; bn = bn->next) #define BUF_RM(bn) \ - (bn)->next->prev = (bn)->prev; \ - (bn)->prev->next = (bn)->next; + (bn)->next->prev = (bn)->prev; \ + (bn)->prev->next = (bn)->next; #define BUF_INS_HEAD(bn) \ - (bn)->next = ch_bufhead; \ - (bn)->prev = END_OF_CHAIN; \ - ch_bufhead->prev = (bn); \ - ch_bufhead = (bn); + (bn)->next = ch_bufhead; \ + (bn)->prev = END_OF_CHAIN; \ + ch_bufhead->prev = (bn); \ + ch_bufhead = (bn); #define BUF_INS_TAIL(bn) \ - (bn)->next = END_OF_CHAIN; \ - (bn)->prev = ch_buftail; \ - ch_buftail->next = (bn); \ - ch_buftail = (bn); + (bn)->next = END_OF_CHAIN; \ + (bn)->prev = ch_buftail; \ + ch_buftail->next = (bn); \ + ch_buftail = (bn); /* * Macros to manipulate the list of buffers in thisfile->hashtbl[n]. */ #define FOR_BUFS_IN_CHAIN(h,bn) \ - for (bn = thisfile->hashtbl[h].hnext; \ - bn != END_OF_HCHAIN(h); bn = bn->hnext) + for (bn = thisfile->hashtbl[h].hnext; \ + bn != END_OF_HCHAIN(h); bn = bn->hnext) #define BUF_HASH_RM(bn) \ - (bn)->hnext->hprev = (bn)->hprev; \ - (bn)->hprev->hnext = (bn)->hnext; + (bn)->hnext->hprev = (bn)->hprev; \ + (bn)->hprev->hnext = (bn)->hnext; #define BUF_HASH_INS(bn,h) \ - (bn)->hnext = thisfile->hashtbl[h].hnext; \ - (bn)->hprev = END_OF_HCHAIN(h); \ - thisfile->hashtbl[h].hnext->hprev = (bn); \ - thisfile->hashtbl[h].hnext = (bn); + (bn)->hnext = thisfile->hashtbl[h].hnext; \ + (bn)->hprev = END_OF_HCHAIN(h); \ + thisfile->hashtbl[h].hnext->hprev = (bn); \ + thisfile->hashtbl[h].hnext = (bn); static struct filestate *thisfile; static int ch_ungotchar = -1; @@ -147,241 +147,241 @@ static int ch_addbuf(); /* * Get the character pointed to by the read pointer. */ - int + int ch_get(VOID_PARAM) { - struct buf *bp; - struct bufnode *bn; - int n; - int slept; - int h; - POSITION pos; - POSITION len; - - if (thisfile == NULL) - return (EOI); - - /* - * Quick check for the common case where - * the desired char is in the head buffer. - */ - if (ch_bufhead != END_OF_CHAIN) - { - bp = bufnode_buf(ch_bufhead); - if (ch_block == bp->block && ch_offset < bp->datasize) - return bp->data[ch_offset]; - } - - slept = FALSE; - - /* - * Look for a buffer holding the desired block. - */ - h = BUFHASH(ch_block); - FOR_BUFS_IN_CHAIN(h, bn) - { - bp = bufnode_buf(bn); - if (bp->block == ch_block) - { - if (ch_offset >= bp->datasize) - /* - * Need more data in this buffer. - */ - break; - goto found; - } - } - if (bn == END_OF_HCHAIN(h)) - { - /* - * Block is not in a buffer. - * Take the least recently used buffer - * and read the desired block into it. - * If the LRU buffer has data in it, - * then maybe allocate a new buffer. - */ - if (ch_buftail == END_OF_CHAIN || - bufnode_buf(ch_buftail)->block != -1) - { - /* - * There is no empty buffer to use. - * Allocate a new buffer if: - * 1. We can't seek on this file and -b is not in effect; or - * 2. We haven't allocated the max buffers for this file yet. - */ - if ((autobuf && !(ch_flags & CH_CANSEEK)) || - (maxbufs < 0 || ch_nbufs < maxbufs)) - if (ch_addbuf()) - /* - * Allocation failed: turn off autobuf. - */ - autobuf = OPT_OFF; - } - bn = ch_buftail; - bp = bufnode_buf(bn); - BUF_HASH_RM(bn); /* Remove from old hash chain. */ - bp->block = ch_block; - bp->datasize = 0; - BUF_HASH_INS(bn, h); /* Insert into new hash chain. */ - } + struct buf *bp; + struct bufnode *bn; + int n; + int slept; + int h; + POSITION pos; + POSITION len; + + if (thisfile == NULL) + return (EOI); + + /* + * Quick check for the common case where + * the desired char is in the head buffer. + */ + if (ch_bufhead != END_OF_CHAIN) + { + bp = bufnode_buf(ch_bufhead); + if (ch_block == bp->block && ch_offset < bp->datasize) + return bp->data[ch_offset]; + } + + slept = FALSE; + + /* + * Look for a buffer holding the desired block. + */ + h = BUFHASH(ch_block); + FOR_BUFS_IN_CHAIN(h, bn) + { + bp = bufnode_buf(bn); + if (bp->block == ch_block) + { + if (ch_offset >= bp->datasize) + /* + * Need more data in this buffer. + */ + break; + goto found; + } + } + if (bn == END_OF_HCHAIN(h)) + { + /* + * Block is not in a buffer. + * Take the least recently used buffer + * and read the desired block into it. + * If the LRU buffer has data in it, + * then maybe allocate a new buffer. + */ + if (ch_buftail == END_OF_CHAIN || + bufnode_buf(ch_buftail)->block != -1) + { + /* + * There is no empty buffer to use. + * Allocate a new buffer if: + * 1. We can't seek on this file and -b is not in effect; or + * 2. We haven't allocated the max buffers for this file yet. + */ + if ((autobuf && !(ch_flags & CH_CANSEEK)) || + (maxbufs < 0 || ch_nbufs < maxbufs)) + if (ch_addbuf()) + /* + * Allocation failed: turn off autobuf. + */ + autobuf = OPT_OFF; + } + bn = ch_buftail; + bp = bufnode_buf(bn); + BUF_HASH_RM(bn); /* Remove from old hash chain. */ + bp->block = ch_block; + bp->datasize = 0; + BUF_HASH_INS(bn, h); /* Insert into new hash chain. */ + } read_more: - pos = (ch_block * LBUFSIZE) + bp->datasize; - if ((len = ch_length()) != NULL_POSITION && pos >= len) - /* - * At end of file. - */ - return (EOI); - - if (pos != ch_fpos) - { - /* - * Not at the correct position: must seek. - * If input is a pipe, we're in trouble (can't seek on a pipe). - * Some data has been lost: just return "?". - */ - if (!(ch_flags & CH_CANSEEK)) - return ('?'); - if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK) - { - error("seek error", NULL_PARG); - clear_eol(); - return (EOI); - } - ch_fpos = pos; - } - - /* - * Read the block. - * If we read less than a full block, that's ok. - * We use partial block and pick up the rest next time. - */ - if (ch_ungotchar != -1) - { - bp->data[bp->datasize] = ch_ungotchar; - n = 1; - ch_ungotchar = -1; - } else if (ch_flags & CH_HELPFILE) - { - bp->data[bp->datasize] = helpdata[ch_fpos]; - n = 1; - } else - { - n = iread(ch_file, &bp->data[bp->datasize], - (unsigned int)(LBUFSIZE - bp->datasize)); - } - - if (n == READ_INTR) - return (EOI); - if (n < 0) - { + pos = (ch_block * LBUFSIZE) + bp->datasize; + if ((len = ch_length()) != NULL_POSITION && pos >= len) + /* + * At end of file. + */ + return (EOI); + + if (pos != ch_fpos) + { + /* + * Not at the correct position: must seek. + * If input is a pipe, we're in trouble (can't seek on a pipe). + * Some data has been lost: just return "?". + */ + if (!(ch_flags & CH_CANSEEK)) + return ('?'); + if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK) + { + error("seek error", NULL_PARG); + clear_eol(); + return (EOI); + } + ch_fpos = pos; + } + + /* + * Read the block. + * If we read less than a full block, that's ok. + * We use partial block and pick up the rest next time. + */ + if (ch_ungotchar != -1) + { + bp->data[bp->datasize] = ch_ungotchar; + n = 1; + ch_ungotchar = -1; + } else if (ch_flags & CH_HELPFILE) + { + bp->data[bp->datasize] = helpdata[ch_fpos]; + n = 1; + } else + { + n = iread(ch_file, &bp->data[bp->datasize], + (unsigned int)(LBUFSIZE - bp->datasize)); + } + + if (n == READ_INTR) + return (EOI); + if (n < 0) + { #if MSDOS_COMPILER==WIN32C - if (errno != EPIPE) + if (errno != EPIPE) #endif - { - error("read error", NULL_PARG); - clear_eol(); - } - n = 0; - } + { + error("read error", NULL_PARG); + clear_eol(); + } + n = 0; + } #if LOGFILE - /* - * If we have a log file, write the new data to it. - */ - if (!secure && logfile >= 0 && n > 0) - write(logfile, (char *) &bp->data[bp->datasize], n); + /* + * If we have a log file, write the new data to it. + */ + if (!secure && logfile >= 0 && n > 0) + write(logfile, (char *) &bp->data[bp->datasize], n); #endif - ch_fpos += n; - bp->datasize += n; - - /* - * If we have read to end of file, set ch_fsize to indicate - * the position of the end of file. - */ - if (n == 0) - { - ch_fsize = pos; - if (ignore_eoi) - { - /* - * We are ignoring EOF. - * Wait a while, then try again. - */ - if (!slept) - { - PARG parg; - parg.p_string = wait_message(); - ierror("%s", &parg); - } - sleep_ms(2); /* Reduce system load */ - slept = TRUE; + ch_fpos += n; + bp->datasize += n; + + /* + * If we have read to end of file, set ch_fsize to indicate + * the position of the end of file. + */ + if (n == 0) + { + ch_fsize = pos; + if (ignore_eoi) + { + /* + * We are ignoring EOF. + * Wait a while, then try again. + */ + if (!slept) + { + PARG parg; + parg.p_string = wait_message(); + ierror("%s", &parg); + } + sleep_ms(2); /* Reduce system load */ + slept = TRUE; #if HAVE_STAT_INO - if (follow_mode == FOLLOW_NAME) - { - /* See whether the file's i-number has changed, - * or the file has shrunk. - * If so, force the file to be closed and - * reopened. */ - struct stat st; - POSITION curr_pos = ch_tell(); - int r = stat(get_filename(curr_ifile), &st); - if (r == 0 && (st.st_ino != curr_ino || - st.st_dev != curr_dev || - (curr_pos != NULL_POSITION && st.st_size < curr_pos))) - { - /* screen_trashed=2 causes - * make_display to reopen the file. */ - screen_trashed = 2; - return (EOI); - } - } + if (follow_mode == FOLLOW_NAME) + { + /* See whether the file's i-number has changed, + * or the file has shrunk. + * If so, force the file to be closed and + * reopened. */ + struct stat st; + POSITION curr_pos = ch_tell(); + int r = stat(get_filename(curr_ifile), &st); + if (r == 0 && (st.st_ino != curr_ino || + st.st_dev != curr_dev || + (curr_pos != NULL_POSITION && st.st_size < curr_pos))) + { + /* screen_trashed=2 causes + * make_display to reopen the file. */ + screen_trashed = 2; + return (EOI); + } + } #endif - } - if (sigs) - return (EOI); - } + } + if (sigs) + return (EOI); + } found: - if (ch_bufhead != bn) - { - /* - * Move the buffer to the head of the buffer chain. - * This orders the buffer chain, most- to least-recently used. - */ - BUF_RM(bn); - BUF_INS_HEAD(bn); - - /* - * Move to head of hash chain too. - */ - BUF_HASH_RM(bn); - BUF_HASH_INS(bn, h); - } - - if (ch_offset >= bp->datasize) - /* - * After all that, we still don't have enough data. - * Go back and try again. - */ - goto read_more; - - return (bp->data[ch_offset]); + if (ch_bufhead != bn) + { + /* + * Move the buffer to the head of the buffer chain. + * This orders the buffer chain, most- to least-recently used. + */ + BUF_RM(bn); + BUF_INS_HEAD(bn); + + /* + * Move to head of hash chain too. + */ + BUF_HASH_RM(bn); + BUF_HASH_INS(bn, h); + } + + if (ch_offset >= bp->datasize) + /* + * After all that, we still don't have enough data. + * Go back and try again. + */ + goto read_more; + + return (bp->data[ch_offset]); } /* - * ch_ungetchar is a rather kludgy and limited way to push + * ch_ungetchar is a rather kludgy and limited way to push * a single char onto an input file descriptor. */ - public void + public void ch_ungetchar(c) - int c; + int c; { - if (c != -1 && ch_ungotchar != -1) - error("ch_ungetchar overrun", NULL_PARG); - ch_ungotchar = c; + if (c != -1 && ch_ungotchar != -1) + error("ch_ungetchar overrun", NULL_PARG); + ch_ungotchar = c; } #if LOGFILE @@ -389,25 +389,25 @@ ch_ungetchar(c) * Close the logfile. * If we haven't read all of standard input into it, do that now. */ - public void + public void end_logfile(VOID_PARAM) { - static int tried = FALSE; - - if (logfile < 0) - return; - if (!tried && ch_fsize == NULL_POSITION) - { - tried = TRUE; - ierror("Finishing logfile", NULL_PARG); - while (ch_forw_get() != EOI) - if (ABORT_SIGS()) - break; - } - close(logfile); - logfile = -1; - free(namelogfile); - namelogfile = NULL; + static int tried = FALSE; + + if (logfile < 0) + return; + if (!tried && ch_fsize == NULL_POSITION) + { + tried = TRUE; + ierror("Finishing logfile", NULL_PARG); + while (ch_forw_get() != EOI) + if (ABORT_SIGS()) + break; + } + close(logfile); + logfile = -1; + free(namelogfile); + namelogfile = NULL; } /* @@ -415,36 +415,36 @@ end_logfile(VOID_PARAM) * Invoked from the - command; see toggle_option(). * Write all the existing buffered data to the log file. */ - public void + public void sync_logfile(VOID_PARAM) { - struct buf *bp; - struct bufnode *bn; - int warned = FALSE; - BLOCKNUM block; - BLOCKNUM nblocks; - - nblocks = (ch_fpos + LBUFSIZE - 1) / LBUFSIZE; - for (block = 0; block < nblocks; block++) - { - int wrote = FALSE; - FOR_BUFS(bn) - { - bp = bufnode_buf(bn); - if (bp->block == block) - { - write(logfile, (char *) bp->data, bp->datasize); - wrote = TRUE; - break; - } - } - if (!wrote && !warned) - { - error("Warning: log file is incomplete", - NULL_PARG); - warned = TRUE; - } - } + struct buf *bp; + struct bufnode *bn; + int warned = FALSE; + BLOCKNUM block; + BLOCKNUM nblocks; + + nblocks = (ch_fpos + LBUFSIZE - 1) / LBUFSIZE; + for (block = 0; block < nblocks; block++) + { + int wrote = FALSE; + FOR_BUFS(bn) + { + bp = bufnode_buf(bn); + if (bp->block == block) + { + write(logfile, (char *) bp->data, bp->datasize); + wrote = TRUE; + break; + } + } + if (!wrote && !warned) + { + error("Warning: log file is incomplete", + NULL_PARG); + warned = TRUE; + } + } } #endif @@ -452,115 +452,115 @@ sync_logfile(VOID_PARAM) /* * Determine if a specific block is currently in one of the buffers. */ - static int + static int buffered(block) - BLOCKNUM block; + BLOCKNUM block; { - struct buf *bp; - struct bufnode *bn; - int h; - - h = BUFHASH(block); - FOR_BUFS_IN_CHAIN(h, bn) - { - bp = bufnode_buf(bn); - if (bp->block == block) - return (TRUE); - } - return (FALSE); + struct buf *bp; + struct bufnode *bn; + int h; + + h = BUFHASH(block); + FOR_BUFS_IN_CHAIN(h, bn) + { + bp = bufnode_buf(bn); + if (bp->block == block) + return (TRUE); + } + return (FALSE); } /* * Seek to a specified position in the file. * Return 0 if successful, non-zero if can't seek there. */ - public int + public int ch_seek(pos) - POSITION pos; + POSITION pos; { - BLOCKNUM new_block; - POSITION len; - - if (thisfile == NULL) - return (0); - - len = ch_length(); - if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) - return (1); - - new_block = pos / LBUFSIZE; - if (!(ch_flags & CH_CANSEEK) && pos != ch_fpos && !buffered(new_block)) - { - if (ch_fpos > pos) - return (1); - while (ch_fpos < pos) - { - if (ch_forw_get() == EOI) - return (1); - if (ABORT_SIGS()) - return (1); - } - return (0); - } - /* - * Set read pointer. - */ - ch_block = new_block; - ch_offset = pos % LBUFSIZE; - return (0); + BLOCKNUM new_block; + POSITION len; + + if (thisfile == NULL) + return (0); + + len = ch_length(); + if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) + return (1); + + new_block = pos / LBUFSIZE; + if (!(ch_flags & CH_CANSEEK) && pos != ch_fpos && !buffered(new_block)) + { + if (ch_fpos > pos) + return (1); + while (ch_fpos < pos) + { + if (ch_forw_get() == EOI) + return (1); + if (ABORT_SIGS()) + return (1); + } + return (0); + } + /* + * Set read pointer. + */ + ch_block = new_block; + ch_offset = pos % LBUFSIZE; + return (0); } /* * Seek to the end of the file. */ - public int + public int ch_end_seek(VOID_PARAM) { - POSITION len; + POSITION len; - if (thisfile == NULL) - return (0); + if (thisfile == NULL) + return (0); - if (ch_flags & CH_CANSEEK) - ch_fsize = filesize(ch_file); + if (ch_flags & CH_CANSEEK) + ch_fsize = filesize(ch_file); - len = ch_length(); - if (len != NULL_POSITION) - return (ch_seek(len)); + len = ch_length(); + if (len != NULL_POSITION) + return (ch_seek(len)); - /* - * Do it the slow way: read till end of data. - */ - while (ch_forw_get() != EOI) - if (ABORT_SIGS()) - return (1); - return (0); + /* + * Do it the slow way: read till end of data. + */ + while (ch_forw_get() != EOI) + if (ABORT_SIGS()) + return (1); + return (0); } /* * Seek to the last position in the file that is currently buffered. */ - public int + public int ch_end_buffer_seek(VOID_PARAM) { - struct buf *bp; - struct bufnode *bn; - POSITION buf_pos; - POSITION end_pos; - - if (thisfile == NULL || (ch_flags & CH_CANSEEK)) - return (ch_end_seek()); - - end_pos = 0; - FOR_BUFS(bn) - { - bp = bufnode_buf(bn); - buf_pos = (bp->block * LBUFSIZE) + bp->datasize; - if (buf_pos > end_pos) - end_pos = buf_pos; - } - - return (ch_seek(end_pos)); + struct buf *bp; + struct bufnode *bn; + POSITION buf_pos; + POSITION end_pos; + + if (thisfile == NULL || (ch_flags & CH_CANSEEK)) + return (ch_end_seek()); + + end_pos = 0; + FOR_BUFS(bn) + { + bp = bufnode_buf(bn); + buf_pos = (bp->block * LBUFSIZE) + bp->datasize; + if (buf_pos > end_pos) + end_pos = buf_pos; + } + + return (ch_seek(end_pos)); } /* @@ -568,413 +568,413 @@ ch_end_buffer_seek(VOID_PARAM) * We may not be able to seek there if input is a pipe and the * beginning of the pipe is no longer buffered. */ - public int + public int ch_beg_seek(VOID_PARAM) { - struct bufnode *bn; - struct bufnode *firstbn; - - /* - * Try a plain ch_seek first. - */ - if (ch_seek(ch_zero()) == 0) - return (0); - - /* - * Can't get to position 0. - * Look thru the buffers for the one closest to position 0. - */ - firstbn = ch_bufhead; - if (firstbn == END_OF_CHAIN) - return (1); - FOR_BUFS(bn) - { - if (bufnode_buf(bn)->block < bufnode_buf(firstbn)->block) - firstbn = bn; - } - ch_block = bufnode_buf(firstbn)->block; - ch_offset = 0; - return (0); + struct bufnode *bn; + struct bufnode *firstbn; + + /* + * Try a plain ch_seek first. + */ + if (ch_seek(ch_zero()) == 0) + return (0); + + /* + * Can't get to position 0. + * Look thru the buffers for the one closest to position 0. + */ + firstbn = ch_bufhead; + if (firstbn == END_OF_CHAIN) + return (1); + FOR_BUFS(bn) + { + if (bufnode_buf(bn)->block < bufnode_buf(firstbn)->block) + firstbn = bn; + } + ch_block = bufnode_buf(firstbn)->block; + ch_offset = 0; + return (0); } /* * Return the length of the file, if known. */ - public POSITION + public POSITION ch_length(VOID_PARAM) { - if (thisfile == NULL) - return (NULL_POSITION); - if (ignore_eoi) - return (NULL_POSITION); - if (ch_flags & CH_HELPFILE) - return (size_helpdata); - if (ch_flags & CH_NODATA) - return (0); - return (ch_fsize); + if (thisfile == NULL) + return (NULL_POSITION); + if (ignore_eoi) + return (NULL_POSITION); + if (ch_flags & CH_HELPFILE) + return (size_helpdata); + if (ch_flags & CH_NODATA) + return (0); + return (ch_fsize); } /* * Return the current position in the file. */ - public POSITION + public POSITION ch_tell(VOID_PARAM) { - if (thisfile == NULL) - return (NULL_POSITION); - return (ch_block * LBUFSIZE) + ch_offset; + if (thisfile == NULL) + return (NULL_POSITION); + return (ch_block * LBUFSIZE) + ch_offset; } /* * Get the current char and post-increment the read pointer. */ - public int + public int ch_forw_get(VOID_PARAM) { - int c; - - if (thisfile == NULL) - return (EOI); - c = ch_get(); - if (c == EOI) - return (EOI); - if (ch_offset < LBUFSIZE-1) - ch_offset++; - else - { - ch_block ++; - ch_offset = 0; - } - return (c); + int c; + + if (thisfile == NULL) + return (EOI); + c = ch_get(); + if (c == EOI) + return (EOI); + if (ch_offset < LBUFSIZE-1) + ch_offset++; + else + { + ch_block ++; + ch_offset = 0; + } + return (c); } /* * Pre-decrement the read pointer and get the new current char. */ - public int + public int ch_back_get(VOID_PARAM) { - if (thisfile == NULL) - return (EOI); - if (ch_offset > 0) - ch_offset --; - else - { - if (ch_block <= 0) - return (EOI); - if (!(ch_flags & CH_CANSEEK) && !buffered(ch_block-1)) - return (EOI); - ch_block--; - ch_offset = LBUFSIZE-1; - } - return (ch_get()); + if (thisfile == NULL) + return (EOI); + if (ch_offset > 0) + ch_offset --; + else + { + if (ch_block <= 0) + return (EOI); + if (!(ch_flags & CH_CANSEEK) && !buffered(ch_block-1)) + return (EOI); + ch_block--; + ch_offset = LBUFSIZE-1; + } + return (ch_get()); } /* * Set max amount of buffer space. * bufspace is in units of 1024 bytes. -1 mean no limit. */ - public void + public void ch_setbufspace(bufspace) - int bufspace; + int bufspace; { - if (bufspace < 0) - maxbufs = -1; - else - { - maxbufs = ((bufspace * 1024) + LBUFSIZE-1) / LBUFSIZE; - if (maxbufs < 1) - maxbufs = 1; - } + if (bufspace < 0) + maxbufs = -1; + else + { + maxbufs = ((bufspace * 1024) + LBUFSIZE-1) / LBUFSIZE; + if (maxbufs < 1) + maxbufs = 1; + } } /* * Flush (discard) any saved file state, including buffer contents. */ - public void + public void ch_flush(VOID_PARAM) { - struct bufnode *bn; - - if (thisfile == NULL) - return; - - if (!(ch_flags & CH_CANSEEK)) - { - /* - * If input is a pipe, we don't flush buffer contents, - * since the contents can't be recovered. - */ - ch_fsize = NULL_POSITION; - return; - } - - /* - * Initialize all the buffers. - */ - FOR_BUFS(bn) - { - bufnode_buf(bn)->block = -1; - } - - /* - * Figure out the size of the file, if we can. - */ - ch_fsize = filesize(ch_file); - - /* - * Seek to a known position: the beginning of the file. - */ - ch_fpos = 0; - ch_block = 0; /* ch_fpos / LBUFSIZE; */ - ch_offset = 0; /* ch_fpos % LBUFSIZE; */ + struct bufnode *bn; + + if (thisfile == NULL) + return; + + if (!(ch_flags & CH_CANSEEK)) + { + /* + * If input is a pipe, we don't flush buffer contents, + * since the contents can't be recovered. + */ + ch_fsize = NULL_POSITION; + return; + } + + /* + * Initialize all the buffers. + */ + FOR_BUFS(bn) + { + bufnode_buf(bn)->block = -1; + } + + /* + * Figure out the size of the file, if we can. + */ + ch_fsize = filesize(ch_file); + + /* + * Seek to a known position: the beginning of the file. + */ + ch_fpos = 0; + ch_block = 0; /* ch_fpos / LBUFSIZE; */ + ch_offset = 0; /* ch_fpos % LBUFSIZE; */ #if HAVE_PROCFS - /* - * This is a kludge to workaround a Linux kernel bug: files in - * /proc have a size of 0 according to fstat() but have readable - * data. They are sometimes, but not always, seekable. - * Force them to be non-seekable here. - */ - if (ch_fsize == 0) - { - struct statfs st; - if (fstatfs(ch_file, &st) == 0) - { - if (st.f_type == PROC_SUPER_MAGIC) - { - ch_fsize = NULL_POSITION; - ch_flags &= ~CH_CANSEEK; - } - } - } + /* + * This is a kludge to workaround a Linux kernel bug: files in + * /proc have a size of 0 according to fstat() but have readable + * data. They are sometimes, but not always, seekable. + * Force them to be non-seekable here. + */ + if (ch_fsize == 0) + { + struct statfs st; + if (fstatfs(ch_file, &st) == 0) + { + if (st.f_type == PROC_SUPER_MAGIC) + { + ch_fsize = NULL_POSITION; + ch_flags &= ~CH_CANSEEK; + } + } + } #endif - if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) - { - /* - * Warning only; even if the seek fails for some reason, - * there's a good chance we're at the beginning anyway. - * {{ I think this is bogus reasoning. }} - */ - error("seek error to 0", NULL_PARG); - } + if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) + { + /* + * Warning only; even if the seek fails for some reason, + * there's a good chance we're at the beginning anyway. + * {{ I think this is bogus reasoning. }} + */ + error("seek error to 0", NULL_PARG); + } } /* * Allocate a new buffer. * The buffer is added to the tail of the buffer chain. */ - static int + static int ch_addbuf(VOID_PARAM) { - struct buf *bp; - struct bufnode *bn; - - /* - * Allocate and initialize a new buffer and link it - * onto the tail of the buffer list. - */ - bp = (struct buf *) calloc(1, sizeof(struct buf)); - if (bp == NULL) - return (1); - ch_nbufs++; - bp->block = -1; - bn = &bp->node; - - BUF_INS_TAIL(bn); - BUF_HASH_INS(bn, 0); - return (0); + struct buf *bp; + struct bufnode *bn; + + /* + * Allocate and initialize a new buffer and link it + * onto the tail of the buffer list. + */ + bp = (struct buf *) calloc(1, sizeof(struct buf)); + if (bp == NULL) + return (1); + ch_nbufs++; + bp->block = -1; + bn = &bp->node; + + BUF_INS_TAIL(bn); + BUF_HASH_INS(bn, 0); + return (0); } /* * */ - static void + static void init_hashtbl(VOID_PARAM) { - int h; + int h; - for (h = 0; h < BUFHASH_SIZE; h++) - { - thisfile->hashtbl[h].hnext = END_OF_HCHAIN(h); - thisfile->hashtbl[h].hprev = END_OF_HCHAIN(h); - } + for (h = 0; h < BUFHASH_SIZE; h++) + { + thisfile->hashtbl[h].hnext = END_OF_HCHAIN(h); + thisfile->hashtbl[h].hprev = END_OF_HCHAIN(h); + } } /* * Delete all buffers for this file. */ - static void + static void ch_delbufs(VOID_PARAM) { - struct bufnode *bn; - - while (ch_bufhead != END_OF_CHAIN) - { - bn = ch_bufhead; - BUF_RM(bn); - free(bufnode_buf(bn)); - } - ch_nbufs = 0; - init_hashtbl(); + struct bufnode *bn; + + while (ch_bufhead != END_OF_CHAIN) + { + bn = ch_bufhead; + BUF_RM(bn); + free(bufnode_buf(bn)); + } + ch_nbufs = 0; + init_hashtbl(); } /* * Is it possible to seek on a file descriptor? */ - public int + public int seekable(f) - int f; + int f; { #if MSDOS_COMPILER - extern int fd0; - if (f == fd0 && !isatty(fd0)) - { - /* - * In MS-DOS, pipes are seekable. Check for - * standard input, and pretend it is not seekable. - */ - return (0); - } + extern int fd0; + if (f == fd0 && !isatty(fd0)) + { + /* + * In MS-DOS, pipes are seekable. Check for + * standard input, and pretend it is not seekable. + */ + return (0); + } #endif - return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK); + return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK); } /* * Force EOF to be at the current read position. * This is used after an ignore_eof read, during which the EOF may change. */ - public void + public void ch_set_eof(VOID_PARAM) { - if (ch_fsize != NULL_POSITION && ch_fsize < ch_fpos) - ch_fsize = ch_fpos; + if (ch_fsize != NULL_POSITION && ch_fsize < ch_fpos) + ch_fsize = ch_fpos; } /* * Initialize file state for a new file. */ - public void + public void ch_init(f, flags) - int f; - int flags; + int f; + int flags; { - /* - * See if we already have a filestate for this file. - */ - thisfile = (struct filestate *) get_filestate(curr_ifile); - if (thisfile == NULL) - { - /* - * Allocate and initialize a new filestate. - */ - thisfile = (struct filestate *) - ecalloc(1, sizeof(struct filestate)); - thisfile->buflist.next = thisfile->buflist.prev = END_OF_CHAIN; - thisfile->nbufs = 0; - thisfile->flags = flags; - thisfile->fpos = 0; - thisfile->block = 0; - thisfile->offset = 0; - thisfile->file = -1; - thisfile->fsize = NULL_POSITION; - init_hashtbl(); - /* - * Try to seek; set CH_CANSEEK if it works. - */ - if ((flags & CH_CANSEEK) && !seekable(f)) - ch_flags &= ~CH_CANSEEK; - set_filestate(curr_ifile, (void *) thisfile); - } - if (thisfile->file == -1) - thisfile->file = f; - ch_flush(); + /* + * See if we already have a filestate for this file. + */ + thisfile = (struct filestate *) get_filestate(curr_ifile); + if (thisfile == NULL) + { + /* + * Allocate and initialize a new filestate. + */ + thisfile = (struct filestate *) + ecalloc(1, sizeof(struct filestate)); + thisfile->buflist.next = thisfile->buflist.prev = END_OF_CHAIN; + thisfile->nbufs = 0; + thisfile->flags = flags; + thisfile->fpos = 0; + thisfile->block = 0; + thisfile->offset = 0; + thisfile->file = -1; + thisfile->fsize = NULL_POSITION; + init_hashtbl(); + /* + * Try to seek; set CH_CANSEEK if it works. + */ + if ((flags & CH_CANSEEK) && !seekable(f)) + ch_flags &= ~CH_CANSEEK; + set_filestate(curr_ifile, (void *) thisfile); + } + if (thisfile->file == -1) + thisfile->file = f; + ch_flush(); } /* * Close a filestate. */ - public void + public void ch_close(VOID_PARAM) { - int keepstate = FALSE; - - if (thisfile == NULL) - return; - - if ((ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) && !(ch_flags & CH_KEEPOPEN)) - { - /* - * We can seek or re-open, so we don't need to keep buffers. - */ - ch_delbufs(); - } else - keepstate = TRUE; - if (!(ch_flags & CH_KEEPOPEN)) - { - /* - * We don't need to keep the file descriptor open - * (because we can re-open it.) - * But don't really close it if it was opened via popen(), - * because pclose() wants to close it. - */ - if (!(ch_flags & (CH_POPENED|CH_HELPFILE))) - close(ch_file); - ch_file = -1; - } else - keepstate = TRUE; - if (!keepstate) - { - /* - * We don't even need to keep the filestate structure. - */ - free(thisfile); - thisfile = NULL; - set_filestate(curr_ifile, (void *) NULL); - } + int keepstate = FALSE; + + if (thisfile == NULL) + return; + + if ((ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) && !(ch_flags & CH_KEEPOPEN)) + { + /* + * We can seek or re-open, so we don't need to keep buffers. + */ + ch_delbufs(); + } else + keepstate = TRUE; + if (!(ch_flags & CH_KEEPOPEN)) + { + /* + * We don't need to keep the file descriptor open + * (because we can re-open it.) + * But don't really close it if it was opened via popen(), + * because pclose() wants to close it. + */ + if (!(ch_flags & (CH_POPENED|CH_HELPFILE))) + close(ch_file); + ch_file = -1; + } else + keepstate = TRUE; + if (!keepstate) + { + /* + * We don't even need to keep the filestate structure. + */ + free(thisfile); + thisfile = NULL; + set_filestate(curr_ifile, (void *) NULL); + } } /* * Return ch_flags for the current file. */ - public int + public int ch_getflags(VOID_PARAM) { - if (thisfile == NULL) - return (0); - return (ch_flags); + if (thisfile == NULL) + return (0); + return (ch_flags); } #if 0 - public void + public void ch_dump(struct filestate *fs) { - struct buf *bp; - struct bufnode *bn; - unsigned char *s; - - if (fs == NULL) - { - printf(" --no filestate\n"); - return; - } - printf(" file %d, flags %x, fpos %x, fsize %x, blk/off %x/%x\n", - fs->file, fs->flags, fs->fpos, - fs->fsize, fs->block, fs->offset); - printf(" %d bufs:\n", fs->nbufs); - for (bn = fs->next; bn != &fs->buflist; bn = bn->next) - { - bp = bufnode_buf(bn); - printf("%x: blk %x, size %x \"", - bp, bp->block, bp->datasize); - for (s = bp->data; s < bp->data + 30; s++) - if (*s >= ' ' && *s < 0x7F) - printf("%c", *s); - else - printf("."); - printf("\"\n"); - } + struct buf *bp; + struct bufnode *bn; + unsigned char *s; + + if (fs == NULL) + { + printf(" --no filestate\n"); + return; + } + printf(" file %d, flags %x, fpos %x, fsize %x, blk/off %x/%x\n", + fs->file, fs->flags, fs->fpos, + fs->fsize, fs->block, fs->offset); + printf(" %d bufs:\n", fs->nbufs); + for (bn = fs->next; bn != &fs->buflist; bn = bn->next) + { + bp = bufnode_buf(bn); + printf("%x: blk %x, size %x \"", + bp, bp->block, bp->datasize); + for (s = bp->data; s < bp->data + 30; s++) + if (*s >= ' ' && *s < 0x7F) + printf("%c", *s); + else + printf("."); + printf("\"\n"); + } } #endif diff --git a/charset.c b/charset.c index 5e9a2d6..93a9d3c 100644 --- a/charset.c +++ b/charset.c @@ -36,83 +36,83 @@ public int utf_mode = 0; * selected by the LESSCHARSET environment variable. */ struct charset { - char *name; - int *p_flag; - char *desc; + char *name; + int *p_flag; + char *desc; } charsets[] = { - { "ascii", NULL, "8bcccbcc18b95.b" }, - { "utf-8", &utf_mode, "8bcccbcc18b95.b126.bb" }, - { "iso8859", NULL, "8bcccbcc18b95.33b." }, - { "latin3", NULL, "8bcccbcc18b95.33b5.b8.b15.b4.b12.b18.b12.b." }, - { "arabic", NULL, "8bcccbcc18b95.33b.3b.7b2.13b.3b.b26.5b19.b" }, - { "greek", NULL, "8bcccbcc18b95.33b4.2b4.b3.b35.b44.b" }, - { "greek2005", NULL, "8bcccbcc18b95.33b14.b35.b44.b" }, - { "hebrew", NULL, "8bcccbcc18b95.33b.b29.32b28.2b2.b" }, - { "koi8-r", NULL, "8bcccbcc18b95.b." }, - { "KOI8-T", NULL, "8bcccbcc18b95.b8.b6.b8.b.b.5b7.3b4.b4.b3.b.b.3b." }, - { "georgianps", NULL, "8bcccbcc18b95.3b11.4b12.2b." }, - { "tcvn", NULL, "b..b...bcccbccbbb7.8b95.b48.5b." }, - { "TIS-620", NULL, "8bcccbcc18b95.b.4b.11b7.8b." }, - { "next", NULL, "8bcccbcc18b95.bb125.bb" }, - { "dos", NULL, "8bcccbcc12bc5b95.b." }, - { "windows-1251", NULL, "8bcccbcc12bc5b95.b24.b." }, - { "windows-1252", NULL, "8bcccbcc12bc5b95.b.b11.b.2b12.b." }, - { "windows-1255", NULL, "8bcccbcc12bc5b95.b.b8.b.5b9.b.4b." }, - { "ebcdic", NULL, "5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b." }, - { "IBM-1047", NULL, "4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc191.b" }, - { NULL, NULL, NULL } + { "ascii", NULL, "8bcccbcc18b95.b" }, + { "utf-8", &utf_mode, "8bcccbcc18b95.b126.bb" }, + { "iso8859", NULL, "8bcccbcc18b95.33b." }, + { "latin3", NULL, "8bcccbcc18b95.33b5.b8.b15.b4.b12.b18.b12.b." }, + { "arabic", NULL, "8bcccbcc18b95.33b.3b.7b2.13b.3b.b26.5b19.b" }, + { "greek", NULL, "8bcccbcc18b95.33b4.2b4.b3.b35.b44.b" }, + { "greek2005", NULL, "8bcccbcc18b95.33b14.b35.b44.b" }, + { "hebrew", NULL, "8bcccbcc18b95.33b.b29.32b28.2b2.b" }, + { "koi8-r", NULL, "8bcccbcc18b95.b." }, + { "KOI8-T", NULL, "8bcccbcc18b95.b8.b6.b8.b.b.5b7.3b4.b4.b3.b.b.3b." }, + { "georgianps", NULL, "8bcccbcc18b95.3b11.4b12.2b." }, + { "tcvn", NULL, "b..b...bcccbccbbb7.8b95.b48.5b." }, + { "TIS-620", NULL, "8bcccbcc18b95.b.4b.11b7.8b." }, + { "next", NULL, "8bcccbcc18b95.bb125.bb" }, + { "dos", NULL, "8bcccbcc12bc5b95.b." }, + { "windows-1251", NULL, "8bcccbcc12bc5b95.b24.b." }, + { "windows-1252", NULL, "8bcccbcc12bc5b95.b.b11.b.2b12.b." }, + { "windows-1255", NULL, "8bcccbcc12bc5b95.b.b8.b.5b9.b.4b." }, + { "ebcdic", NULL, "5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b." }, + { "IBM-1047", NULL, "4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc191.b" }, + { NULL, NULL, NULL } }; /* * Support "locale charmap"/nl_langinfo(CODESET) values, as well as others. */ struct cs_alias { - char *name; - char *oname; + char *name; + char *oname; } cs_aliases[] = { - { "UTF-8", "utf-8" }, - { "utf8", "utf-8" }, - { "UTF8", "utf-8" }, - { "ANSI_X3.4-1968", "ascii" }, - { "US-ASCII", "ascii" }, - { "latin1", "iso8859" }, - { "ISO-8859-1", "iso8859" }, - { "latin9", "iso8859" }, - { "ISO-8859-15", "iso8859" }, - { "latin2", "iso8859" }, - { "ISO-8859-2", "iso8859" }, - { "ISO-8859-3", "latin3" }, - { "latin4", "iso8859" }, - { "ISO-8859-4", "iso8859" }, - { "cyrillic", "iso8859" }, - { "ISO-8859-5", "iso8859" }, - { "ISO-8859-6", "arabic" }, - { "ISO-8859-7", "greek" }, - { "IBM9005", "greek2005" }, - { "ISO-8859-8", "hebrew" }, - { "latin5", "iso8859" }, - { "ISO-8859-9", "iso8859" }, - { "latin6", "iso8859" }, - { "ISO-8859-10", "iso8859" }, - { "latin7", "iso8859" }, - { "ISO-8859-13", "iso8859" }, - { "latin8", "iso8859" }, - { "ISO-8859-14", "iso8859" }, - { "latin10", "iso8859" }, - { "ISO-8859-16", "iso8859" }, - { "IBM437", "dos" }, - { "EBCDIC-US", "ebcdic" }, - { "IBM1047", "IBM-1047" }, - { "KOI8-R", "koi8-r" }, - { "KOI8-U", "koi8-r" }, - { "GEORGIAN-PS", "georgianps" }, - { "TCVN5712-1", "tcvn" }, - { "NEXTSTEP", "next" }, - { "windows", "windows-1252" }, /* backward compatibility */ - { "CP1251", "windows-1251" }, - { "CP1252", "windows-1252" }, - { "CP1255", "windows-1255" }, - { NULL, NULL } + { "UTF-8", "utf-8" }, + { "utf8", "utf-8" }, + { "UTF8", "utf-8" }, + { "ANSI_X3.4-1968", "ascii" }, + { "US-ASCII", "ascii" }, + { "latin1", "iso8859" }, + { "ISO-8859-1", "iso8859" }, + { "latin9", "iso8859" }, + { "ISO-8859-15", "iso8859" }, + { "latin2", "iso8859" }, + { "ISO-8859-2", "iso8859" }, + { "ISO-8859-3", "latin3" }, + { "latin4", "iso8859" }, + { "ISO-8859-4", "iso8859" }, + { "cyrillic", "iso8859" }, + { "ISO-8859-5", "iso8859" }, + { "ISO-8859-6", "arabic" }, + { "ISO-8859-7", "greek" }, + { "IBM9005", "greek2005" }, + { "ISO-8859-8", "hebrew" }, + { "latin5", "iso8859" }, + { "ISO-8859-9", "iso8859" }, + { "latin6", "iso8859" }, + { "ISO-8859-10", "iso8859" }, + { "latin7", "iso8859" }, + { "ISO-8859-13", "iso8859" }, + { "latin8", "iso8859" }, + { "ISO-8859-14", "iso8859" }, + { "latin10", "iso8859" }, + { "ISO-8859-16", "iso8859" }, + { "IBM437", "dos" }, + { "EBCDIC-US", "ebcdic" }, + { "IBM1047", "IBM-1047" }, + { "KOI8-R", "koi8-r" }, + { "KOI8-U", "koi8-r" }, + { "GEORGIAN-PS", "georgianps" }, + { "TCVN5712-1", "tcvn" }, + { "NEXTSTEP", "next" }, + { "windows", "windows-1252" }, /* backward compatibility */ + { "CP1251", "windows-1251" }, + { "CP1252", "windows-1252" }, + { "CP1255", "windows-1255" }, + { NULL, NULL } }; #define IS_BINARY_CHAR 01 @@ -130,7 +130,7 @@ public int binattr = AT_STANDOUT|AT_COLOR_BIN; * one for each character in the charset. * If the string is shorter than 256 letters, missing letters * are taken to be identical to the last one. - * A decimal number followed by a letter is taken to be a + * A decimal number followed by a letter is taken to be a * repetition of the letter. * * Each letter is one of: @@ -138,255 +138,255 @@ public int binattr = AT_STANDOUT|AT_COLOR_BIN; * b binary character * c control character */ - static void + static void ichardef(s) - char *s; + char *s; { - char *cp; - int n; - char v; - - n = 0; - v = 0; - cp = chardef; - while (*s != '\0') - { - switch (*s++) - { - case '.': - v = 0; - break; - case 'c': - v = IS_CONTROL_CHAR; - break; - case 'b': - v = IS_BINARY_CHAR|IS_CONTROL_CHAR; - break; - - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - n = (10 * n) + (s[-1] - '0'); - continue; - - default: - error("invalid chardef", NULL_PARG); - quit(QUIT_ERROR); - /*NOTREACHED*/ - } - - do - { - if (cp >= chardef + sizeof(chardef)) - { - error("chardef longer than 256", NULL_PARG); - quit(QUIT_ERROR); - /*NOTREACHED*/ - } - *cp++ = v; - } while (--n > 0); - n = 0; - } - - while (cp < chardef + sizeof(chardef)) - *cp++ = v; + char *cp; + int n; + char v; + + n = 0; + v = 0; + cp = chardef; + while (*s != '\0') + { + switch (*s++) + { + case '.': + v = 0; + break; + case 'c': + v = IS_CONTROL_CHAR; + break; + case 'b': + v = IS_BINARY_CHAR|IS_CONTROL_CHAR; + break; + + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + n = (10 * n) + (s[-1] - '0'); + continue; + + default: + error("invalid chardef", NULL_PARG); + quit(QUIT_ERROR); + /*NOTREACHED*/ + } + + do + { + if (cp >= chardef + sizeof(chardef)) + { + error("chardef longer than 256", NULL_PARG); + quit(QUIT_ERROR); + /*NOTREACHED*/ + } + *cp++ = v; + } while (--n > 0); + n = 0; + } + + while (cp < chardef + sizeof(chardef)) + *cp++ = v; } /* * Define a charset, given a charset name. * The valid charset names are listed in the "charsets" array. */ - static int + static int icharset(name, no_error) - char *name; - int no_error; + char *name; + int no_error; { - struct charset *p; - struct cs_alias *a; - - if (name == NULL || *name == '\0') - return (0); - - /* First see if the name is an alias. */ - for (a = cs_aliases; a->name != NULL; a++) - { - if (strcmp(name, a->name) == 0) - { - name = a->oname; - break; - } - } - - for (p = charsets; p->name != NULL; p++) - { - if (strcmp(name, p->name) == 0) - { - ichardef(p->desc); - if (p->p_flag != NULL) - { + struct charset *p; + struct cs_alias *a; + + if (name == NULL || *name == '\0') + return (0); + + /* First see if the name is an alias. */ + for (a = cs_aliases; a->name != NULL; a++) + { + if (strcmp(name, a->name) == 0) + { + name = a->oname; + break; + } + } + + for (p = charsets; p->name != NULL; p++) + { + if (strcmp(name, p->name) == 0) + { + ichardef(p->desc); + if (p->p_flag != NULL) + { #if MSDOS_COMPILER==WIN32C - *(p->p_flag) = 1 + (GetConsoleOutputCP() != CP_UTF8); + *(p->p_flag) = 1 + (GetConsoleOutputCP() != CP_UTF8); #else - *(p->p_flag) = 1; + *(p->p_flag) = 1; #endif - } - return (1); - } - } - - if (!no_error) { - error("invalid charset name", NULL_PARG); - quit(QUIT_ERROR); - } - return (0); + } + return (1); + } + } + + if (!no_error) { + error("invalid charset name", NULL_PARG); + quit(QUIT_ERROR); + } + return (0); } #if HAVE_LOCALE /* * Define a charset, given a locale name. */ - static void + static void ilocale(VOID_PARAM) { - int c; - - for (c = 0; c < (int) sizeof(chardef); c++) - { - if (isprint(c)) - chardef[c] = 0; - else if (iscntrl(c)) - chardef[c] = IS_CONTROL_CHAR; - else - chardef[c] = IS_BINARY_CHAR|IS_CONTROL_CHAR; - } + int c; + + for (c = 0; c < (int) sizeof(chardef); c++) + { + if (isprint(c)) + chardef[c] = 0; + else if (iscntrl(c)) + chardef[c] = IS_CONTROL_CHAR; + else + chardef[c] = IS_BINARY_CHAR|IS_CONTROL_CHAR; + } } #endif /* * Define the printing format for control (or binary utf) chars. */ - public void + public void setfmt(s, fmtvarptr, attrptr, default_fmt) - char *s; - char **fmtvarptr; - int *attrptr; - char *default_fmt; + char *s; + char **fmtvarptr; + int *attrptr; + char *default_fmt; { - if (s && utf_mode) - { - /* It would be too hard to account for width otherwise. */ - char constant *t = s; - while (*t) - { - if (*t < ' ' || *t > '~') - { - s = default_fmt; - goto attr; - } - t++; - } - } - - /* %n is evil */ - if (s == NULL || *s == '\0' || - (*s == '*' && (s[1] == '\0' || s[2] == '\0' || strchr(s + 2, 'n'))) || - (*s != '*' && strchr(s, 'n'))) - s = default_fmt; - - /* - * Select the attributes if it starts with "*". - */ + if (s && utf_mode) + { + /* It would be too hard to account for width otherwise. */ + char constant *t = s; + while (*t) + { + if (*t < ' ' || *t > '~') + { + s = default_fmt; + goto attr; + } + t++; + } + } + + /* %n is evil */ + if (s == NULL || *s == '\0' || + (*s == '*' && (s[1] == '\0' || s[2] == '\0' || strchr(s + 2, 'n'))) || + (*s != '*' && strchr(s, 'n'))) + s = default_fmt; + + /* + * Select the attributes if it starts with "*". + */ attr: - if (*s == '*' && s[1] != '\0') - { - switch (s[1]) - { - case 'd': *attrptr = AT_BOLD; break; - case 'k': *attrptr = AT_BLINK; break; - case 's': *attrptr = AT_STANDOUT; break; - case 'u': *attrptr = AT_UNDERLINE; break; - default: *attrptr = AT_NORMAL; break; - } - s += 2; - } - *fmtvarptr = s; + if (*s == '*' && s[1] != '\0') + { + switch (s[1]) + { + case 'd': *attrptr = AT_BOLD; break; + case 'k': *attrptr = AT_BLINK; break; + case 's': *attrptr = AT_STANDOUT; break; + case 'u': *attrptr = AT_UNDERLINE; break; + default: *attrptr = AT_NORMAL; break; + } + s += 2; + } + *fmtvarptr = s; } /* * */ - static void + static void set_charset(VOID_PARAM) { - char *s; + char *s; #if MSDOS_COMPILER==WIN32C - /* - * If the Windows console is using UTF-8, we'll use it too. - */ - if (GetConsoleOutputCP() == CP_UTF8) - if (icharset("utf-8", 1)) - return; + /* + * If the Windows console is using UTF-8, we'll use it too. + */ + if (GetConsoleOutputCP() == CP_UTF8) + if (icharset("utf-8", 1)) + return; #endif - /* - * See if environment variable LESSCHARSET is defined. - */ - s = lgetenv("LESSCHARSET"); - if (icharset(s, 0)) - return; - - /* - * LESSCHARSET is not defined: try LESSCHARDEF. - */ - s = lgetenv("LESSCHARDEF"); - if (!isnullenv(s)) - { - ichardef(s); - return; - } + /* + * See if environment variable LESSCHARSET is defined. + */ + s = lgetenv("LESSCHARSET"); + if (icharset(s, 0)) + return; + + /* + * LESSCHARSET is not defined: try LESSCHARDEF. + */ + s = lgetenv("LESSCHARDEF"); + if (!isnullenv(s)) + { + ichardef(s); + return; + } #if HAVE_LOCALE #ifdef CODESET - /* - * Try using the codeset name as the charset name. - */ - s = nl_langinfo(CODESET); - if (icharset(s, 1)) - return; + /* + * Try using the codeset name as the charset name. + */ + s = nl_langinfo(CODESET); + if (icharset(s, 1)) + return; #endif #endif #if HAVE_STRSTR - /* - * Check whether LC_ALL, LC_CTYPE or LANG look like UTF-8 is used. - */ - if ((s = lgetenv("LC_ALL")) != NULL || - (s = lgetenv("LC_CTYPE")) != NULL || - (s = lgetenv("LANG")) != NULL) - { - if ( strstr(s, "UTF-8") != NULL || strstr(s, "utf-8") != NULL - || strstr(s, "UTF8") != NULL || strstr(s, "utf8") != NULL) - if (icharset("utf-8", 1)) - return; - } + /* + * Check whether LC_ALL, LC_CTYPE or LANG look like UTF-8 is used. + */ + if ((s = lgetenv("LC_ALL")) != NULL || + (s = lgetenv("LC_CTYPE")) != NULL || + (s = lgetenv("LANG")) != NULL) + { + if ( strstr(s, "UTF-8") != NULL || strstr(s, "utf-8") != NULL + || strstr(s, "UTF8") != NULL || strstr(s, "utf8") != NULL) + if (icharset("utf-8", 1)) + return; + } #endif #if HAVE_LOCALE - /* - * Get character definitions from locale functions, - * rather than from predefined charset entry. - */ - ilocale(); + /* + * Get character definitions from locale functions, + * rather than from predefined charset entry. + */ + ilocale(); #else #if MSDOS_COMPILER - /* - * Default to "dos". - */ - (void) icharset("dos", 1); + /* + * Default to "dos". + */ + (void) icharset("dos", 1); #else - /* - * Default to "latin1". - */ - (void) icharset("latin1", 1); + /* + * Default to "latin1". + */ + (void) icharset("latin1", 1); #endif #endif } @@ -394,336 +394,336 @@ set_charset(VOID_PARAM) /* * Initialize charset data structures. */ - public void + public void init_charset(VOID_PARAM) { - char *s; + char *s; #if HAVE_LOCALE - setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); #endif - set_charset(); + set_charset(); - s = lgetenv("LESSBINFMT"); - setfmt(s, &binfmt, &binattr, "*s<%02X>"); - - s = lgetenv("LESSUTFBINFMT"); - setfmt(s, &utfbinfmt, &binattr, ""); + s = lgetenv("LESSBINFMT"); + setfmt(s, &binfmt, &binattr, "*s<%02X>"); + + s = lgetenv("LESSUTFBINFMT"); + setfmt(s, &utfbinfmt, &binattr, ""); } /* * Is a given character a "binary" character? */ - public int + public int binary_char(c) - LWCHAR c; + LWCHAR c; { - if (utf_mode) - return (is_ubin_char(c)); - c &= 0377; - return (chardef[c] & IS_BINARY_CHAR); + if (utf_mode) + return (is_ubin_char(c)); + c &= 0377; + return (chardef[c] & IS_BINARY_CHAR); } /* * Is a given character a "control" character? */ - public int + public int control_char(c) - LWCHAR c; + LWCHAR c; { - c &= 0377; - return (chardef[c] & IS_CONTROL_CHAR); + c &= 0377; + return (chardef[c] & IS_CONTROL_CHAR); } /* * Return the printable form of a character. * For example, in the "ascii" charset '\3' is printed as "^C". */ - public char * + public char * prchar(c) - LWCHAR c; + LWCHAR c; { - /* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */ - static char buf[MAX_PRCHAR_LEN+1]; - - c &= 0377; - if ((c < 128 || !utf_mode) && !control_char(c)) - SNPRINTF1(buf, sizeof(buf), "%c", (int) c); - else if (c == ESC) - strcpy(buf, "ESC"); + /* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */ + static char buf[MAX_PRCHAR_LEN+1]; + + c &= 0377; + if ((c < 128 || !utf_mode) && !control_char(c)) + SNPRINTF1(buf, sizeof(buf), "%c", (int) c); + else if (c == ESC) + strcpy(buf, "ESC"); #if IS_EBCDIC_HOST - else if (!binary_char(c) && c < 64) - SNPRINTF1(buf, sizeof(buf), "^%c", - /* - * This array roughly inverts CONTROL() #defined in less.h, - * and should be kept in sync with CONTROL() and IBM-1047. - */ - "@ABC.I.?...KLMNO" - "PQRS.JH.XY.." - "\\]^_" - "......W[.....EFG" - "..V....D....TU.Z"[c]); + else if (!binary_char(c) && c < 64) + SNPRINTF1(buf, sizeof(buf), "^%c", + /* + * This array roughly inverts CONTROL() #defined in less.h, + * and should be kept in sync with CONTROL() and IBM-1047. + */ + "@ABC.I.?...KLMNO" + "PQRS.JH.XY.." + "\\]^_" + "......W[.....EFG" + "..V....D....TU.Z"[c]); #else - else if (c < 128 && !control_char(c ^ 0100)) - SNPRINTF1(buf, sizeof(buf), "^%c", (int) (c ^ 0100)); + else if (c < 128 && !control_char(c ^ 0100)) + SNPRINTF1(buf, sizeof(buf), "^%c", (int) (c ^ 0100)); #endif - else - SNPRINTF1(buf, sizeof(buf), binfmt, c); - return (buf); + else + SNPRINTF1(buf, sizeof(buf), binfmt, c); + return (buf); } /* * Return the printable form of a UTF-8 character. */ - public char * + public char * prutfchar(ch) - LWCHAR ch; + LWCHAR ch; { - static char buf[MAX_PRCHAR_LEN+1]; - - if (ch == ESC) - strcpy(buf, "ESC"); - else if (ch < 128 && control_char(ch)) - { - if (!control_char(ch ^ 0100)) - SNPRINTF1(buf, sizeof(buf), "^%c", ((char) ch) ^ 0100); - else - SNPRINTF1(buf, sizeof(buf), binfmt, (char) ch); - } else if (is_ubin_char(ch)) - { - SNPRINTF1(buf, sizeof(buf), utfbinfmt, ch); - } else - { - char *p = buf; - if (ch >= 0x80000000) - ch = 0xFFFD; /* REPLACEMENT CHARACTER */ - put_wchar(&p, ch); - *p = '\0'; - } - return (buf); + static char buf[MAX_PRCHAR_LEN+1]; + + if (ch == ESC) + strcpy(buf, "ESC"); + else if (ch < 128 && control_char(ch)) + { + if (!control_char(ch ^ 0100)) + SNPRINTF1(buf, sizeof(buf), "^%c", ((char) ch) ^ 0100); + else + SNPRINTF1(buf, sizeof(buf), binfmt, (char) ch); + } else if (is_ubin_char(ch)) + { + SNPRINTF1(buf, sizeof(buf), utfbinfmt, ch); + } else + { + char *p = buf; + if (ch >= 0x80000000) + ch = 0xFFFD; /* REPLACEMENT CHARACTER */ + put_wchar(&p, ch); + *p = '\0'; + } + return (buf); } /* * Get the length of a UTF-8 character in bytes. */ - public int + public int utf_len(ch) - int ch; + int ch; { - if ((ch & 0x80) == 0) - return 1; - if ((ch & 0xE0) == 0xC0) - return 2; - if ((ch & 0xF0) == 0xE0) - return 3; - if ((ch & 0xF8) == 0xF0) - return 4; - if ((ch & 0xFC) == 0xF8) - return 5; - if ((ch & 0xFE) == 0xFC) - return 6; - /* Invalid UTF-8 encoding. */ - return 1; + if ((ch & 0x80) == 0) + return 1; + if ((ch & 0xE0) == 0xC0) + return 2; + if ((ch & 0xF0) == 0xE0) + return 3; + if ((ch & 0xF8) == 0xF0) + return 4; + if ((ch & 0xFC) == 0xF8) + return 5; + if ((ch & 0xFE) == 0xFC) + return 6; + /* Invalid UTF-8 encoding. */ + return 1; } /* * Does the parameter point to the lead byte of a well-formed UTF-8 character? */ - public int + public int is_utf8_well_formed(ss, slen) - char *ss; - int slen; + char *ss; + int slen; { - int i; - int len; - unsigned char *s = (unsigned char *) ss; - - if (IS_UTF8_INVALID(s[0])) - return (0); - - len = utf_len(s[0]); - if (len > slen) - return (0); - if (len == 1) - return (1); - if (len == 2) - { - if (s[0] < 0xC2) - return (0); - } else - { - unsigned char mask; - mask = (~((1 << (8-len)) - 1)) & 0xFF; - if (s[0] == mask && (s[1] & mask) == 0x80) - return (0); - } - - for (i = 1; i < len; i++) - if (!IS_UTF8_TRAIL(s[i])) - return (0); - return (1); + int i; + int len; + unsigned char *s = (unsigned char *) ss; + + if (IS_UTF8_INVALID(s[0])) + return (0); + + len = utf_len(s[0]); + if (len > slen) + return (0); + if (len == 1) + return (1); + if (len == 2) + { + if (s[0] < 0xC2) + return (0); + } else + { + unsigned char mask; + mask = (~((1 << (8-len)) - 1)) & 0xFF; + if (s[0] == mask && (s[1] & mask) == 0x80) + return (0); + } + + for (i = 1; i < len; i++) + if (!IS_UTF8_TRAIL(s[i])) + return (0); + return (1); } /* * Skip bytes until a UTF-8 lead byte (11xxxxxx) or ASCII byte (0xxxxxxx) is found. */ - public void + public void utf_skip_to_lead(pp, limit) - char **pp; - char *limit; + char **pp; + char *limit; { - do { - ++(*pp); - } while (*pp < limit && !IS_UTF8_LEAD((*pp)[0] & 0377) && !IS_ASCII_OCTET((*pp)[0])); + do { + ++(*pp); + } while (*pp < limit && !IS_UTF8_LEAD((*pp)[0] & 0377) && !IS_ASCII_OCTET((*pp)[0])); } /* * Get the value of a UTF-8 character. */ - public LWCHAR + public LWCHAR get_wchar(p) - constant char *p; + constant char *p; { - switch (utf_len(p[0])) - { - case 1: - default: - /* 0xxxxxxx */ - return (LWCHAR) - (p[0] & 0xFF); - case 2: - /* 110xxxxx 10xxxxxx */ - return (LWCHAR) ( - ((p[0] & 0x1F) << 6) | - (p[1] & 0x3F)); - case 3: - /* 1110xxxx 10xxxxxx 10xxxxxx */ - return (LWCHAR) ( - ((p[0] & 0x0F) << 12) | - ((p[1] & 0x3F) << 6) | - (p[2] & 0x3F)); - case 4: - /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ - return (LWCHAR) ( - ((p[0] & 0x07) << 18) | - ((p[1] & 0x3F) << 12) | - ((p[2] & 0x3F) << 6) | - (p[3] & 0x3F)); - case 5: - /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ - return (LWCHAR) ( - ((p[0] & 0x03) << 24) | - ((p[1] & 0x3F) << 18) | - ((p[2] & 0x3F) << 12) | - ((p[3] & 0x3F) << 6) | - (p[4] & 0x3F)); - case 6: - /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ - return (LWCHAR) ( - ((p[0] & 0x01) << 30) | - ((p[1] & 0x3F) << 24) | - ((p[2] & 0x3F) << 18) | - ((p[3] & 0x3F) << 12) | - ((p[4] & 0x3F) << 6) | - (p[5] & 0x3F)); - } + switch (utf_len(p[0])) + { + case 1: + default: + /* 0xxxxxxx */ + return (LWCHAR) + (p[0] & 0xFF); + case 2: + /* 110xxxxx 10xxxxxx */ + return (LWCHAR) ( + ((p[0] & 0x1F) << 6) | + (p[1] & 0x3F)); + case 3: + /* 1110xxxx 10xxxxxx 10xxxxxx */ + return (LWCHAR) ( + ((p[0] & 0x0F) << 12) | + ((p[1] & 0x3F) << 6) | + (p[2] & 0x3F)); + case 4: + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + return (LWCHAR) ( + ((p[0] & 0x07) << 18) | + ((p[1] & 0x3F) << 12) | + ((p[2] & 0x3F) << 6) | + (p[3] & 0x3F)); + case 5: + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + return (LWCHAR) ( + ((p[0] & 0x03) << 24) | + ((p[1] & 0x3F) << 18) | + ((p[2] & 0x3F) << 12) | + ((p[3] & 0x3F) << 6) | + (p[4] & 0x3F)); + case 6: + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + return (LWCHAR) ( + ((p[0] & 0x01) << 30) | + ((p[1] & 0x3F) << 24) | + ((p[2] & 0x3F) << 18) | + ((p[3] & 0x3F) << 12) | + ((p[4] & 0x3F) << 6) | + (p[5] & 0x3F)); + } } /* * Store a character into a UTF-8 string. */ - public void + public void put_wchar(pp, ch) - char **pp; - LWCHAR ch; + char **pp; + LWCHAR ch; { - if (!utf_mode || ch < 0x80) - { - /* 0xxxxxxx */ - *(*pp)++ = (char) ch; - } else if (ch < 0x800) - { - /* 110xxxxx 10xxxxxx */ - *(*pp)++ = (char) (0xC0 | ((ch >> 6) & 0x1F)); - *(*pp)++ = (char) (0x80 | (ch & 0x3F)); - } else if (ch < 0x10000) - { - /* 1110xxxx 10xxxxxx 10xxxxxx */ - *(*pp)++ = (char) (0xE0 | ((ch >> 12) & 0x0F)); - *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); - *(*pp)++ = (char) (0x80 | (ch & 0x3F)); - } else if (ch < 0x200000) - { - /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ - *(*pp)++ = (char) (0xF0 | ((ch >> 18) & 0x07)); - *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); - *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); - *(*pp)++ = (char) (0x80 | (ch & 0x3F)); - } else if (ch < 0x4000000) - { - /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ - *(*pp)++ = (char) (0xF0 | ((ch >> 24) & 0x03)); - *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); - *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); - *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); - *(*pp)++ = (char) (0x80 | (ch & 0x3F)); - } else - { - /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ - *(*pp)++ = (char) (0xF0 | ((ch >> 30) & 0x01)); - *(*pp)++ = (char) (0x80 | ((ch >> 24) & 0x3F)); - *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); - *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); - *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); - *(*pp)++ = (char) (0x80 | (ch & 0x3F)); - } + if (!utf_mode || ch < 0x80) + { + /* 0xxxxxxx */ + *(*pp)++ = (char) ch; + } else if (ch < 0x800) + { + /* 110xxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xC0 | ((ch >> 6) & 0x1F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x10000) + { + /* 1110xxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xE0 | ((ch >> 12) & 0x0F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x200000) + { + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 18) & 0x07)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x4000000) + { + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 24) & 0x03)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else + { + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 30) & 0x01)); + *(*pp)++ = (char) (0x80 | ((ch >> 24) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } } /* * Step forward or backward one character in a string. */ - public LWCHAR + public LWCHAR step_char(pp, dir, limit) - char **pp; - signed int dir; - constant char *limit; + char **pp; + signed int dir; + constant char *limit; { - LWCHAR ch; - int len; - char *p = *pp; - - if (!utf_mode) - { - /* It's easy if chars are one byte. */ - if (dir > 0) - ch = (LWCHAR) (unsigned char) ((p < limit) ? *p++ : 0); - else - ch = (LWCHAR) (unsigned char) ((p > limit) ? *--p : 0); - } else if (dir > 0) - { - len = utf_len(*p); - if (p + len > limit) - { - ch = 0; - p = (char *) limit; - } else - { - ch = get_wchar(p); - p += len; - } - } else - { - while (p > limit && IS_UTF8_TRAIL(p[-1])) - p--; - if (p > limit) - ch = get_wchar(--p); - else - ch = 0; - } - *pp = p; - return ch; + LWCHAR ch; + int len; + char *p = *pp; + + if (!utf_mode) + { + /* It's easy if chars are one byte. */ + if (dir > 0) + ch = (LWCHAR) (unsigned char) ((p < limit) ? *p++ : 0); + else + ch = (LWCHAR) (unsigned char) ((p > limit) ? *--p : 0); + } else if (dir > 0) + { + len = utf_len(*p); + if (p + len > limit) + { + ch = 0; + p = (char *) limit; + } else + { + ch = get_wchar(p); + p += len; + } + } else + { + while (p > limit && IS_UTF8_TRAIL(p[-1])) + p--; + if (p > limit) + ch = get_wchar(--p); + else + ch = 0; + } + *pp = p; + return ch; } /* @@ -732,9 +732,9 @@ step_char(pp, dir, limit) */ #define DECLARE_RANGE_TABLE_START(name) \ - static struct wchar_range name##_array[] = { + static struct wchar_range name##_array[] = { #define DECLARE_RANGE_TABLE_END(name) \ - }; struct wchar_range_table name##_table = { name##_array, sizeof(name##_array)/sizeof(*name##_array) }; + }; struct wchar_range_table name##_table = { name##_array, sizeof(name##_array)/sizeof(*name##_array) }; DECLARE_RANGE_TABLE_START(compose) #include "compose.uni" @@ -754,68 +754,68 @@ DECLARE_RANGE_TABLE_END(fmt) /* comb_table is special pairs, not ranges. */ static struct wchar_range comb_table[] = { - {0x0644,0x0622}, {0x0644,0x0623}, {0x0644,0x0625}, {0x0644,0x0627}, + {0x0644,0x0622}, {0x0644,0x0623}, {0x0644,0x0625}, {0x0644,0x0627}, }; - static int + static int is_in_table(ch, table) - LWCHAR ch; - struct wchar_range_table *table; + LWCHAR ch; + struct wchar_range_table *table; { - int hi; - int lo; - - /* Binary search in the table. */ - if (ch < table->table[0].first) - return 0; - lo = 0; - hi = table->count - 1; - while (lo <= hi) - { - int mid = (lo + hi) / 2; - if (ch > table->table[mid].last) - lo = mid + 1; - else if (ch < table->table[mid].first) - hi = mid - 1; - else - return 1; - } - return 0; + int hi; + int lo; + + /* Binary search in the table. */ + if (ch < table->table[0].first) + return 0; + lo = 0; + hi = table->count - 1; + while (lo <= hi) + { + int mid = (lo + hi) / 2; + if (ch > table->table[mid].last) + lo = mid + 1; + else if (ch < table->table[mid].first) + hi = mid - 1; + else + return 1; + } + return 0; } /* * Is a character a UTF-8 composing character? * If a composing character follows any char, the two combine into one glyph. */ - public int + public int is_composing_char(ch) - LWCHAR ch; + LWCHAR ch; { - return is_in_table(ch, &compose_table) || - (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table)); + return is_in_table(ch, &compose_table) || + (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table)); } /* * Should this UTF-8 character be treated as binary? */ - public int + public int is_ubin_char(ch) - LWCHAR ch; + LWCHAR ch; { - int ubin = is_in_table(ch, &ubin_table) || - (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table)); - return ubin; + int ubin = is_in_table(ch, &ubin_table) || + (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table)); + return ubin; } /* * Is this a double width UTF-8 character? */ - public int + public int is_wide_char(ch) - LWCHAR ch; + LWCHAR ch; { - return is_in_table(ch, &wide_table); + return is_in_table(ch, &wide_table); } /* @@ -823,19 +823,18 @@ is_wide_char(ch) * A combining char acts like an ordinary char, but if it follows * a specific char (not any char), the two combine into one glyph. */ - public int + public int is_combining_char(ch1, ch2) - LWCHAR ch1; - LWCHAR ch2; + LWCHAR ch1; + LWCHAR ch2; { - /* The table is small; use linear search. */ - int i; - for (i = 0; i < sizeof(comb_table)/sizeof(*comb_table); i++) - { - if (ch1 == comb_table[i].first && - ch2 == comb_table[i].last) - return 1; - } - return 0; + /* The table is small; use linear search. */ + int i; + for (i = 0; i < sizeof(comb_table)/sizeof(*comb_table); i++) + { + if (ch1 == comb_table[i].first && + ch2 == comb_table[i].last) + return 1; + } + return 0; } - diff --git a/cmdbuf.c b/cmdbuf.c index 5b57046..c167c02 100644 --- a/cmdbuf.c +++ b/cmdbuf.c @@ -68,27 +68,27 @@ public char closequote = '"'; */ struct mlist { - struct mlist *next; - struct mlist *prev; - struct mlist *curr_mp; - char *string; - int modified; + struct mlist *next; + struct mlist *prev; + struct mlist *curr_mp; + char *string; + int modified; }; /* * These are the various command histories that exist. */ -struct mlist mlist_search = - { &mlist_search, &mlist_search, &mlist_search, NULL, 0 }; +struct mlist mlist_search = + { &mlist_search, &mlist_search, &mlist_search, NULL, 0 }; public void *ml_search = (void *) &mlist_search; -struct mlist mlist_examine = - { &mlist_examine, &mlist_examine, &mlist_examine, NULL, 0 }; +struct mlist mlist_examine = + { &mlist_examine, &mlist_examine, &mlist_examine, NULL, 0 }; public void *ml_examine = (void *) &mlist_examine; #if SHELL_ESCAPE || PIPEC -struct mlist mlist_shell = - { &mlist_shell, &mlist_shell, &mlist_shell, NULL, 0 }; +struct mlist mlist_shell = + { &mlist_shell, &mlist_shell, &mlist_shell, NULL, 0 }; public void *ml_shell = (void *) &mlist_shell; #endif @@ -117,74 +117,74 @@ static int cmd_mbc_buf_index; /* * Reset command buffer (to empty). */ - public void + public void cmd_reset(VOID_PARAM) { - cp = cmdbuf; - *cp = '\0'; - cmd_col = 0; - cmd_offset = 0; - literal = 0; - cmd_mbc_buf_len = 0; - updown_match = -1; + cp = cmdbuf; + *cp = '\0'; + cmd_col = 0; + cmd_offset = 0; + literal = 0; + cmd_mbc_buf_len = 0; + updown_match = -1; } /* * Clear command line. */ - public void + public void clear_cmd(VOID_PARAM) { - cmd_col = prompt_col = 0; - cmd_mbc_buf_len = 0; - updown_match = -1; + cmd_col = prompt_col = 0; + cmd_mbc_buf_len = 0; + updown_match = -1; } /* * Display a string, usually as a prompt for input into the command buffer. */ - public void + public void cmd_putstr(s) - constant char *s; + constant char *s; { - LWCHAR prev_ch = 0; - LWCHAR ch; - constant char *endline = s + strlen(s); - while (*s != '\0') - { - char *ns = (char *) s; - int width; - ch = step_char(&ns, +1, endline); - while (s < ns) - putchr(*s++); - if (!utf_mode) - width = 1; - else if (is_composing_char(ch) || is_combining_char(prev_ch, ch)) - width = 0; - else - width = is_wide_char(ch) ? 2 : 1; - cmd_col += width; - prompt_col += width; - prev_ch = ch; - } + LWCHAR prev_ch = 0; + LWCHAR ch; + constant char *endline = s + strlen(s); + while (*s != '\0') + { + char *ns = (char *) s; + int width; + ch = step_char(&ns, +1, endline); + while (s < ns) + putchr(*s++); + if (!utf_mode) + width = 1; + else if (is_composing_char(ch) || is_combining_char(prev_ch, ch)) + width = 0; + else + width = is_wide_char(ch) ? 2 : 1; + cmd_col += width; + prompt_col += width; + prev_ch = ch; + } } /* * How many characters are in the command buffer? */ - public int + public int len_cmdbuf(VOID_PARAM) { - char *s = cmdbuf; - char *endline = s + strlen(s); - int len = 0; - - while (*s != '\0') - { - step_char(&s, +1, endline); - len++; - } - return (len); + char *s = cmdbuf; + char *endline = s + strlen(s); + int len = 0; + + while (*s != '\0') + { + step_char(&s, +1, endline); + len++; + } + return (len); } /* @@ -192,472 +192,472 @@ len_cmdbuf(VOID_PARAM) * {{ Returning pwidth and bswidth separately is a historical artifact * since they're always the same. Maybe clean this up someday. }} */ - static char * + static char * cmd_step_common(p, ch, len, pwidth, bswidth) - char *p; - LWCHAR ch; - int len; - int *pwidth; - int *bswidth; + char *p; + LWCHAR ch; + int len; + int *pwidth; + int *bswidth; { - char *pr; - int width; - - if (len == 1) - { - pr = prchar((int) ch); - width = (int) strlen(pr); - } else - { - pr = prutfchar(ch); - if (is_composing_char(ch)) - width = 0; - else if (is_ubin_char(ch)) - width = (int) strlen(pr); - else - { - LWCHAR prev_ch = step_char(&p, -1, cmdbuf); - if (is_combining_char(prev_ch, ch)) - width = 0; - else - width = is_wide_char(ch) ? 2 : 1; - } - } - if (pwidth != NULL) - *pwidth = width; - if (bswidth != NULL) - *bswidth = width; - return (pr); + char *pr; + int width; + + if (len == 1) + { + pr = prchar((int) ch); + width = (int) strlen(pr); + } else + { + pr = prutfchar(ch); + if (is_composing_char(ch)) + width = 0; + else if (is_ubin_char(ch)) + width = (int) strlen(pr); + else + { + LWCHAR prev_ch = step_char(&p, -1, cmdbuf); + if (is_combining_char(prev_ch, ch)) + width = 0; + else + width = is_wide_char(ch) ? 2 : 1; + } + } + if (pwidth != NULL) + *pwidth = width; + if (bswidth != NULL) + *bswidth = width; + return (pr); } /* * Step a pointer one character right in the command buffer. */ - static char * + static char * cmd_step_right(pp, pwidth, bswidth) - char **pp; - int *pwidth; - int *bswidth; + char **pp; + int *pwidth; + int *bswidth; { - char *p = *pp; - LWCHAR ch = step_char(pp, +1, p + strlen(p)); + char *p = *pp; + LWCHAR ch = step_char(pp, +1, p + strlen(p)); - return cmd_step_common(p, ch, *pp - p, pwidth, bswidth); + return cmd_step_common(p, ch, *pp - p, pwidth, bswidth); } /* * Step a pointer one character left in the command buffer. */ - static char * + static char * cmd_step_left(pp, pwidth, bswidth) - char **pp; - int *pwidth; - int *bswidth; + char **pp; + int *pwidth; + int *bswidth; { - char *p = *pp; - LWCHAR ch = step_char(pp, -1, cmdbuf); + char *p = *pp; + LWCHAR ch = step_char(pp, -1, cmdbuf); - return cmd_step_common(*pp, ch, p - *pp, pwidth, bswidth); + return cmd_step_common(*pp, ch, p - *pp, pwidth, bswidth); } /* * Put the cursor at "home" (just after the prompt), * and set cp to the corresponding char in cmdbuf. */ - static void + static void cmd_home(VOID_PARAM) { - while (cmd_col > prompt_col) - { - int width, bswidth; + while (cmd_col > prompt_col) + { + int width, bswidth; - cmd_step_left(&cp, &width, &bswidth); - while (bswidth-- > 0) - putbs(); - cmd_col -= width; - } + cmd_step_left(&cp, &width, &bswidth); + while (bswidth-- > 0) + putbs(); + cmd_col -= width; + } - cp = &cmdbuf[cmd_offset]; + cp = &cmdbuf[cmd_offset]; } /* * Repaint the line from cp onwards. * Then position the cursor just after the char old_cp (a pointer into cmdbuf). */ - public void + public void cmd_repaint(old_cp) - constant char *old_cp; + constant char *old_cp; { - /* - * Repaint the line from the current position. - */ - if (old_cp == NULL) - { - old_cp = cp; - cmd_home(); - } - clear_eol(); - while (*cp != '\0') - { - char *np = cp; - int width; - char *pr = cmd_step_right(&np, &width, NULL); - if (cmd_col + width >= sc_width) - break; - cp = np; - putstr(pr); - cmd_col += width; - } - while (*cp != '\0') - { - char *np = cp; - int width; - char *pr = cmd_step_right(&np, &width, NULL); - if (width > 0) - break; - cp = np; - putstr(pr); - } - - /* - * Back up the cursor to the correct position. - */ - while (cp > old_cp) - cmd_left(); + /* + * Repaint the line from the current position. + */ + if (old_cp == NULL) + { + old_cp = cp; + cmd_home(); + } + clear_eol(); + while (*cp != '\0') + { + char *np = cp; + int width; + char *pr = cmd_step_right(&np, &width, NULL); + if (cmd_col + width >= sc_width) + break; + cp = np; + putstr(pr); + cmd_col += width; + } + while (*cp != '\0') + { + char *np = cp; + int width; + char *pr = cmd_step_right(&np, &width, NULL); + if (width > 0) + break; + cp = np; + putstr(pr); + } + + /* + * Back up the cursor to the correct position. + */ + while (cp > old_cp) + cmd_left(); } /* * Shift the cmdbuf display left a half-screen. */ - static void + static void cmd_lshift(VOID_PARAM) { - char *s; - char *save_cp; - int cols; - - /* - * Start at the first displayed char, count how far to the - * right we'd have to move to reach the center of the screen. - */ - s = cmdbuf + cmd_offset; - cols = 0; - while (cols < (sc_width - prompt_col) / 2 && *s != '\0') - { - int width; - cmd_step_right(&s, &width, NULL); - cols += width; - } - while (*s != '\0') - { - int width; - char *ns = s; - cmd_step_right(&ns, &width, NULL); - if (width > 0) - break; - s = ns; - } - - cmd_offset = (int) (s - cmdbuf); - save_cp = cp; - cmd_home(); - cmd_repaint(save_cp); + char *s; + char *save_cp; + int cols; + + /* + * Start at the first displayed char, count how far to the + * right we'd have to move to reach the center of the screen. + */ + s = cmdbuf + cmd_offset; + cols = 0; + while (cols < (sc_width - prompt_col) / 2 && *s != '\0') + { + int width; + cmd_step_right(&s, &width, NULL); + cols += width; + } + while (*s != '\0') + { + int width; + char *ns = s; + cmd_step_right(&ns, &width, NULL); + if (width > 0) + break; + s = ns; + } + + cmd_offset = (int) (s - cmdbuf); + save_cp = cp; + cmd_home(); + cmd_repaint(save_cp); } /* * Shift the cmdbuf display right a half-screen. */ - static void + static void cmd_rshift(VOID_PARAM) { - char *s; - char *save_cp; - int cols; - - /* - * Start at the first displayed char, count how far to the - * left we'd have to move to traverse a half-screen width - * of displayed characters. - */ - s = cmdbuf + cmd_offset; - cols = 0; - while (cols < (sc_width - prompt_col) / 2 && s > cmdbuf) - { - int width; - cmd_step_left(&s, &width, NULL); - cols += width; - } - - cmd_offset = (int) (s - cmdbuf); - save_cp = cp; - cmd_home(); - cmd_repaint(save_cp); + char *s; + char *save_cp; + int cols; + + /* + * Start at the first displayed char, count how far to the + * left we'd have to move to traverse a half-screen width + * of displayed characters. + */ + s = cmdbuf + cmd_offset; + cols = 0; + while (cols < (sc_width - prompt_col) / 2 && s > cmdbuf) + { + int width; + cmd_step_left(&s, &width, NULL); + cols += width; + } + + cmd_offset = (int) (s - cmdbuf); + save_cp = cp; + cmd_home(); + cmd_repaint(save_cp); } /* * Move cursor right one character. */ - static int + static int cmd_right(VOID_PARAM) { - char *pr; - char *ncp; - int width; - - if (*cp == '\0') - { - /* Already at the end of the line. */ - return (CC_OK); - } - ncp = cp; - pr = cmd_step_right(&ncp, &width, NULL); - if (cmd_col + width >= sc_width) - cmd_lshift(); - else if (cmd_col + width == sc_width - 1 && cp[1] != '\0') - cmd_lshift(); - cp = ncp; - cmd_col += width; - putstr(pr); - while (*cp != '\0') - { - pr = cmd_step_right(&ncp, &width, NULL); - if (width > 0) - break; - putstr(pr); - cp = ncp; - } - return (CC_OK); + char *pr; + char *ncp; + int width; + + if (*cp == '\0') + { + /* Already at the end of the line. */ + return (CC_OK); + } + ncp = cp; + pr = cmd_step_right(&ncp, &width, NULL); + if (cmd_col + width >= sc_width) + cmd_lshift(); + else if (cmd_col + width == sc_width - 1 && cp[1] != '\0') + cmd_lshift(); + cp = ncp; + cmd_col += width; + putstr(pr); + while (*cp != '\0') + { + pr = cmd_step_right(&ncp, &width, NULL); + if (width > 0) + break; + putstr(pr); + cp = ncp; + } + return (CC_OK); } /* * Move cursor left one character. */ - static int + static int cmd_left(VOID_PARAM) { - char *ncp; - int width = 0; - int bswidth = 0; - - if (cp <= cmdbuf) - { - /* Already at the beginning of the line */ - return (CC_OK); - } - ncp = cp; - while (ncp > cmdbuf) - { - cmd_step_left(&ncp, &width, &bswidth); - if (width > 0) - break; - } - if (cmd_col < prompt_col + width) - cmd_rshift(); - cp = ncp; - cmd_col -= width; - while (bswidth-- > 0) - putbs(); - return (CC_OK); + char *ncp; + int width = 0; + int bswidth = 0; + + if (cp <= cmdbuf) + { + /* Already at the beginning of the line */ + return (CC_OK); + } + ncp = cp; + while (ncp > cmdbuf) + { + cmd_step_left(&ncp, &width, &bswidth); + if (width > 0) + break; + } + if (cmd_col < prompt_col + width) + cmd_rshift(); + cp = ncp; + cmd_col -= width; + while (bswidth-- > 0) + putbs(); + return (CC_OK); } /* * Insert a char into the command buffer, at the current position. */ - static int + static int cmd_ichar(cs, clen) - char *cs; - int clen; + char *cs; + int clen; { - char *s; - - if (strlen(cmdbuf) + clen >= sizeof(cmdbuf)-1) - { - /* No room in the command buffer for another char. */ - bell(); - return (CC_ERROR); - } - - /* - * Make room for the new character (shift the tail of the buffer right). - */ - for (s = &cmdbuf[strlen(cmdbuf)]; s >= cp; s--) - s[clen] = s[0]; - /* - * Insert the character into the buffer. - */ - for (s = cp; s < cp + clen; s++) - *s = *cs++; - /* - * Reprint the tail of the line from the inserted char. - */ - updown_match = -1; - cmd_repaint(cp); - cmd_right(); - return (CC_OK); + char *s; + + if (strlen(cmdbuf) + clen >= sizeof(cmdbuf)-1) + { + /* No room in the command buffer for another char. */ + bell(); + return (CC_ERROR); + } + + /* + * Make room for the new character (shift the tail of the buffer right). + */ + for (s = &cmdbuf[strlen(cmdbuf)]; s >= cp; s--) + s[clen] = s[0]; + /* + * Insert the character into the buffer. + */ + for (s = cp; s < cp + clen; s++) + *s = *cs++; + /* + * Reprint the tail of the line from the inserted char. + */ + updown_match = -1; + cmd_repaint(cp); + cmd_right(); + return (CC_OK); } /* * Backspace in the command buffer. * Delete the char to the left of the cursor. */ - static int + static int cmd_erase(VOID_PARAM) { - char *s; - int clen; - - if (cp == cmdbuf) - { - /* - * Backspace past beginning of the buffer: - * this usually means abort the command. - */ - return (CC_QUIT); - } - /* - * Move cursor left (to the char being erased). - */ - s = cp; - cmd_left(); - clen = (int) (s - cp); - - /* - * Remove the char from the buffer (shift the buffer left). - */ - for (s = cp; ; s++) - { - s[0] = s[clen]; - if (s[0] == '\0') - break; - } - - /* - * Repaint the buffer after the erased char. - */ - updown_match = -1; - cmd_repaint(cp); - - /* - * We say that erasing the entire command string causes us - * to abort the current command, if CF_QUIT_ON_ERASE is set. - */ - if ((curr_cmdflags & CF_QUIT_ON_ERASE) && cp == cmdbuf && *cp == '\0') - return (CC_QUIT); - return (CC_OK); + char *s; + int clen; + + if (cp == cmdbuf) + { + /* + * Backspace past beginning of the buffer: + * this usually means abort the command. + */ + return (CC_QUIT); + } + /* + * Move cursor left (to the char being erased). + */ + s = cp; + cmd_left(); + clen = (int) (s - cp); + + /* + * Remove the char from the buffer (shift the buffer left). + */ + for (s = cp; ; s++) + { + s[0] = s[clen]; + if (s[0] == '\0') + break; + } + + /* + * Repaint the buffer after the erased char. + */ + updown_match = -1; + cmd_repaint(cp); + + /* + * We say that erasing the entire command string causes us + * to abort the current command, if CF_QUIT_ON_ERASE is set. + */ + if ((curr_cmdflags & CF_QUIT_ON_ERASE) && cp == cmdbuf && *cp == '\0') + return (CC_QUIT); + return (CC_OK); } /* * Delete the char under the cursor. */ - static int + static int cmd_delete(VOID_PARAM) { - if (*cp == '\0') - { - /* At end of string; there is no char under the cursor. */ - return (CC_OK); - } - /* - * Move right, then use cmd_erase. - */ - cmd_right(); - cmd_erase(); - return (CC_OK); + if (*cp == '\0') + { + /* At end of string; there is no char under the cursor. */ + return (CC_OK); + } + /* + * Move right, then use cmd_erase. + */ + cmd_right(); + cmd_erase(); + return (CC_OK); } /* * Delete the "word" to the left of the cursor. */ - static int + static int cmd_werase(VOID_PARAM) { - if (cp > cmdbuf && cp[-1] == ' ') - { - /* - * If the char left of cursor is a space, - * erase all the spaces left of cursor (to the first non-space). - */ - while (cp > cmdbuf && cp[-1] == ' ') - (void) cmd_erase(); - } else - { - /* - * If the char left of cursor is not a space, - * erase all the nonspaces left of cursor (the whole "word"). - */ - while (cp > cmdbuf && cp[-1] != ' ') - (void) cmd_erase(); - } - return (CC_OK); + if (cp > cmdbuf && cp[-1] == ' ') + { + /* + * If the char left of cursor is a space, + * erase all the spaces left of cursor (to the first non-space). + */ + while (cp > cmdbuf && cp[-1] == ' ') + (void) cmd_erase(); + } else + { + /* + * If the char left of cursor is not a space, + * erase all the nonspaces left of cursor (the whole "word"). + */ + while (cp > cmdbuf && cp[-1] != ' ') + (void) cmd_erase(); + } + return (CC_OK); } /* * Delete the "word" under the cursor. */ - static int + static int cmd_wdelete(VOID_PARAM) { - if (*cp == ' ') - { - /* - * If the char under the cursor is a space, - * delete it and all the spaces right of cursor. - */ - while (*cp == ' ') - (void) cmd_delete(); - } else - { - /* - * If the char under the cursor is not a space, - * delete it and all nonspaces right of cursor (the whole word). - */ - while (*cp != ' ' && *cp != '\0') - (void) cmd_delete(); - } - return (CC_OK); + if (*cp == ' ') + { + /* + * If the char under the cursor is a space, + * delete it and all the spaces right of cursor. + */ + while (*cp == ' ') + (void) cmd_delete(); + } else + { + /* + * If the char under the cursor is not a space, + * delete it and all nonspaces right of cursor (the whole word). + */ + while (*cp != ' ' && *cp != '\0') + (void) cmd_delete(); + } + return (CC_OK); } /* * Delete all chars in the command buffer. */ - static int + static int cmd_kill(VOID_PARAM) { - if (cmdbuf[0] == '\0') - { - /* Buffer is already empty; abort the current command. */ - return (CC_QUIT); - } - cmd_offset = 0; - cmd_home(); - *cp = '\0'; - updown_match = -1; - cmd_repaint(cp); - - /* - * We say that erasing the entire command string causes us - * to abort the current command, if CF_QUIT_ON_ERASE is set. - */ - if (curr_cmdflags & CF_QUIT_ON_ERASE) - return (CC_QUIT); - return (CC_OK); + if (cmdbuf[0] == '\0') + { + /* Buffer is already empty; abort the current command. */ + return (CC_QUIT); + } + cmd_offset = 0; + cmd_home(); + *cp = '\0'; + updown_match = -1; + cmd_repaint(cp); + + /* + * We say that erasing the entire command string causes us + * to abort the current command, if CF_QUIT_ON_ERASE is set. + */ + if (curr_cmdflags & CF_QUIT_ON_ERASE) + return (CC_QUIT); + return (CC_OK); } /* * Select an mlist structure to be the current command history. */ - public void + public void set_mlist(mlist, cmdflags) - void *mlist; - int cmdflags; + void *mlist; + int cmdflags; { #if CMD_HISTORY - curr_mlist = (struct mlist *) mlist; - curr_cmdflags = cmdflags; + curr_mlist = (struct mlist *) mlist; + curr_cmdflags = cmdflags; - /* Make sure the next up-arrow moves to the last string in the mlist. */ - if (curr_mlist != NULL) - curr_mlist->curr_mp = curr_mlist; + /* Make sure the next up-arrow moves to the last string in the mlist. */ + if (curr_mlist != NULL) + curr_mlist->curr_mp = curr_mlist; #endif } @@ -667,146 +667,146 @@ set_mlist(mlist, cmdflags) * Only consider entries whose first updown_match chars are equal to * cmdbuf's corresponding chars. */ - static int + static int cmd_updown(action) - int action; + int action; { - constant char *s; - struct mlist *ml; - - if (curr_mlist == NULL) - { - /* - * The current command has no history list. - */ - bell(); - return (CC_OK); - } - - if (updown_match < 0) - { - updown_match = (int) (cp - cmdbuf); - } - - /* - * Find the next history entry which matches. - */ - for (ml = curr_mlist->curr_mp;;) - { - ml = (action == EC_UP) ? ml->prev : ml->next; - if (ml == curr_mlist) - { - /* - * We reached the end (or beginning) of the list. - */ - break; - } - if (strncmp(cmdbuf, ml->string, updown_match) == 0) - { - /* - * This entry matches; stop here. - * Copy the entry into cmdbuf and echo it on the screen. - */ - curr_mlist->curr_mp = ml; - s = ml->string; - if (s == NULL) - s = ""; - cmd_offset = 0; - cmd_home(); - clear_eol(); - strcpy(cmdbuf, s); - for (cp = cmdbuf; *cp != '\0'; ) - cmd_right(); - return (CC_OK); - } - } - /* - * We didn't find a history entry that matches. - */ - bell(); - return (CC_OK); + constant char *s; + struct mlist *ml; + + if (curr_mlist == NULL) + { + /* + * The current command has no history list. + */ + bell(); + return (CC_OK); + } + + if (updown_match < 0) + { + updown_match = (int) (cp - cmdbuf); + } + + /* + * Find the next history entry which matches. + */ + for (ml = curr_mlist->curr_mp;;) + { + ml = (action == EC_UP) ? ml->prev : ml->next; + if (ml == curr_mlist) + { + /* + * We reached the end (or beginning) of the list. + */ + break; + } + if (strncmp(cmdbuf, ml->string, updown_match) == 0) + { + /* + * This entry matches; stop here. + * Copy the entry into cmdbuf and echo it on the screen. + */ + curr_mlist->curr_mp = ml; + s = ml->string; + if (s == NULL) + s = ""; + cmd_offset = 0; + cmd_home(); + clear_eol(); + strcpy(cmdbuf, s); + for (cp = cmdbuf; *cp != '\0'; ) + cmd_right(); + return (CC_OK); + } + } + /* + * We didn't find a history entry that matches. + */ + bell(); + return (CC_OK); } #endif /* * */ - static void + static void ml_link(mlist, ml) - struct mlist *mlist; - struct mlist *ml; + struct mlist *mlist; + struct mlist *ml; { - ml->next = mlist; - ml->prev = mlist->prev; - mlist->prev->next = ml; - mlist->prev = ml; + ml->next = mlist; + ml->prev = mlist->prev; + mlist->prev->next = ml; + mlist->prev = ml; } /* * */ - static void + static void ml_unlink(ml) - struct mlist *ml; + struct mlist *ml; { - ml->prev->next = ml->next; - ml->next->prev = ml->prev; + ml->prev->next = ml->next; + ml->next->prev = ml->prev; } /* * Add a string to an mlist. */ - public void + public void cmd_addhist(mlist, cmd, modified) - struct mlist *mlist; - constant char *cmd; - int modified; + struct mlist *mlist; + constant char *cmd; + int modified; { #if CMD_HISTORY - struct mlist *ml; - - /* - * Don't save a trivial command. - */ - if (strlen(cmd) == 0) - return; - - if (no_hist_dups) - { - struct mlist *next = NULL; - for (ml = mlist->next; ml->string != NULL; ml = next) - { - next = ml->next; - if (strcmp(ml->string, cmd) == 0) - { - ml_unlink(ml); - free(ml->string); - free(ml); - } - } - } - - /* - * Save the command unless it's a duplicate of the - * last command in the history. - */ - ml = mlist->prev; - if (ml == mlist || strcmp(ml->string, cmd) != 0) - { - /* - * Did not find command in history. - * Save the command and put it at the end of the history list. - */ - ml = (struct mlist *) ecalloc(1, sizeof(struct mlist)); - ml->string = save(cmd); - ml->modified = modified; - ml_link(mlist, ml); - } - /* - * Point to the cmd just after the just-accepted command. - * Thus, an UPARROW will always retrieve the previous command. - */ - mlist->curr_mp = ml->next; + struct mlist *ml; + + /* + * Don't save a trivial command. + */ + if (strlen(cmd) == 0) + return; + + if (no_hist_dups) + { + struct mlist *next = NULL; + for (ml = mlist->next; ml->string != NULL; ml = next) + { + next = ml->next; + if (strcmp(ml->string, cmd) == 0) + { + ml_unlink(ml); + free(ml->string); + free(ml); + } + } + } + + /* + * Save the command unless it's a duplicate of the + * last command in the history. + */ + ml = mlist->prev; + if (ml == mlist || strcmp(ml->string, cmd) != 0) + { + /* + * Did not find command in history. + * Save the command and put it at the end of the history list. + */ + ml = (struct mlist *) ecalloc(1, sizeof(struct mlist)); + ml->string = save(cmd); + ml->modified = modified; + ml_link(mlist, ml); + } + /* + * Point to the cmd just after the just-accepted command. + * Thus, an UPARROW will always retrieve the previous command. + */ + mlist->curr_mp = ml->next; #endif } @@ -814,17 +814,17 @@ cmd_addhist(mlist, cmd, modified) * Accept the command in the command buffer. * Add it to the currently selected history list. */ - public void + public void cmd_accept(VOID_PARAM) { #if CMD_HISTORY - /* - * Nothing to do if there is no currently selected history list. - */ - if (curr_mlist == NULL || curr_mlist == ml_examine) - return; - cmd_addhist(curr_mlist, cmdbuf, 1); - curr_mlist->modified = 1; + /* + * Nothing to do if there is no currently selected history list. + */ + if (curr_mlist == NULL || curr_mlist == ml_examine) + return; + cmd_addhist(curr_mlist, cmdbuf, 1); + curr_mlist->modified = 1; #endif } @@ -836,140 +836,140 @@ cmd_accept(VOID_PARAM) * CC_OK Line edit function done. * CC_QUIT The char requests the current command to be aborted. */ - static int + static int cmd_edit(c) - int c; + int c; { - int action; - int flags; + int action; + int flags; #if TAB_COMPLETE_FILENAME #define not_in_completion() in_completion = 0 #else #define not_in_completion(VOID_PARAM) #endif - - /* - * See if the char is indeed a line-editing command. - */ - flags = 0; + + /* + * See if the char is indeed a line-editing command. + */ + flags = 0; #if CMD_HISTORY - if (curr_mlist == NULL) - /* - * No current history; don't accept history manipulation cmds. - */ - flags |= ECF_NOHISTORY; + if (curr_mlist == NULL) + /* + * No current history; don't accept history manipulation cmds. + */ + flags |= ECF_NOHISTORY; #endif #if TAB_COMPLETE_FILENAME - if (curr_mlist == ml_search || curr_mlist == NULL) - /* - * Don't accept file-completion cmds in contexts - * such as search pattern, digits, long option name, etc. - */ - flags |= ECF_NOCOMPLETE; + if (curr_mlist == ml_search || curr_mlist == NULL) + /* + * Don't accept file-completion cmds in contexts + * such as search pattern, digits, long option name, etc. + */ + flags |= ECF_NOCOMPLETE; #endif - action = editchar(c, flags); - - switch (action) - { - case A_NOACTION: - return (CC_OK); - case EC_RIGHT: - not_in_completion(); - return (cmd_right()); - case EC_LEFT: - not_in_completion(); - return (cmd_left()); - case EC_W_RIGHT: - not_in_completion(); - while (*cp != '\0' && *cp != ' ') - cmd_right(); - while (*cp == ' ') - cmd_right(); - return (CC_OK); - case EC_W_LEFT: - not_in_completion(); - while (cp > cmdbuf && cp[-1] == ' ') - cmd_left(); - while (cp > cmdbuf && cp[-1] != ' ') - cmd_left(); - return (CC_OK); - case EC_HOME: - not_in_completion(); - cmd_offset = 0; - cmd_home(); - cmd_repaint(cp); - return (CC_OK); - case EC_END: - not_in_completion(); - while (*cp != '\0') - cmd_right(); - return (CC_OK); - case EC_INSERT: - not_in_completion(); - return (CC_OK); - case EC_BACKSPACE: - not_in_completion(); - return (cmd_erase()); - case EC_LINEKILL: - not_in_completion(); - return (cmd_kill()); - case EC_ABORT: - not_in_completion(); - (void) cmd_kill(); - return (CC_QUIT); - case EC_W_BACKSPACE: - not_in_completion(); - return (cmd_werase()); - case EC_DELETE: - not_in_completion(); - return (cmd_delete()); - case EC_W_DELETE: - not_in_completion(); - return (cmd_wdelete()); - case EC_LITERAL: - literal = 1; - return (CC_OK); + action = editchar(c, flags); + + switch (action) + { + case A_NOACTION: + return (CC_OK); + case EC_RIGHT: + not_in_completion(); + return (cmd_right()); + case EC_LEFT: + not_in_completion(); + return (cmd_left()); + case EC_W_RIGHT: + not_in_completion(); + while (*cp != '\0' && *cp != ' ') + cmd_right(); + while (*cp == ' ') + cmd_right(); + return (CC_OK); + case EC_W_LEFT: + not_in_completion(); + while (cp > cmdbuf && cp[-1] == ' ') + cmd_left(); + while (cp > cmdbuf && cp[-1] != ' ') + cmd_left(); + return (CC_OK); + case EC_HOME: + not_in_completion(); + cmd_offset = 0; + cmd_home(); + cmd_repaint(cp); + return (CC_OK); + case EC_END: + not_in_completion(); + while (*cp != '\0') + cmd_right(); + return (CC_OK); + case EC_INSERT: + not_in_completion(); + return (CC_OK); + case EC_BACKSPACE: + not_in_completion(); + return (cmd_erase()); + case EC_LINEKILL: + not_in_completion(); + return (cmd_kill()); + case EC_ABORT: + not_in_completion(); + (void) cmd_kill(); + return (CC_QUIT); + case EC_W_BACKSPACE: + not_in_completion(); + return (cmd_werase()); + case EC_DELETE: + not_in_completion(); + return (cmd_delete()); + case EC_W_DELETE: + not_in_completion(); + return (cmd_wdelete()); + case EC_LITERAL: + literal = 1; + return (CC_OK); #if CMD_HISTORY - case EC_UP: - case EC_DOWN: - not_in_completion(); - return (cmd_updown(action)); + case EC_UP: + case EC_DOWN: + not_in_completion(); + return (cmd_updown(action)); #endif #if TAB_COMPLETE_FILENAME - case EC_F_COMPLETE: - case EC_B_COMPLETE: - case EC_EXPAND: - return (cmd_complete(action)); + case EC_F_COMPLETE: + case EC_B_COMPLETE: + case EC_EXPAND: + return (cmd_complete(action)); #endif - default: - not_in_completion(); - return (CC_PASS); - } + default: + not_in_completion(); + return (CC_PASS); + } } #if TAB_COMPLETE_FILENAME /* * Insert a string into the command buffer, at the current position. */ - static int + static int cmd_istr(str) - char *str; + char *str; { - char *s; - int action; - char *endline = str + strlen(str); - - for (s = str; *s != '\0'; ) - { - char *os = s; - step_char(&s, +1, endline); - action = cmd_ichar(os, s - os); - if (action != CC_OK) - return (action); - } - return (CC_OK); + char *s; + int action; + char *endline = str + strlen(str); + + for (s = str; *s != '\0'; ) + { + char *os = s; + step_char(&s, +1, endline); + action = cmd_ichar(os, s - os); + if (action != CC_OK) + return (action); + } + return (CC_OK); } /* @@ -978,170 +978,170 @@ cmd_istr(str) * Return pointer to the beginning of the word and put the * cursor at the end of the word. */ - static char * + static char * delimit_word(VOID_PARAM) { - char *word; + char *word; #if SPACES_IN_FILENAMES - char *p; - int delim_quoted = 0; - int meta_quoted = 0; - constant char *esc = get_meta_escape(); - int esclen = (int) strlen(esc); + char *p; + int delim_quoted = 0; + int meta_quoted = 0; + constant char *esc = get_meta_escape(); + int esclen = (int) strlen(esc); #endif - - /* - * Move cursor to end of word. - */ - if (*cp != ' ' && *cp != '\0') - { - /* - * Cursor is on a nonspace. - * Move cursor right to the next space. - */ - while (*cp != ' ' && *cp != '\0') - cmd_right(); - } else if (cp > cmdbuf && cp[-1] != ' ') - { - /* - * Cursor is on a space, and char to the left is a nonspace. - * We're already at the end of the word. - */ - ; + + /* + * Move cursor to end of word. + */ + if (*cp != ' ' && *cp != '\0') + { + /* + * Cursor is on a nonspace. + * Move cursor right to the next space. + */ + while (*cp != ' ' && *cp != '\0') + cmd_right(); + } else if (cp > cmdbuf && cp[-1] != ' ') + { + /* + * Cursor is on a space, and char to the left is a nonspace. + * We're already at the end of the word. + */ + ; #if 0 - } else - { - /* - * Cursor is on a space and char to the left is a space. - * Huh? There's no word here. - */ - return (NULL); + } else + { + /* + * Cursor is on a space and char to the left is a space. + * Huh? There's no word here. + */ + return (NULL); #endif - } - /* - * Find the beginning of the word which the cursor is in. - */ - if (cp == cmdbuf) - return (NULL); + } + /* + * Find the beginning of the word which the cursor is in. + */ + if (cp == cmdbuf) + return (NULL); #if SPACES_IN_FILENAMES - /* - * If we have an unbalanced quote (that is, an open quote - * without a corresponding close quote), we return everything - * from the open quote, including spaces. - */ - for (word = cmdbuf; word < cp; word++) - if (*word != ' ') - break; - if (word >= cp) - return (cp); - for (p = cmdbuf; p < cp; p++) - { - if (meta_quoted) - { - meta_quoted = 0; - } else if (esclen > 0 && p + esclen < cp && - strncmp(p, esc, esclen) == 0) - { - meta_quoted = 1; - p += esclen - 1; - } else if (delim_quoted) - { - if (*p == closequote) - delim_quoted = 0; - } else /* (!delim_quoted) */ - { - if (*p == openquote) - delim_quoted = 1; - else if (*p == ' ') - word = p+1; - } - } + /* + * If we have an unbalanced quote (that is, an open quote + * without a corresponding close quote), we return everything + * from the open quote, including spaces. + */ + for (word = cmdbuf; word < cp; word++) + if (*word != ' ') + break; + if (word >= cp) + return (cp); + for (p = cmdbuf; p < cp; p++) + { + if (meta_quoted) + { + meta_quoted = 0; + } else if (esclen > 0 && p + esclen < cp && + strncmp(p, esc, esclen) == 0) + { + meta_quoted = 1; + p += esclen - 1; + } else if (delim_quoted) + { + if (*p == closequote) + delim_quoted = 0; + } else /* (!delim_quoted) */ + { + if (*p == openquote) + delim_quoted = 1; + else if (*p == ' ') + word = p+1; + } + } #endif - return (word); + return (word); } /* * Set things up to enter completion mode. - * Expand the word under the cursor into a list of filenames + * Expand the word under the cursor into a list of filenames * which start with that word, and set tk_text to that list. */ - static void + static void init_compl(VOID_PARAM) { - char *word; - char c; - - /* - * Get rid of any previous tk_text. - */ - if (tk_text != NULL) - { - free(tk_text); - tk_text = NULL; - } - /* - * Find the original (uncompleted) word in the command buffer. - */ - word = delimit_word(); - if (word == NULL) - return; - /* - * Set the insertion point to the point in the command buffer - * where the original (uncompleted) word now sits. - */ - tk_ipoint = word; - /* - * Save the original (uncompleted) word - */ - if (tk_original != NULL) - free(tk_original); - tk_original = (char *) ecalloc(cp-word+1, sizeof(char)); - strncpy(tk_original, word, cp-word); - /* - * Get the expanded filename. - * This may result in a single filename, or - * a blank-separated list of filenames. - */ - c = *cp; - *cp = '\0'; - if (*word != openquote) - { - tk_text = fcomplete(word); - } else - { + char *word; + char c; + + /* + * Get rid of any previous tk_text. + */ + if (tk_text != NULL) + { + free(tk_text); + tk_text = NULL; + } + /* + * Find the original (uncompleted) word in the command buffer. + */ + word = delimit_word(); + if (word == NULL) + return; + /* + * Set the insertion point to the point in the command buffer + * where the original (uncompleted) word now sits. + */ + tk_ipoint = word; + /* + * Save the original (uncompleted) word + */ + if (tk_original != NULL) + free(tk_original); + tk_original = (char *) ecalloc(cp-word+1, sizeof(char)); + strncpy(tk_original, word, cp-word); + /* + * Get the expanded filename. + * This may result in a single filename, or + * a blank-separated list of filenames. + */ + c = *cp; + *cp = '\0'; + if (*word != openquote) + { + tk_text = fcomplete(word); + } else + { #if MSDOS_COMPILER - char *qword = NULL; + char *qword = NULL; #else - char *qword = shell_quote(word+1); + char *qword = shell_quote(word+1); #endif - if (qword == NULL) - tk_text = fcomplete(word+1); - else - { - tk_text = fcomplete(qword); - free(qword); - } - } - *cp = c; + if (qword == NULL) + tk_text = fcomplete(word+1); + else + { + tk_text = fcomplete(qword); + free(qword); + } + } + *cp = c; } /* * Return the next word in the current completion list. */ - static char * + static char * next_compl(action, prev) - int action; - char *prev; + int action; + char *prev; { - switch (action) - { - case EC_F_COMPLETE: - return (forw_textlist(&tk_tlist, prev)); - case EC_B_COMPLETE: - return (back_textlist(&tk_tlist, prev)); - } - /* Cannot happen */ - return ("?"); + switch (action) + { + case EC_F_COMPLETE: + return (forw_textlist(&tk_tlist, prev)); + case EC_B_COMPLETE: + return (back_textlist(&tk_tlist, prev)); + } + /* Cannot happen */ + return ("?"); } /* @@ -1150,92 +1150,92 @@ next_compl(action, prev) * remembers whether this call is the first time (create the list), * or a subsequent time (step thru the list). */ - static int + static int cmd_complete(action) - int action; + int action; { - char *s; - - if (!in_completion || action == EC_EXPAND) - { - /* - * Expand the word under the cursor and - * use the first word in the expansion - * (or the entire expansion if we're doing EC_EXPAND). - */ - init_compl(); - if (tk_text == NULL) - { - bell(); - return (CC_OK); - } - if (action == EC_EXPAND) - { - /* - * Use the whole list. - */ - tk_trial = tk_text; - } else - { - /* - * Use the first filename in the list. - */ - in_completion = 1; - init_textlist(&tk_tlist, tk_text); - tk_trial = next_compl(action, (char*)NULL); - } - } else - { - /* - * We already have a completion list. - * Use the next/previous filename from the list. - */ - tk_trial = next_compl(action, tk_trial); - } - - /* - * Remove the original word, or the previous trial completion. - */ - while (cp > tk_ipoint) - (void) cmd_erase(); - - if (tk_trial == NULL) - { - /* - * There are no more trial completions. - * Insert the original (uncompleted) filename. - */ - in_completion = 0; - if (cmd_istr(tk_original) != CC_OK) - goto fail; - } else - { - /* - * Insert trial completion. - */ - if (cmd_istr(tk_trial) != CC_OK) - goto fail; - /* - * If it is a directory, append a slash. - */ - if (is_dir(tk_trial)) - { - if (cp > cmdbuf && cp[-1] == closequote) - (void) cmd_erase(); - s = lgetenv("LESSSEPARATOR"); - if (s == NULL) - s = PATHNAME_SEP; - if (cmd_istr(s) != CC_OK) - goto fail; - } - } - - return (CC_OK); - + char *s; + + if (!in_completion || action == EC_EXPAND) + { + /* + * Expand the word under the cursor and + * use the first word in the expansion + * (or the entire expansion if we're doing EC_EXPAND). + */ + init_compl(); + if (tk_text == NULL) + { + bell(); + return (CC_OK); + } + if (action == EC_EXPAND) + { + /* + * Use the whole list. + */ + tk_trial = tk_text; + } else + { + /* + * Use the first filename in the list. + */ + in_completion = 1; + init_textlist(&tk_tlist, tk_text); + tk_trial = next_compl(action, (char*)NULL); + } + } else + { + /* + * We already have a completion list. + * Use the next/previous filename from the list. + */ + tk_trial = next_compl(action, tk_trial); + } + + /* + * Remove the original word, or the previous trial completion. + */ + while (cp > tk_ipoint) + (void) cmd_erase(); + + if (tk_trial == NULL) + { + /* + * There are no more trial completions. + * Insert the original (uncompleted) filename. + */ + in_completion = 0; + if (cmd_istr(tk_original) != CC_OK) + goto fail; + } else + { + /* + * Insert trial completion. + */ + if (cmd_istr(tk_trial) != CC_OK) + goto fail; + /* + * If it is a directory, append a slash. + */ + if (is_dir(tk_trial)) + { + if (cp > cmdbuf && cp[-1] == closequote) + (void) cmd_erase(); + s = lgetenv("LESSSEPARATOR"); + if (s == NULL) + s = PATHNAME_SEP; + if (cmd_istr(s) != CC_OK) + goto fail; + } + } + + return (CC_OK); + fail: - in_completion = 0; - bell(); - return (CC_OK); + in_completion = 0; + bell(); + return (CC_OK); } #endif /* TAB_COMPLETE_FILENAME */ @@ -1248,338 +1248,338 @@ cmd_complete(action) * CC_QUIT The char requests the command to be aborted. * CC_ERROR The char could not be accepted due to an error. */ - public int + public int cmd_char(c) - int c; + int c; { - int action; - int len; - - if (!utf_mode) - { - cmd_mbc_buf[0] = c; - len = 1; - } else - { - /* Perform strict validation in all possible cases. */ - if (cmd_mbc_buf_len == 0) - { - retry: - cmd_mbc_buf_index = 1; - *cmd_mbc_buf = c; - if (IS_ASCII_OCTET(c)) - cmd_mbc_buf_len = 1; + int action; + int len; + + if (!utf_mode) + { + cmd_mbc_buf[0] = c; + len = 1; + } else + { + /* Perform strict validation in all possible cases. */ + if (cmd_mbc_buf_len == 0) + { + retry: + cmd_mbc_buf_index = 1; + *cmd_mbc_buf = c; + if (IS_ASCII_OCTET(c)) + cmd_mbc_buf_len = 1; #if MSDOS_COMPILER || OS2 - else if (c == (unsigned char) '\340' && IS_ASCII_OCTET(peekcc())) - { - /* Assume a special key. */ - cmd_mbc_buf_len = 1; - } + else if (c == (unsigned char) '\340' && IS_ASCII_OCTET(peekcc())) + { + /* Assume a special key. */ + cmd_mbc_buf_len = 1; + } #endif - else if (IS_UTF8_LEAD(c)) - { - cmd_mbc_buf_len = utf_len(c); - return (CC_OK); - } else - { - /* UTF8_INVALID or stray UTF8_TRAIL */ - bell(); - return (CC_ERROR); - } - } else if (IS_UTF8_TRAIL(c)) - { - cmd_mbc_buf[cmd_mbc_buf_index++] = c; - if (cmd_mbc_buf_index < cmd_mbc_buf_len) - return (CC_OK); - if (!is_utf8_well_formed(cmd_mbc_buf, cmd_mbc_buf_index)) - { - /* complete, but not well formed (non-shortest form), sequence */ - cmd_mbc_buf_len = 0; - bell(); - return (CC_ERROR); - } - } else - { - /* Flush incomplete (truncated) sequence. */ - cmd_mbc_buf_len = 0; - bell(); - /* Handle new char. */ - goto retry; - } - - len = cmd_mbc_buf_len; - cmd_mbc_buf_len = 0; - } - - if (literal) - { - /* - * Insert the char, even if it is a line-editing char. - */ - literal = 0; - return (cmd_ichar(cmd_mbc_buf, len)); - } - - /* - * See if it is a line-editing character. - */ - if (in_mca() && len == 1) - { - action = cmd_edit(c); - switch (action) - { - case CC_OK: - case CC_QUIT: - return (action); - case CC_PASS: - break; - } - } - - /* - * Insert the char into the command buffer. - */ - return (cmd_ichar(cmd_mbc_buf, len)); + else if (IS_UTF8_LEAD(c)) + { + cmd_mbc_buf_len = utf_len(c); + return (CC_OK); + } else + { + /* UTF8_INVALID or stray UTF8_TRAIL */ + bell(); + return (CC_ERROR); + } + } else if (IS_UTF8_TRAIL(c)) + { + cmd_mbc_buf[cmd_mbc_buf_index++] = c; + if (cmd_mbc_buf_index < cmd_mbc_buf_len) + return (CC_OK); + if (!is_utf8_well_formed(cmd_mbc_buf, cmd_mbc_buf_index)) + { + /* complete, but not well formed (non-shortest form), sequence */ + cmd_mbc_buf_len = 0; + bell(); + return (CC_ERROR); + } + } else + { + /* Flush incomplete (truncated) sequence. */ + cmd_mbc_buf_len = 0; + bell(); + /* Handle new char. */ + goto retry; + } + + len = cmd_mbc_buf_len; + cmd_mbc_buf_len = 0; + } + + if (literal) + { + /* + * Insert the char, even if it is a line-editing char. + */ + literal = 0; + return (cmd_ichar(cmd_mbc_buf, len)); + } + + /* + * See if it is a line-editing character. + */ + if (in_mca() && len == 1) + { + action = cmd_edit(c); + switch (action) + { + case CC_OK: + case CC_QUIT: + return (action); + case CC_PASS: + break; + } + } + + /* + * Insert the char into the command buffer. + */ + return (cmd_ichar(cmd_mbc_buf, len)); } /* * Return the number currently in the command buffer. */ - public LINENUM + public LINENUM cmd_int(frac) - long *frac; + long *frac; { - char *p; - LINENUM n = 0; - int err; - - for (p = cmdbuf; *p >= '0' && *p <= '9'; p++) - { - LINENUM nn = (n * 10) + (*p - '0'); - if (nn < n) - { - error("Integer is too big", NULL_PARG); - return (0); - } - n = nn; - } - *frac = 0; - if (*p++ == '.') - { - *frac = getfraction(&p, NULL, &err); - /* {{ do something if err is set? }} */ - } - return (n); + char *p; + LINENUM n = 0; + int err; + + for (p = cmdbuf; *p >= '0' && *p <= '9'; p++) + { + LINENUM nn = (n * 10) + (*p - '0'); + if (nn < n) + { + error("Integer is too big", NULL_PARG); + return (0); + } + n = nn; + } + *frac = 0; + if (*p++ == '.') + { + *frac = getfraction(&p, NULL, &err); + /* {{ do something if err is set? }} */ + } + return (n); } /* * Return a pointer to the command buffer. */ - public char * + public char * get_cmdbuf(VOID_PARAM) { - if (cmd_mbc_buf_index < cmd_mbc_buf_len) - /* Don't return buffer containing an incomplete multibyte char. */ - return (NULL); - return (cmdbuf); + if (cmd_mbc_buf_index < cmd_mbc_buf_len) + /* Don't return buffer containing an incomplete multibyte char. */ + return (NULL); + return (cmdbuf); } #if CMD_HISTORY /* * Return the last (most recent) string in the current command history. */ - public char * + public char * cmd_lastpattern(VOID_PARAM) { - if (curr_mlist == NULL) - return (NULL); - return (curr_mlist->curr_mp->prev->string); + if (curr_mlist == NULL) + return (NULL); + return (curr_mlist->curr_mp->prev->string); } #endif #if CMD_HISTORY /* */ - static int + static int mlist_size(ml) - struct mlist *ml; + struct mlist *ml; { - int size = 0; - for (ml = ml->next; ml->string != NULL; ml = ml->next) - ++size; - return size; + int size = 0; + for (ml = ml->next; ml->string != NULL; ml = ml->next) + ++size; + return size; } /* * Get the name of the history file. */ - static char * + static char * histfile_find(must_exist) - int must_exist; + int must_exist; { - char *home = lgetenv("HOME"); - char *name = NULL; + char *home = lgetenv("HOME"); + char *name = NULL; - /* Try in $XDG_STATE_HOME, then in $HOME/.local/state, then in $XDG_DATA_HOME, then in $HOME. */ + /* Try in $XDG_STATE_HOME, then in $HOME/.local/state, then in $XDG_DATA_HOME, then in $HOME. */ #if OS2 - if (isnullenv(home)) - home = lgetenv("INIT"); + if (isnullenv(home)) + home = lgetenv("INIT"); #endif - name = dirfile(lgetenv("XDG_STATE_HOME"), &LESSHISTFILE[1], must_exist); - if (name == NULL) - { - char *dir = dirfile(home, ".local/state", 1); - if (dir != NULL) - { - name = dirfile(dir, &LESSHISTFILE[1], must_exist); - free(dir); - } - } - if (name == NULL) - name = dirfile(lgetenv("XDG_DATA_HOME"), &LESSHISTFILE[1], must_exist); - if (name == NULL) - name = dirfile(home, LESSHISTFILE, must_exist); - return (name); + name = dirfile(lgetenv("XDG_STATE_HOME"), &LESSHISTFILE[1], must_exist); + if (name == NULL) + { + char *dir = dirfile(home, ".local/state", 1); + if (dir != NULL) + { + name = dirfile(dir, &LESSHISTFILE[1], must_exist); + free(dir); + } + } + if (name == NULL) + name = dirfile(lgetenv("XDG_DATA_HOME"), &LESSHISTFILE[1], must_exist); + if (name == NULL) + name = dirfile(home, LESSHISTFILE, must_exist); + return (name); } - static char * + static char * histfile_name(must_exist) - int must_exist; + int must_exist; { - char *name; - - /* See if filename is explicitly specified by $LESSHISTFILE. */ - name = lgetenv("LESSHISTFILE"); - if (!isnullenv(name)) - { - if (strcmp(name, "-") == 0 || strcmp(name, "/dev/null") == 0) - /* $LESSHISTFILE == "-" means don't use a history file. */ - return (NULL); - return (save(name)); - } - - /* See if history file is disabled in the build. */ - if (strcmp(LESSHISTFILE, "") == 0 || strcmp(LESSHISTFILE, "-") == 0) - return (NULL); - - name = NULL; - if (!must_exist) - { - /* If we're writing the file and the file already exists, use it. */ - name = histfile_find(1); - } - if (name == NULL) - name = histfile_find(must_exist); - return (name); + char *name; + + /* See if filename is explicitly specified by $LESSHISTFILE. */ + name = lgetenv("LESSHISTFILE"); + if (!isnullenv(name)) + { + if (strcmp(name, "-") == 0 || strcmp(name, "/dev/null") == 0) + /* $LESSHISTFILE == "-" means don't use a history file. */ + return (NULL); + return (save(name)); + } + + /* See if history file is disabled in the build. */ + if (strcmp(LESSHISTFILE, "") == 0 || strcmp(LESSHISTFILE, "-") == 0) + return (NULL); + + name = NULL; + if (!must_exist) + { + /* If we're writing the file and the file already exists, use it. */ + name = histfile_find(1); + } + if (name == NULL) + name = histfile_find(must_exist); + return (name); } /* * Read a .lesshst file and call a callback for each line in the file. */ - static void + static void read_cmdhist2(action, uparam, skip_search, skip_shell) - void (*action)(void*,struct mlist*,char*); - void *uparam; - int skip_search; - int skip_shell; + void (*action)(void*,struct mlist*,char*); + void *uparam; + int skip_search; + int skip_shell; { - struct mlist *ml = NULL; - char line[CMDBUF_SIZE]; - char *filename; - FILE *f; - char *p; - int *skip = NULL; - - filename = histfile_name(1); - if (filename == NULL) - return; - f = fopen(filename, "r"); - free(filename); - if (f == NULL) - return; - if (fgets(line, sizeof(line), f) == NULL || - strncmp(line, HISTFILE_FIRST_LINE, strlen(HISTFILE_FIRST_LINE)) != 0) - { - fclose(f); - return; - } - while (fgets(line, sizeof(line), f) != NULL) - { - for (p = line; *p != '\0'; p++) - { - if (*p == '\n' || *p == '\r') - { - *p = '\0'; - break; - } - } - if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) - { - ml = &mlist_search; - skip = &skip_search; - } else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) - { + struct mlist *ml = NULL; + char line[CMDBUF_SIZE]; + char *filename; + FILE *f; + char *p; + int *skip = NULL; + + filename = histfile_name(1); + if (filename == NULL) + return; + f = fopen(filename, "r"); + free(filename); + if (f == NULL) + return; + if (fgets(line, sizeof(line), f) == NULL || + strncmp(line, HISTFILE_FIRST_LINE, strlen(HISTFILE_FIRST_LINE)) != 0) + { + fclose(f); + return; + } + while (fgets(line, sizeof(line), f) != NULL) + { + for (p = line; *p != '\0'; p++) + { + if (*p == '\n' || *p == '\r') + { + *p = '\0'; + break; + } + } + if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) + { + ml = &mlist_search; + skip = &skip_search; + } else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) + { #if SHELL_ESCAPE || PIPEC - ml = &mlist_shell; - skip = &skip_shell; + ml = &mlist_shell; + skip = &skip_shell; #else - ml = NULL; - skip = NULL; + ml = NULL; + skip = NULL; #endif - } else if (strcmp(line, HISTFILE_MARK_SECTION) == 0) - { - ml = NULL; - } else if (*line == '"') - { - if (ml != NULL) - { - if (skip != NULL && *skip > 0) - --(*skip); - else - (*action)(uparam, ml, line+1); - } - } else if (*line == 'm') - { - (*action)(uparam, NULL, line); - } - } - fclose(f); + } else if (strcmp(line, HISTFILE_MARK_SECTION) == 0) + { + ml = NULL; + } else if (*line == '"') + { + if (ml != NULL) + { + if (skip != NULL && *skip > 0) + --(*skip); + else + (*action)(uparam, ml, line+1); + } + } else if (*line == 'm') + { + (*action)(uparam, NULL, line); + } + } + fclose(f); } - static void + static void read_cmdhist(action, uparam, skip_search, skip_shell) - void (*action)(void*,struct mlist*,char*); - void *uparam; - int skip_search; - int skip_shell; + void (*action)(void*,struct mlist*,char*); + void *uparam; + int skip_search; + int skip_shell; { - if (secure) - return; - read_cmdhist2(action, uparam, skip_search, skip_shell); - (*action)(uparam, NULL, NULL); /* signal end of file */ + if (secure) + return; + read_cmdhist2(action, uparam, skip_search, skip_shell); + (*action)(uparam, NULL, NULL); /* signal end of file */ } - static void + static void addhist_init(uparam, ml, string) - void *uparam; - struct mlist *ml; - char constant *string; + void *uparam; + struct mlist *ml; + char constant *string; { - if (ml != NULL) - cmd_addhist(ml, string, 0); - else if (string != NULL) - restore_mark((char*)string); /* stupid const cast */ + if (ml != NULL) + cmd_addhist(ml, string, 0); + else if (string != NULL) + restore_mark((char*)string); /* stupid const cast */ } #endif /* CMD_HISTORY */ /* * Initialize history from a .lesshist file. */ - public void + public void init_cmdhist(VOID_PARAM) { #if CMD_HISTORY - read_cmdhist(&addhist_init, NULL, 0, 0); + read_cmdhist(&addhist_init, NULL, 0, 0); #endif /* CMD_HISTORY */ } @@ -1587,56 +1587,56 @@ init_cmdhist(VOID_PARAM) * Write the header for a section of the history file. */ #if CMD_HISTORY - static void + static void write_mlist_header(ml, f) - struct mlist *ml; - FILE *f; + struct mlist *ml; + FILE *f; { - if (ml == &mlist_search) - fprintf(f, "%s\n", HISTFILE_SEARCH_SECTION); + if (ml == &mlist_search) + fprintf(f, "%s\n", HISTFILE_SEARCH_SECTION); #if SHELL_ESCAPE || PIPEC - else if (ml == &mlist_shell) - fprintf(f, "%s\n", HISTFILE_SHELL_SECTION); + else if (ml == &mlist_shell) + fprintf(f, "%s\n", HISTFILE_SHELL_SECTION); #endif } /* * Write all modified entries in an mlist to the history file. */ - static void + static void write_mlist(ml, f) - struct mlist *ml; - FILE *f; + struct mlist *ml; + FILE *f; { - for (ml = ml->next; ml->string != NULL; ml = ml->next) - { - if (!ml->modified) - continue; - fprintf(f, "\"%s\n", ml->string); - ml->modified = 0; - } - ml->modified = 0; /* entire mlist is now unmodified */ + for (ml = ml->next; ml->string != NULL; ml = ml->next) + { + if (!ml->modified) + continue; + fprintf(f, "\"%s\n", ml->string); + ml->modified = 0; + } + ml->modified = 0; /* entire mlist is now unmodified */ } /* * Make a temp name in the same directory as filename. */ - static char * + static char * make_tempname(filename) - char *filename; + char *filename; { - char lastch; - char *tempname = ecalloc(1, strlen(filename)+1); - strcpy(tempname, filename); - lastch = tempname[strlen(tempname)-1]; - tempname[strlen(tempname)-1] = (lastch == 'Q') ? 'Z' : 'Q'; - return tempname; + char lastch; + char *tempname = ecalloc(1, strlen(filename)+1); + strcpy(tempname, filename); + lastch = tempname[strlen(tempname)-1]; + tempname[strlen(tempname)-1] = (lastch == 'Q') ? 'Z' : 'Q'; + return tempname; } struct save_ctx { - struct mlist *mlist; - FILE *fout; + struct mlist *mlist; + FILE *fout; }; /* @@ -1644,66 +1644,66 @@ struct save_ctx * At the end of each mlist, append any new entries * created during this session. */ - static void + static void copy_hist(uparam, ml, string) - void *uparam; - struct mlist *ml; - char constant *string; + void *uparam; + struct mlist *ml; + char constant *string; { - struct save_ctx *ctx = (struct save_ctx *) uparam; - - if (ml != NULL && ml != ctx->mlist) { - /* We're changing mlists. */ - if (ctx->mlist) - /* Append any new entries to the end of the current mlist. */ - write_mlist(ctx->mlist, ctx->fout); - /* Write the header for the new mlist. */ - ctx->mlist = ml; - write_mlist_header(ctx->mlist, ctx->fout); - } - - if (string == NULL) /* End of file */ - { - /* Write any sections that were not in the original file. */ - if (mlist_search.modified) - { - write_mlist_header(&mlist_search, ctx->fout); - write_mlist(&mlist_search, ctx->fout); - } + struct save_ctx *ctx = (struct save_ctx *) uparam; + + if (ml != NULL && ml != ctx->mlist) { + /* We're changing mlists. */ + if (ctx->mlist) + /* Append any new entries to the end of the current mlist. */ + write_mlist(ctx->mlist, ctx->fout); + /* Write the header for the new mlist. */ + ctx->mlist = ml; + write_mlist_header(ctx->mlist, ctx->fout); + } + + if (string == NULL) /* End of file */ + { + /* Write any sections that were not in the original file. */ + if (mlist_search.modified) + { + write_mlist_header(&mlist_search, ctx->fout); + write_mlist(&mlist_search, ctx->fout); + } #if SHELL_ESCAPE || PIPEC - if (mlist_shell.modified) - { - write_mlist_header(&mlist_shell, ctx->fout); - write_mlist(&mlist_shell, ctx->fout); - } + if (mlist_shell.modified) + { + write_mlist_header(&mlist_shell, ctx->fout); + write_mlist(&mlist_shell, ctx->fout); + } #endif - } else if (ml != NULL) - { - /* Copy mlist entry. */ - fprintf(ctx->fout, "\"%s\n", string); - } - /* Skip marks */ + } else if (ml != NULL) + { + /* Copy mlist entry. */ + fprintf(ctx->fout, "\"%s\n", string); + } + /* Skip marks */ } #endif /* CMD_HISTORY */ /* * Make a file readable only by its owner. */ - static void + static void make_file_private(f) - FILE *f; + FILE *f; { #if HAVE_FCHMOD - int do_chmod = 1; + int do_chmod = 1; #if HAVE_STAT - struct stat statbuf; - int r = fstat(fileno(f), &statbuf); - if (r < 0 || !S_ISREG(statbuf.st_mode)) - /* Don't chmod if not a regular file. */ - do_chmod = 0; + struct stat statbuf; + int r = fstat(fileno(f), &statbuf); + if (r < 0 || !S_ISREG(statbuf.st_mode)) + /* Don't chmod if not a regular file. */ + do_chmod = 0; #endif - if (do_chmod) - fchmod(fileno(f), 0600); + if (do_chmod) + fchmod(fileno(f), 0600); #endif } @@ -1711,72 +1711,72 @@ make_file_private(f) * Does the history file need to be updated? */ #if CMD_HISTORY - static int + static int histfile_modified(VOID_PARAM) { - if (mlist_search.modified) - return 1; + if (mlist_search.modified) + return 1; #if SHELL_ESCAPE || PIPEC - if (mlist_shell.modified) - return 1; + if (mlist_shell.modified) + return 1; #endif - if (marks_modified) - return 1; - return 0; + if (marks_modified) + return 1; + return 0; } #endif /* * Update the .lesshst file. */ - public void + public void save_cmdhist(VOID_PARAM) { #if CMD_HISTORY - char *histname; - char *tempname; - int skip_search; - int skip_shell; - struct save_ctx ctx; - char *s; - FILE *fout = NULL; - int histsize = 0; - - if (secure || !histfile_modified()) - return; - histname = histfile_name(0); - if (histname == NULL) - return; - tempname = make_tempname(histname); - fout = fopen(tempname, "w"); - if (fout != NULL) - { - make_file_private(fout); - s = lgetenv("LESSHISTSIZE"); - if (s != NULL) - histsize = atoi(s); - if (histsize <= 0) - histsize = 100; - skip_search = mlist_size(&mlist_search) - histsize; + char *histname; + char *tempname; + int skip_search; + int skip_shell; + struct save_ctx ctx; + char *s; + FILE *fout = NULL; + int histsize = 0; + + if (secure || !histfile_modified()) + return; + histname = histfile_name(0); + if (histname == NULL) + return; + tempname = make_tempname(histname); + fout = fopen(tempname, "w"); + if (fout != NULL) + { + make_file_private(fout); + s = lgetenv("LESSHISTSIZE"); + if (s != NULL) + histsize = atoi(s); + if (histsize <= 0) + histsize = 100; + skip_search = mlist_size(&mlist_search) - histsize; #if SHELL_ESCAPE || PIPEC - skip_shell = mlist_size(&mlist_shell) - histsize; + skip_shell = mlist_size(&mlist_shell) - histsize; #endif - fprintf(fout, "%s\n", HISTFILE_FIRST_LINE); - ctx.fout = fout; - ctx.mlist = NULL; - read_cmdhist(©_hist, &ctx, skip_search, skip_shell); - save_marks(fout, HISTFILE_MARK_SECTION); - fclose(fout); + fprintf(fout, "%s\n", HISTFILE_FIRST_LINE); + ctx.fout = fout; + ctx.mlist = NULL; + read_cmdhist(©_hist, &ctx, skip_search, skip_shell); + save_marks(fout, HISTFILE_MARK_SECTION); + fclose(fout); #if MSDOS_COMPILER==WIN32C - /* - * Windows rename doesn't remove an existing file, - * making it useless for atomic operations. Sigh. - */ - remove(histname); + /* + * Windows rename doesn't remove an existing file, + * making it useless for atomic operations. Sigh. + */ + remove(histname); #endif - rename(tempname, histname); - } - free(tempname); - free(histname); + rename(tempname, histname); + } + free(tempname); + free(histname); #endif /* CMD_HISTORY */ } diff --git a/command.c b/command.c index 524b938..6443172 100644 --- a/command.c +++ b/command.c @@ -87,8 +87,8 @@ static char pipec; /* Stack of ungotten chars (via ungetcc) */ struct ungot { - struct ungot *ug_next; - LWCHAR ug_char; + struct ungot *ug_next; + LWCHAR ug_char; }; static struct ungot* ungot = NULL; @@ -99,824 +99,824 @@ static void multi_search LESSPARAMS((char *pattern, int n, int silent)); * This looks nicer if the command takes a long time before * updating the screen. */ - static void + static void cmd_exec(VOID_PARAM) { - clear_attn(); - clear_bot(); - flush(); + clear_attn(); + clear_bot(); + flush(); } /* * Indicate we are reading a multi-character command. */ - static void + static void set_mca(action) - int action; + int action; { - mca = action; - clear_bot(); - clear_cmd(); + mca = action; + clear_bot(); + clear_cmd(); } /* * Indicate we are not reading a multi-character command. */ - static void + static void clear_mca(VOID_PARAM) { - if (mca == 0) - return; - mca = 0; + if (mca == 0) + return; + mca = 0; } /* * Set up the display to start a new multi-character command. */ - static void + static void start_mca(action, prompt, mlist, cmdflags) - int action; - constant char *prompt; - void *mlist; - int cmdflags; + int action; + constant char *prompt; + void *mlist; + int cmdflags; { - set_mca(action); - cmd_putstr(prompt); - set_mlist(mlist, cmdflags); + set_mca(action); + cmd_putstr(prompt); + set_mlist(mlist, cmdflags); } - public int + public int in_mca(VOID_PARAM) { - return (mca != 0 && mca != A_PREFIX); + return (mca != 0 && mca != A_PREFIX); } /* * Set up the display to start a new search command. */ - static void + static void mca_search1(VOID_PARAM) { #if HILITE_SEARCH - if (search_type & SRCH_FILTER) - set_mca(A_FILTER); - else + if (search_type & SRCH_FILTER) + set_mca(A_FILTER); + else #endif - if (search_type & SRCH_FORW) - set_mca(A_F_SEARCH); - else - set_mca(A_B_SEARCH); - - if (search_type & SRCH_NO_MATCH) - cmd_putstr("Non-match "); - if (search_type & SRCH_FIRST_FILE) - cmd_putstr("First-file "); - if (search_type & SRCH_PAST_EOF) - cmd_putstr("EOF-ignore "); - if (search_type & SRCH_NO_MOVE) - cmd_putstr("Keep-pos "); - if (search_type & SRCH_NO_REGEX) - cmd_putstr("Regex-off "); - if (search_type & SRCH_WRAP) - cmd_putstr("Wrap "); + if (search_type & SRCH_FORW) + set_mca(A_F_SEARCH); + else + set_mca(A_B_SEARCH); + + if (search_type & SRCH_NO_MATCH) + cmd_putstr("Non-match "); + if (search_type & SRCH_FIRST_FILE) + cmd_putstr("First-file "); + if (search_type & SRCH_PAST_EOF) + cmd_putstr("EOF-ignore "); + if (search_type & SRCH_NO_MOVE) + cmd_putstr("Keep-pos "); + if (search_type & SRCH_NO_REGEX) + cmd_putstr("Regex-off "); + if (search_type & SRCH_WRAP) + cmd_putstr("Wrap "); #if HILITE_SEARCH - if (search_type & SRCH_FILTER) - cmd_putstr("&/"); - else + if (search_type & SRCH_FILTER) + cmd_putstr("&/"); + else #endif - if (search_type & SRCH_FORW) - cmd_putstr("/"); - else - cmd_putstr("?"); - forw_prompt = 0; + if (search_type & SRCH_FORW) + cmd_putstr("/"); + else + cmd_putstr("?"); + forw_prompt = 0; } - static void + static void mca_search(VOID_PARAM) { - mca_search1(); - set_mlist(ml_search, 0); + mca_search1(); + set_mlist(ml_search, 0); } /* * Set up the display to start a new toggle-option command. */ - static void + static void mca_opt_toggle(VOID_PARAM) { - int no_prompt; - int flag; - char *dash; - - no_prompt = (optflag & OPT_NO_PROMPT); - flag = (optflag & ~OPT_NO_PROMPT); - dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; - - set_mca(A_OPT_TOGGLE); - cmd_putstr(dash); - if (optgetname) - cmd_putstr(dash); - if (no_prompt) - cmd_putstr("(P)"); - switch (flag) - { - case OPT_UNSET: - cmd_putstr("+"); - break; - case OPT_SET: - cmd_putstr("!"); - break; - } - forw_prompt = 0; - set_mlist(NULL, 0); + int no_prompt; + int flag; + char *dash; + + no_prompt = (optflag & OPT_NO_PROMPT); + flag = (optflag & ~OPT_NO_PROMPT); + dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; + + set_mca(A_OPT_TOGGLE); + cmd_putstr(dash); + if (optgetname) + cmd_putstr(dash); + if (no_prompt) + cmd_putstr("(P)"); + switch (flag) + { + case OPT_UNSET: + cmd_putstr("+"); + break; + case OPT_SET: + cmd_putstr("!"); + break; + } + forw_prompt = 0; + set_mlist(NULL, 0); } /* * Execute a multicharacter command. */ - static void + static void exec_mca(VOID_PARAM) { - char *cbuf; - - cmd_exec(); - cbuf = get_cmdbuf(); - if (cbuf == NULL) - return; - - switch (mca) - { - case A_F_SEARCH: - case A_B_SEARCH: - multi_search(cbuf, (int) number, 0); - break; + char *cbuf; + + cmd_exec(); + cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; + + switch (mca) + { + case A_F_SEARCH: + case A_B_SEARCH: + multi_search(cbuf, (int) number, 0); + break; #if HILITE_SEARCH - case A_FILTER: - search_type ^= SRCH_NO_MATCH; - set_filter_pattern(cbuf, search_type); - break; + case A_FILTER: + search_type ^= SRCH_NO_MATCH; + set_filter_pattern(cbuf, search_type); + break; #endif - case A_FIRSTCMD: - /* - * Skip leading spaces or + signs in the string. - */ - while (*cbuf == '+' || *cbuf == ' ') - cbuf++; - if (every_first_cmd != NULL) - free(every_first_cmd); - if (*cbuf == '\0') - every_first_cmd = NULL; - else - every_first_cmd = save(cbuf); - break; - case A_OPT_TOGGLE: - toggle_option(curropt, opt_lower, cbuf, optflag); - curropt = NULL; - break; - case A_F_BRACKET: - match_brac(cbuf[0], cbuf[1], 1, (int) number); - break; - case A_B_BRACKET: - match_brac(cbuf[1], cbuf[0], 0, (int) number); - break; + case A_FIRSTCMD: + /* + * Skip leading spaces or + signs in the string. + */ + while (*cbuf == '+' || *cbuf == ' ') + cbuf++; + if (every_first_cmd != NULL) + free(every_first_cmd); + if (*cbuf == '\0') + every_first_cmd = NULL; + else + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: + toggle_option(curropt, opt_lower, cbuf, optflag); + curropt = NULL; + break; + case A_F_BRACKET: + match_brac(cbuf[0], cbuf[1], 1, (int) number); + break; + case A_B_BRACKET: + match_brac(cbuf[1], cbuf[0], 0, (int) number); + break; #if EXAMINE - case A_EXAMINE: - if (secure) - break; - edit_list(cbuf); + case A_EXAMINE: + if (secure) + break; + edit_list(cbuf); #if TAGS - /* If tag structure is loaded then clean it up. */ - cleantags(); + /* If tag structure is loaded then clean it up. */ + cleantags(); #endif - break; + break; #endif #if SHELL_ESCAPE - case A_SHELL: - /* - * !! just uses whatever is in shellcmd. - * Otherwise, copy cmdbuf to shellcmd, - * expanding any special characters ("%" or "#"). - */ - if (*cbuf != '!') - { - if (shellcmd != NULL) - free(shellcmd); - shellcmd = fexpand(cbuf); - } - - if (secure) - break; - if (shellcmd == NULL) - lsystem("", "!done"); - else - lsystem(shellcmd, "!done"); - break; + case A_SHELL: + /* + * !! just uses whatever is in shellcmd. + * Otherwise, copy cmdbuf to shellcmd, + * expanding any special characters ("%" or "#"). + */ + if (*cbuf != '!') + { + if (shellcmd != NULL) + free(shellcmd); + shellcmd = fexpand(cbuf); + } + + if (secure) + break; + if (shellcmd == NULL) + lsystem("", "!done"); + else + lsystem(shellcmd, "!done"); + break; #endif #if PIPEC - case A_PIPE: - if (secure) - break; - (void) pipe_mark(pipec, cbuf); - error("|done", NULL_PARG); - break; + case A_PIPE: + if (secure) + break; + (void) pipe_mark(pipec, cbuf); + error("|done", NULL_PARG); + break; #endif - } + } } /* * Is a character an erase or kill char? */ - static int + static int is_erase_char(c) - int c; + int c; { - return (c == erase_char || c == erase2_char || c == kill_char); + return (c == erase_char || c == erase2_char || c == kill_char); } /* * Is a character a carriage return or newline? */ - static int + static int is_newline_char(c) - int c; + int c; { - return (c == '\n' || c == '\r'); + return (c == '\n' || c == '\r'); } /* * Handle the first char of an option (after the initial dash). */ - static int + static int mca_opt_first_char(c) - int c; + int c; { - int no_prompt = (optflag & OPT_NO_PROMPT); - int flag = (optflag & ~OPT_NO_PROMPT); - if (flag == OPT_NO_TOGGLE) - { - switch (c) - { - case '_': - /* "__" = long option name. */ - optgetname = TRUE; - mca_opt_toggle(); - return (MCA_MORE); - } - } else - { - switch (c) - { - case '+': - /* "-+" = UNSET. */ - optflag = no_prompt | ((flag == OPT_UNSET) ? - OPT_TOGGLE : OPT_UNSET); - mca_opt_toggle(); - return (MCA_MORE); - case '!': - /* "-!" = SET */ - optflag = no_prompt | ((flag == OPT_SET) ? - OPT_TOGGLE : OPT_SET); - mca_opt_toggle(); - return (MCA_MORE); - case CONTROL('P'): - optflag ^= OPT_NO_PROMPT; - mca_opt_toggle(); - return (MCA_MORE); - case '-': - /* "--" = long option name. */ - optgetname = TRUE; - mca_opt_toggle(); - return (MCA_MORE); - } - } - /* Char was not handled here. */ - return (NO_MCA); + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + if (flag == OPT_NO_TOGGLE) + { + switch (c) + { + case '_': + /* "__" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } else + { + switch (c) + { + case '+': + /* "-+" = UNSET. */ + optflag = no_prompt | ((flag == OPT_UNSET) ? + OPT_TOGGLE : OPT_UNSET); + mca_opt_toggle(); + return (MCA_MORE); + case '!': + /* "-!" = SET */ + optflag = no_prompt | ((flag == OPT_SET) ? + OPT_TOGGLE : OPT_SET); + mca_opt_toggle(); + return (MCA_MORE); + case CONTROL('P'): + optflag ^= OPT_NO_PROMPT; + mca_opt_toggle(); + return (MCA_MORE); + case '-': + /* "--" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } + /* Char was not handled here. */ + return (NO_MCA); } /* * Add a char to a long option name. * See if we've got a match for an option name yet. - * If so, display the complete name and stop + * If so, display the complete name and stop * accepting chars until user hits RETURN. */ - static int + static int mca_opt_nonfirst_char(c) - int c; + int c; { - char *p; - char *oname; - int err; - - if (curropt != NULL) - { - /* - * Already have a match for the name. - * Don't accept anything but erase/kill. - */ - if (is_erase_char(c)) - return (MCA_DONE); - return (MCA_MORE); - } - /* - * Add char to cmd buffer and try to match - * the option name. - */ - if (cmd_char(c) == CC_QUIT) - return (MCA_DONE); - p = get_cmdbuf(); - if (p == NULL) - return (MCA_MORE); - opt_lower = ASCII_IS_LOWER(p[0]); - err = 0; - curropt = findopt_name(&p, &oname, &err); - if (curropt != NULL) - { - /* - * Got a match. - * Remember the option and - * display the full option name. - */ - cmd_reset(); - mca_opt_toggle(); - for (p = oname; *p != '\0'; p++) - { - c = *p; - if (!opt_lower && ASCII_IS_LOWER(c)) - c = ASCII_TO_UPPER(c); - if (cmd_char(c) != CC_OK) - return (MCA_DONE); - } - } else if (err != OPT_AMBIG) - { - bell(); - } - return (MCA_MORE); + char *p; + char *oname; + int err; + + if (curropt != NULL) + { + /* + * Already have a match for the name. + * Don't accept anything but erase/kill. + */ + if (is_erase_char(c)) + return (MCA_DONE); + return (MCA_MORE); + } + /* + * Add char to cmd buffer and try to match + * the option name. + */ + if (cmd_char(c) == CC_QUIT) + return (MCA_DONE); + p = get_cmdbuf(); + if (p == NULL) + return (MCA_MORE); + opt_lower = ASCII_IS_LOWER(p[0]); + err = 0; + curropt = findopt_name(&p, &oname, &err); + if (curropt != NULL) + { + /* + * Got a match. + * Remember the option and + * display the full option name. + */ + cmd_reset(); + mca_opt_toggle(); + for (p = oname; *p != '\0'; p++) + { + c = *p; + if (!opt_lower && ASCII_IS_LOWER(c)) + c = ASCII_TO_UPPER(c); + if (cmd_char(c) != CC_OK) + return (MCA_DONE); + } + } else if (err != OPT_AMBIG) + { + bell(); + } + return (MCA_MORE); } /* * Handle a char of an option toggle command. */ - static int + static int mca_opt_char(c) - int c; + int c; { - PARG parg; - - /* - * This may be a short option (single char), - * or one char of a long option name, - * or one char of the option parameter. - */ - if (curropt == NULL && len_cmdbuf() == 0) - { - int ret = mca_opt_first_char(c); - if (ret != NO_MCA) - return (ret); - } - if (optgetname) - { - /* We're getting a long option name. */ - if (!is_newline_char(c) && c != '=') - return (mca_opt_nonfirst_char(c)); - if (curropt == NULL) - { - parg.p_string = get_cmdbuf(); - if (parg.p_string == NULL) - return (MCA_MORE); - error("There is no --%s option", &parg); - return (MCA_DONE); - } - optgetname = FALSE; - cmd_reset(); - } else - { - if (is_erase_char(c)) - return (NO_MCA); - if (curropt != NULL) - /* We're getting the option parameter. */ - return (NO_MCA); - curropt = findopt(c); - if (curropt == NULL) - { - parg.p_string = propt(c); - error("There is no %s option", &parg); - return (MCA_DONE); - } - opt_lower = ASCII_IS_LOWER(c); - } - /* - * If the option which was entered does not take a - * parameter, toggle the option immediately, - * so user doesn't have to hit RETURN. - */ - if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || - !opt_has_param(curropt)) - { - toggle_option(curropt, opt_lower, "", optflag); - return (MCA_DONE); - } - /* - * Display a prompt appropriate for the option parameter. - */ - start_mca(A_OPT_TOGGLE, opt_prompt(curropt), (void*)NULL, 0); - return (MCA_MORE); + PARG parg; + + /* + * This may be a short option (single char), + * or one char of a long option name, + * or one char of the option parameter. + */ + if (curropt == NULL && len_cmdbuf() == 0) + { + int ret = mca_opt_first_char(c); + if (ret != NO_MCA) + return (ret); + } + if (optgetname) + { + /* We're getting a long option name. */ + if (!is_newline_char(c) && c != '=') + return (mca_opt_nonfirst_char(c)); + if (curropt == NULL) + { + parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); + error("There is no --%s option", &parg); + return (MCA_DONE); + } + optgetname = FALSE; + cmd_reset(); + } else + { + if (is_erase_char(c)) + return (NO_MCA); + if (curropt != NULL) + /* We're getting the option parameter. */ + return (NO_MCA); + curropt = findopt(c); + if (curropt == NULL) + { + parg.p_string = propt(c); + error("There is no %s option", &parg); + return (MCA_DONE); + } + opt_lower = ASCII_IS_LOWER(c); + } + /* + * If the option which was entered does not take a + * parameter, toggle the option immediately, + * so user doesn't have to hit RETURN. + */ + if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || + !opt_has_param(curropt)) + { + toggle_option(curropt, opt_lower, "", optflag); + return (MCA_DONE); + } + /* + * Display a prompt appropriate for the option parameter. + */ + start_mca(A_OPT_TOGGLE, opt_prompt(curropt), (void*)NULL, 0); + return (MCA_MORE); } /* * Normalize search type. */ - public int + public int norm_search_type(st) - int st; + int st; { - /* WRAP and PAST_EOF are mutually exclusive. */ - if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) - st ^= SRCH_PAST_EOF; - return st; + /* WRAP and PAST_EOF are mutually exclusive. */ + if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) + st ^= SRCH_PAST_EOF; + return st; } /* * Handle a char of a search command. */ - static int + static int mca_search_char(c) - int c; + int c; { - int flag = 0; - - /* - * Certain characters as the first char of - * the pattern have special meaning: - * ! Toggle the NO_MATCH flag - * * Toggle the PAST_EOF flag - * @ Toggle the FIRST_FILE flag - */ - if (len_cmdbuf() > 0) - return (NO_MCA); - - switch (c) - { - case CONTROL('E'): /* ignore END of file */ - case '*': - if (mca != A_FILTER) - flag = SRCH_PAST_EOF; - break; - case CONTROL('F'): /* FIRST file */ - case '@': - if (mca != A_FILTER) - flag = SRCH_FIRST_FILE; - break; - case CONTROL('K'): /* KEEP position */ - if (mca != A_FILTER) - flag = SRCH_NO_MOVE; - break; - case CONTROL('W'): /* WRAP around */ - if (mca != A_FILTER) - flag = SRCH_WRAP; - break; - case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ - flag = SRCH_NO_REGEX; - break; - case CONTROL('N'): /* NOT match */ - case '!': - flag = SRCH_NO_MATCH; - break; - } - - if (flag != 0) - { - search_type = norm_search_type(search_type ^ flag); - mca_search(); - return (MCA_MORE); - } - return (NO_MCA); + int flag = 0; + + /* + * Certain characters as the first char of + * the pattern have special meaning: + * ! Toggle the NO_MATCH flag + * * Toggle the PAST_EOF flag + * @ Toggle the FIRST_FILE flag + */ + if (len_cmdbuf() > 0) + return (NO_MCA); + + switch (c) + { + case CONTROL('E'): /* ignore END of file */ + case '*': + if (mca != A_FILTER) + flag = SRCH_PAST_EOF; + break; + case CONTROL('F'): /* FIRST file */ + case '@': + if (mca != A_FILTER) + flag = SRCH_FIRST_FILE; + break; + case CONTROL('K'): /* KEEP position */ + if (mca != A_FILTER) + flag = SRCH_NO_MOVE; + break; + case CONTROL('W'): /* WRAP around */ + if (mca != A_FILTER) + flag = SRCH_WRAP; + break; + case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ + flag = SRCH_NO_REGEX; + break; + case CONTROL('N'): /* NOT match */ + case '!': + flag = SRCH_NO_MATCH; + break; + } + + if (flag != 0) + { + search_type = norm_search_type(search_type ^ flag); + mca_search(); + return (MCA_MORE); + } + return (NO_MCA); } /* * Handle a character of a multi-character command. */ - static int + static int mca_char(c) - int c; + int c; { - int ret; - - switch (mca) - { - case 0: - /* - * We're not in a multicharacter command. - */ - return (NO_MCA); - - case A_PREFIX: - /* - * In the prefix of a command. - * This not considered a multichar command - * (even tho it uses cmdbuf, etc.). - * It is handled in the commands() switch. - */ - return (NO_MCA); - - case A_DIGIT: - /* - * Entering digits of a number. - * Terminated by a non-digit. - */ - if ((c >= '0' && c <= '9') || c == '.') - break; - switch (editchar(c, ECF_PEEK|ECF_NOHISTORY|ECF_NOCOMPLETE|ECF_NORIGHTLEFT)) - { - case A_NOACTION: - /* - * Ignore this char and get another one. - */ - return (MCA_MORE); - case A_INVALID: - /* - * Not part of the number. - * End the number and treat this char - * as a normal command character. - */ - number = cmd_int(&fraction); - clear_mca(); - cmd_accept(); - return (NO_MCA); - } - break; - - case A_OPT_TOGGLE: - ret = mca_opt_char(c); - if (ret != NO_MCA) - return (ret); - break; - - case A_F_SEARCH: - case A_B_SEARCH: - case A_FILTER: - ret = mca_search_char(c); - if (ret != NO_MCA) - return (ret); - break; - - default: - /* Other multicharacter command. */ - break; - } - - /* - * The multichar command is terminated by a newline. - */ - if (is_newline_char(c)) - { - /* - * Execute the command. - */ - exec_mca(); - return (MCA_DONE); - } - - /* - * Append the char to the command buffer. - */ - if (cmd_char(c) == CC_QUIT) - /* - * Abort the multi-char command. - */ - return (MCA_DONE); - - switch (mca) - { - case A_F_BRACKET: - case A_B_BRACKET: - if (len_cmdbuf() >= 2) - { - /* - * Special case for the bracket-matching commands. - * Execute the command after getting exactly two - * characters from the user. - */ - exec_mca(); - return (MCA_DONE); - } - break; - case A_F_SEARCH: - case A_B_SEARCH: - if (incr_search) - { - /* Incremental search: do a search after every input char. */ - int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP)); - char *pattern = get_cmdbuf(); - if (pattern == NULL) - return (MCA_MORE); - /* - * Must save updown_match because mca_search - * reinits it. That breaks history scrolling. - * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} - */ - int save_updown_match = updown_match; - cmd_exec(); - if (*pattern == '\0') - { - /* User has backspaced to an empty pattern. */ - undo_search(1); - } else - { - if (search(st | SRCH_INCR, pattern, 1) != 0) - /* No match, invalid pattern, etc. */ - undo_search(1); - } - /* Redraw the search prompt and search string. */ - mca_search1(); - updown_match = save_updown_match; - cmd_repaint(NULL); - } - break; - } - - /* - * Need another character. - */ - return (MCA_MORE); + int ret; + + switch (mca) + { + case 0: + /* + * We're not in a multicharacter command. + */ + return (NO_MCA); + + case A_PREFIX: + /* + * In the prefix of a command. + * This not considered a multichar command + * (even tho it uses cmdbuf, etc.). + * It is handled in the commands() switch. + */ + return (NO_MCA); + + case A_DIGIT: + /* + * Entering digits of a number. + * Terminated by a non-digit. + */ + if ((c >= '0' && c <= '9') || c == '.') + break; + switch (editchar(c, ECF_PEEK|ECF_NOHISTORY|ECF_NOCOMPLETE|ECF_NORIGHTLEFT)) + { + case A_NOACTION: + /* + * Ignore this char and get another one. + */ + return (MCA_MORE); + case A_INVALID: + /* + * Not part of the number. + * End the number and treat this char + * as a normal command character. + */ + number = cmd_int(&fraction); + clear_mca(); + cmd_accept(); + return (NO_MCA); + } + break; + + case A_OPT_TOGGLE: + ret = mca_opt_char(c); + if (ret != NO_MCA) + return (ret); + break; + + case A_F_SEARCH: + case A_B_SEARCH: + case A_FILTER: + ret = mca_search_char(c); + if (ret != NO_MCA) + return (ret); + break; + + default: + /* Other multicharacter command. */ + break; + } + + /* + * The multichar command is terminated by a newline. + */ + if (is_newline_char(c)) + { + /* + * Execute the command. + */ + exec_mca(); + return (MCA_DONE); + } + + /* + * Append the char to the command buffer. + */ + if (cmd_char(c) == CC_QUIT) + /* + * Abort the multi-char command. + */ + return (MCA_DONE); + + switch (mca) + { + case A_F_BRACKET: + case A_B_BRACKET: + if (len_cmdbuf() >= 2) + { + /* + * Special case for the bracket-matching commands. + * Execute the command after getting exactly two + * characters from the user. + */ + exec_mca(); + return (MCA_DONE); + } + break; + case A_F_SEARCH: + case A_B_SEARCH: + if (incr_search) + { + /* Incremental search: do a search after every input char. */ + int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP)); + char *pattern = get_cmdbuf(); + if (pattern == NULL) + return (MCA_MORE); + /* + * Must save updown_match because mca_search + * reinits it. That breaks history scrolling. + * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} + */ + int save_updown_match = updown_match; + cmd_exec(); + if (*pattern == '\0') + { + /* User has backspaced to an empty pattern. */ + undo_search(1); + } else + { + if (search(st | SRCH_INCR, pattern, 1) != 0) + /* No match, invalid pattern, etc. */ + undo_search(1); + } + /* Redraw the search prompt and search string. */ + mca_search1(); + updown_match = save_updown_match; + cmd_repaint(NULL); + } + break; + } + + /* + * Need another character. + */ + return (MCA_MORE); } /* * Discard any buffered file data. */ - static void + static void clear_buffers(VOID_PARAM) { - if (!(ch_getflags() & CH_CANSEEK)) - return; - ch_flush(); - clr_linenum(); + if (!(ch_getflags() & CH_CANSEEK)) + return; + ch_flush(); + clr_linenum(); #if HILITE_SEARCH - clr_hilite(); + clr_hilite(); #endif } /* * Make sure the screen is displayed. */ - static void + static void make_display(VOID_PARAM) { - /* - * If nothing is displayed yet, display starting from initial_scrpos. - */ - if (empty_screen()) - { - if (initial_scrpos.pos == NULL_POSITION) - jump_loc(ch_zero(), 1); - else - jump_loc(initial_scrpos.pos, initial_scrpos.ln); - } else if (screen_trashed) - { - int save_top_scroll = top_scroll; - int save_ignore_eoi = ignore_eoi; - top_scroll = 1; - ignore_eoi = 0; - if (screen_trashed == 2) - { - /* Special case used by ignore_eoi: re-open the input file - * and jump to the end of the file. */ - reopen_curr_ifile(); - jump_forw(); - } - repaint(); - top_scroll = save_top_scroll; - ignore_eoi = save_ignore_eoi; - } + /* + * If nothing is displayed yet, display starting from initial_scrpos. + */ + if (empty_screen()) + { + if (initial_scrpos.pos == NULL_POSITION) + jump_loc(ch_zero(), 1); + else + jump_loc(initial_scrpos.pos, initial_scrpos.ln); + } else if (screen_trashed) + { + int save_top_scroll = top_scroll; + int save_ignore_eoi = ignore_eoi; + top_scroll = 1; + ignore_eoi = 0; + if (screen_trashed == 2) + { + /* Special case used by ignore_eoi: re-open the input file + * and jump to the end of the file. */ + reopen_curr_ifile(); + jump_forw(); + } + repaint(); + top_scroll = save_top_scroll; + ignore_eoi = save_ignore_eoi; + } } /* * Display the appropriate prompt. */ - static void + static void prompt(VOID_PARAM) { - constant char *p; - - if (ungot != NULL && ungot->ug_char != CHAR_END_COMMAND) - { - /* - * No prompt necessary if commands are from - * ungotten chars rather than from the user. - */ - return; - } - - /* - * Make sure the screen is displayed. - */ - make_display(); - bottompos = position(BOTTOM_PLUS_ONE); - - /* - * If we've hit EOF on the last file and the -E flag is set, quit. - */ - if (get_quit_at_eof() == OPT_ONPLUS && - eof_displayed() && !(ch_getflags() & CH_HELPFILE) && - next_ifile(curr_ifile) == NULL_IFILE) - quit(QUIT_OK); - - /* - * If the entire file is displayed and the -F flag is set, quit. - */ - if (quit_if_one_screen && - entire_file_displayed() && !(ch_getflags() & CH_HELPFILE) && - next_ifile(curr_ifile) == NULL_IFILE) - quit(QUIT_OK); - quit_if_one_screen = FALSE; /* only get one chance at this */ + constant char *p; + + if (ungot != NULL && ungot->ug_char != CHAR_END_COMMAND) + { + /* + * No prompt necessary if commands are from + * ungotten chars rather than from the user. + */ + return; + } + + /* + * Make sure the screen is displayed. + */ + make_display(); + bottompos = position(BOTTOM_PLUS_ONE); + + /* + * If we've hit EOF on the last file and the -E flag is set, quit. + */ + if (get_quit_at_eof() == OPT_ONPLUS && + eof_displayed() && !(ch_getflags() & CH_HELPFILE) && + next_ifile(curr_ifile) == NULL_IFILE) + quit(QUIT_OK); + + /* + * If the entire file is displayed and the -F flag is set, quit. + */ + if (quit_if_one_screen && + entire_file_displayed() && !(ch_getflags() & CH_HELPFILE) && + next_ifile(curr_ifile) == NULL_IFILE) + quit(QUIT_OK); + quit_if_one_screen = FALSE; /* only get one chance at this */ #if MSDOS_COMPILER==WIN32C - /* - * In Win32, display the file name in the window title. - */ - if (!(ch_getflags() & CH_HELPFILE)) - { - WCHAR w[MAX_PATH+16]; - p = pr_expand("Less?f - %f."); - MultiByteToWideChar(CP_ACP, 0, p, -1, w, sizeof(w)/sizeof(*w)); - SetConsoleTitleW(w); - } + /* + * In Win32, display the file name in the window title. + */ + if (!(ch_getflags() & CH_HELPFILE)) + { + WCHAR w[MAX_PATH+16]; + p = pr_expand("Less?f - %f."); + MultiByteToWideChar(CP_ACP, 0, p, -1, w, sizeof(w)/sizeof(*w)); + SetConsoleTitleW(w); + } #endif - /* - * Select the proper prompt and display it. - */ - /* - * If the previous action was a forward movement, - * don't clear the bottom line of the display; - * just print the prompt since the forward movement guarantees - * that we're in the right position to display the prompt. - * Clearing the line could cause a problem: for example, if the last - * line displayed ended at the right screen edge without a newline, - * then clearing would clear the last displayed line rather than - * the prompt line. - */ - if (!forw_prompt) - clear_bot(); - clear_cmd(); - forw_prompt = 0; - p = pr_string(); + /* + * Select the proper prompt and display it. + */ + /* + * If the previous action was a forward movement, + * don't clear the bottom line of the display; + * just print the prompt since the forward movement guarantees + * that we're in the right position to display the prompt. + * Clearing the line could cause a problem: for example, if the last + * line displayed ended at the right screen edge without a newline, + * then clearing would clear the last displayed line rather than + * the prompt line. + */ + if (!forw_prompt) + clear_bot(); + clear_cmd(); + forw_prompt = 0; + p = pr_string(); #if HILITE_SEARCH - if (is_filtering()) - putstr("& "); + if (is_filtering()) + putstr("& "); #endif - if (p == NULL || *p == '\0') - { - at_enter(AT_NORMAL|AT_COLOR_PROMPT); - putchr(':'); - at_exit(); - } else - { + if (p == NULL || *p == '\0') + { + at_enter(AT_NORMAL|AT_COLOR_PROMPT); + putchr(':'); + at_exit(); + } else + { #if MSDOS_COMPILER==WIN32C - WCHAR w[MAX_PATH*2]; - char a[MAX_PATH*2]; - MultiByteToWideChar(CP_ACP, 0, p, -1, w, sizeof(w)/sizeof(*w)); - WideCharToMultiByte(utf_mode ? CP_UTF8 : GetConsoleOutputCP(), - 0, w, -1, a, sizeof(a), NULL, NULL); - p = a; + WCHAR w[MAX_PATH*2]; + char a[MAX_PATH*2]; + MultiByteToWideChar(CP_ACP, 0, p, -1, w, sizeof(w)/sizeof(*w)); + WideCharToMultiByte(utf_mode ? CP_UTF8 : GetConsoleOutputCP(), + 0, w, -1, a, sizeof(a), NULL, NULL); + p = a; #endif - load_line(p); - put_line(); - } - clear_eol(); + load_line(p); + put_line(); + } + clear_eol(); } /* * Display the less version message. */ - public void + public void dispversion(VOID_PARAM) { - PARG parg; + PARG parg; - parg.p_string = version; - error("less %s", &parg); + parg.p_string = version; + error("less %s", &parg); } /* * Return a character to complete a partial command, if possible. */ - static LWCHAR + static LWCHAR getcc_end_command(VOID_PARAM) { - switch (mca) - { - case A_DIGIT: - /* We have a number but no command. Treat as #g. */ - return ('g'); - case A_F_SEARCH: - case A_B_SEARCH: - /* We have "/string" but no newline. Add the \n. */ - return ('\n'); - default: - /* Some other incomplete command. Let user complete it. */ - return ((ungot == NULL) ? getchr() : 0); - } + switch (mca) + { + case A_DIGIT: + /* We have a number but no command. Treat as #g. */ + return ('g'); + case A_F_SEARCH: + case A_B_SEARCH: + /* We have "/string" but no newline. Add the \n. */ + return ('\n'); + default: + /* Some other incomplete command. Let user complete it. */ + return ((ungot == NULL) ? getchr() : 0); + } } /* @@ -925,146 +925,146 @@ getcc_end_command(VOID_PARAM) * but may come from ungotten characters * (characters previously given to ungetcc or ungetsc). */ - static LWCHAR + static LWCHAR getccu(VOID_PARAM) { - LWCHAR c = 0; - while (c == 0) - { - if (ungot == NULL) - { - /* Normal case: no ungotten chars. - * Get char from the user. */ - c = getchr(); - } else - { - /* Ungotten chars available: - * Take the top of stack (most recent). */ - struct ungot *ug = ungot; - c = ug->ug_char; - ungot = ug->ug_next; - free(ug); - - if (c == CHAR_END_COMMAND) - c = getcc_end_command(); - } - } - return (c); + LWCHAR c = 0; + while (c == 0) + { + if (ungot == NULL) + { + /* Normal case: no ungotten chars. + * Get char from the user. */ + c = getchr(); + } else + { + /* Ungotten chars available: + * Take the top of stack (most recent). */ + struct ungot *ug = ungot; + c = ug->ug_char; + ungot = ug->ug_next; + free(ug); + + if (c == CHAR_END_COMMAND) + c = getcc_end_command(); + } + } + return (c); } /* * Get a command character, but if we receive the orig sequence, * convert it to the repl sequence. */ - static LWCHAR + static LWCHAR getcc_repl(orig, repl, gr_getc, gr_ungetc) - char constant* orig; - char constant* repl; - LWCHAR (*gr_getc)(VOID_PARAM); - void (*gr_ungetc)(LWCHAR); + char constant* orig; + char constant* repl; + LWCHAR (*gr_getc)(VOID_PARAM); + void (*gr_ungetc)(LWCHAR); { - LWCHAR c; - LWCHAR keys[16]; - int ki = 0; - - c = (*gr_getc)(); - if (orig == NULL || orig[0] == '\0') - return c; - for (;;) - { - keys[ki] = c; - if (c != orig[ki] || ki >= sizeof(keys)-1) - { - /* This is not orig we have been receiving. - * If we have stashed chars in keys[], - * unget them and return the first one. */ - while (ki > 0) - (*gr_ungetc)(keys[ki--]); - return keys[0]; - } - if (orig[++ki] == '\0') - { - /* We've received the full orig sequence. - * Return the repl sequence. */ - ki = strlen(repl)-1; - while (ki > 0) - (*gr_ungetc)(repl[ki--]); - return repl[0]; - } - /* We've received a partial orig sequence (ki chars of it). - * Get next char and see if it continues to match orig. */ - c = (*gr_getc)(); - } + LWCHAR c; + LWCHAR keys[16]; + int ki = 0; + + c = (*gr_getc)(); + if (orig == NULL || orig[0] == '\0') + return c; + for (;;) + { + keys[ki] = c; + if (c != orig[ki] || ki >= sizeof(keys)-1) + { + /* This is not orig we have been receiving. + * If we have stashed chars in keys[], + * unget them and return the first one. */ + while (ki > 0) + (*gr_ungetc)(keys[ki--]); + return keys[0]; + } + if (orig[++ki] == '\0') + { + /* We've received the full orig sequence. + * Return the repl sequence. */ + ki = strlen(repl)-1; + while (ki > 0) + (*gr_ungetc)(repl[ki--]); + return repl[0]; + } + /* We've received a partial orig sequence (ki chars of it). + * Get next char and see if it continues to match orig. */ + c = (*gr_getc)(); + } } /* * Get command character. */ - public int + public int getcc(VOID_PARAM) { - /* Replace kent (keypad Enter) with a newline. */ - return getcc_repl(kent, "\n", getccu, ungetcc); + /* Replace kent (keypad Enter) with a newline. */ + return getcc_repl(kent, "\n", getccu, ungetcc); } /* * "Unget" a command character. * The next getcc() will return this character. */ - public void + public void ungetcc(c) - LWCHAR c; + LWCHAR c; { - struct ungot *ug = (struct ungot *) ecalloc(1, sizeof(struct ungot)); + struct ungot *ug = (struct ungot *) ecalloc(1, sizeof(struct ungot)); - ug->ug_char = c; - ug->ug_next = ungot; - ungot = ug; + ug->ug_char = c; + ug->ug_next = ungot; + ungot = ug; } /* * "Unget" a command character. * If any other chars are already ungotten, put this one after those. */ - public void + public void ungetcc_back(c) - LWCHAR c; + LWCHAR c; { - struct ungot *ug = (struct ungot *) ecalloc(1, sizeof(struct ungot)); - ug->ug_char = c; - ug->ug_next = NULL; - if (ungot == NULL) - ungot = ug; - else - { - struct ungot *pu; - for (pu = ungot; pu->ug_next != NULL; pu = pu->ug_next) - continue; - pu->ug_next = ug; - } + struct ungot *ug = (struct ungot *) ecalloc(1, sizeof(struct ungot)); + ug->ug_char = c; + ug->ug_next = NULL; + if (ungot == NULL) + ungot = ug; + else + { + struct ungot *pu; + for (pu = ungot; pu->ug_next != NULL; pu = pu->ug_next) + continue; + pu->ug_next = ug; + } } /* * Unget a whole string of command characters. * The next sequence of getcc()'s will return this string. */ - public void + public void ungetsc(s) - char *s; + char *s; { - while (*s != '\0') - ungetcc_back(*s++); + while (*s != '\0') + ungetcc_back(*s++); } /* * Peek the next command character, without consuming it. */ - public LWCHAR + public LWCHAR peekcc(VOID_PARAM) { - LWCHAR c = getcc(); - ungetcc(c); - return c; + LWCHAR c = getcc(); + ungetcc(c); + return c; } /* @@ -1072,1022 +1072,1022 @@ peekcc(VOID_PARAM) * If SRCH_FIRST_FILE is set, begin searching at the first file. * If SRCH_PAST_EOF is set, continue the search thru multiple files. */ - static void + static void multi_search(pattern, n, silent) - char *pattern; - int n; - int silent; + char *pattern; + int n; + int silent; { - int nomore; - IFILE save_ifile; - int changed_file; - - changed_file = 0; - save_ifile = save_curr_ifile(); - - if (search_type & SRCH_FIRST_FILE) - { - /* - * Start at the first (or last) file - * in the command line list. - */ - if (search_type & SRCH_FORW) - nomore = edit_first(); - else - nomore = edit_last(); - if (nomore) - { - unsave_ifile(save_ifile); - return; - } - changed_file = 1; - search_type &= ~SRCH_FIRST_FILE; - } - - for (;;) - { - n = search(search_type, pattern, n); - /* - * The SRCH_NO_MOVE flag doesn't "stick": it gets cleared - * after being used once. This allows "n" to work after - * using a /@@ search. - */ - search_type &= ~SRCH_NO_MOVE; - if (n == 0) - { - /* - * Found it. - */ - unsave_ifile(save_ifile); - return; - } - - if (n < 0) - /* - * Some kind of error in the search. - * Error message has been printed by search(). - */ - break; - - if ((search_type & SRCH_PAST_EOF) == 0) - /* - * We didn't find a match, but we're - * supposed to search only one file. - */ - break; - /* - * Move on to the next file. - */ - if (search_type & SRCH_FORW) - nomore = edit_next(1); - else - nomore = edit_prev(1); - if (nomore) - break; - changed_file = 1; - } - - /* - * Didn't find it. - * Print an error message if we haven't already. - */ - if (n > 0 && !silent) - error("Pattern not found", NULL_PARG); - - if (changed_file) - { - /* - * Restore the file we were originally viewing. - */ - reedit_ifile(save_ifile); - } else - { - unsave_ifile(save_ifile); - } + int nomore; + IFILE save_ifile; + int changed_file; + + changed_file = 0; + save_ifile = save_curr_ifile(); + + if (search_type & SRCH_FIRST_FILE) + { + /* + * Start at the first (or last) file + * in the command line list. + */ + if (search_type & SRCH_FORW) + nomore = edit_first(); + else + nomore = edit_last(); + if (nomore) + { + unsave_ifile(save_ifile); + return; + } + changed_file = 1; + search_type &= ~SRCH_FIRST_FILE; + } + + for (;;) + { + n = search(search_type, pattern, n); + /* + * The SRCH_NO_MOVE flag doesn't "stick": it gets cleared + * after being used once. This allows "n" to work after + * using a /@@ search. + */ + search_type &= ~SRCH_NO_MOVE; + if (n == 0) + { + /* + * Found it. + */ + unsave_ifile(save_ifile); + return; + } + + if (n < 0) + /* + * Some kind of error in the search. + * Error message has been printed by search(). + */ + break; + + if ((search_type & SRCH_PAST_EOF) == 0) + /* + * We didn't find a match, but we're + * supposed to search only one file. + */ + break; + /* + * Move on to the next file. + */ + if (search_type & SRCH_FORW) + nomore = edit_next(1); + else + nomore = edit_prev(1); + if (nomore) + break; + changed_file = 1; + } + + /* + * Didn't find it. + * Print an error message if we haven't already. + */ + if (n > 0 && !silent) + error("Pattern not found", NULL_PARG); + + if (changed_file) + { + /* + * Restore the file we were originally viewing. + */ + reedit_ifile(save_ifile); + } else + { + unsave_ifile(save_ifile); + } } /* * Forward forever, or until a highlighted line appears. */ - static int + static int forw_loop(until_hilite) - int until_hilite; + int until_hilite; { - POSITION curr_len; - - if (ch_getflags() & CH_HELPFILE) - return (A_NOACTION); - - cmd_exec(); - jump_forw_buffered(); - curr_len = ch_length(); - highest_hilite = until_hilite ? curr_len : NULL_POSITION; - ignore_eoi = 1; - while (!sigs) - { - if (until_hilite && highest_hilite > curr_len) - { - bell(); - break; - } - make_display(); - forward(1, 0, 0); - } - ignore_eoi = 0; - ch_set_eof(); - - /* - * This gets us back in "F mode" after processing - * a non-abort signal (e.g. window-change). - */ - if (sigs && !ABORT_SIGS()) - return (until_hilite ? A_F_UNTIL_HILITE : A_F_FOREVER); - - return (A_NOACTION); + POSITION curr_len; + + if (ch_getflags() & CH_HELPFILE) + return (A_NOACTION); + + cmd_exec(); + jump_forw_buffered(); + curr_len = ch_length(); + highest_hilite = until_hilite ? curr_len : NULL_POSITION; + ignore_eoi = 1; + while (!sigs) + { + if (until_hilite && highest_hilite > curr_len) + { + bell(); + break; + } + make_display(); + forward(1, 0, 0); + } + ignore_eoi = 0; + ch_set_eof(); + + /* + * This gets us back in "F mode" after processing + * a non-abort signal (e.g. window-change). + */ + if (sigs && !ABORT_SIGS()) + return (until_hilite ? A_F_UNTIL_HILITE : A_F_FOREVER); + + return (A_NOACTION); } /* * Main command processor. * Accept and execute commands until a quit command. */ - public void + public void commands(VOID_PARAM) { - int c; - int action; - char *cbuf; - int newaction; - int save_jump_sline; - int save_search_type; - char *extra; - char tbuf[2]; - PARG parg; - IFILE old_ifile; - IFILE new_ifile; - char *tagfile; - - search_type = SRCH_FORW; - wscroll = (sc_height + 1) / 2; - newaction = A_NOACTION; - - for (;;) - { - clear_mca(); - cmd_accept(); - number = 0; - curropt = NULL; - - /* - * See if any signals need processing. - */ - if (sigs) - { - psignals(); - if (quitting) - quit(QUIT_SAVED_STATUS); - } - - /* - * See if window size changed, for systems that don't - * generate SIGWINCH. - */ - check_winch(); - - /* - * Display prompt and accept a character. - */ - cmd_reset(); - prompt(); - if (sigs) - continue; - if (newaction == A_NOACTION) - c = getcc(); - - again: - if (sigs) - continue; - - if (newaction != A_NOACTION) - { - action = newaction; - newaction = A_NOACTION; - } else - { - /* - * If we are in a multicharacter command, call mca_char. - * Otherwise we call fcmd_decode to determine the - * action to be performed. - */ - if (mca) - switch (mca_char(c)) - { - case MCA_MORE: - /* - * Need another character. - */ - c = getcc(); - goto again; - case MCA_DONE: - /* - * Command has been handled by mca_char. - * Start clean with a prompt. - */ - continue; - case NO_MCA: - /* - * Not a multi-char command - * (at least, not anymore). - */ - break; - } - - /* - * Decode the command character and decide what to do. - */ - if (mca) - { - /* - * We're in a multichar command. - * Add the character to the command buffer - * and display it on the screen. - * If the user backspaces past the start - * of the line, abort the command. - */ - if (cmd_char(c) == CC_QUIT || len_cmdbuf() == 0) - continue; - cbuf = get_cmdbuf(); - if (cbuf == NULL) - continue; - } else - { - /* - * Don't use cmd_char if we're starting fresh - * at the beginning of a command, because we - * don't want to echo the command until we know - * it is a multichar command. We also don't - * want erase_char/kill_char to be treated - * as line editing characters. - */ - tbuf[0] = c; - tbuf[1] = '\0'; - cbuf = tbuf; - } - extra = NULL; - action = fcmd_decode(cbuf, &extra); - /* - * If an "extra" string was returned, - * process it as a string of command characters. - */ - if (extra != NULL) - ungetsc(extra); - } - /* - * Clear the cmdbuf string. - * (But not if we're in the prefix of a command, - * because the partial command string is kept there.) - */ - if (action != A_PREFIX) - cmd_reset(); - - switch (action) - { - case A_DIGIT: - /* - * First digit of a number. - */ - start_mca(A_DIGIT, ":", (void*)NULL, CF_QUIT_ON_ERASE); - goto again; - - case A_F_WINDOW: - /* - * Forward one window (and set the window size). - */ - if (number > 0) - swindow = (int) number; - /* FALLTHRU */ - case A_F_SCREEN: - /* - * Forward one screen. - */ - if (number <= 0) - number = get_swindow(); - cmd_exec(); - if (show_attn) - set_attnpos(bottompos); - forward((int) number, 0, 1); - break; - - case A_B_WINDOW: - /* - * Backward one window (and set the window size). - */ - if (number > 0) - swindow = (int) number; - /* FALLTHRU */ - case A_B_SCREEN: - /* - * Backward one screen. - */ - if (number <= 0) - number = get_swindow(); - cmd_exec(); - backward((int) number, 0, 1); - break; - - case A_F_LINE: - /* - * Forward N (default 1) line. - */ - if (number <= 0) - number = 1; - cmd_exec(); - if (show_attn == OPT_ONPLUS && number > 1) - set_attnpos(bottompos); - forward((int) number, 0, 0); - break; - - case A_B_LINE: - /* - * Backward N (default 1) line. - */ - if (number <= 0) - number = 1; - cmd_exec(); - backward((int) number, 0, 0); - break; - - case A_F_MOUSE: - /* - * Forward wheel_lines lines. - */ - cmd_exec(); - forward(wheel_lines, 0, 0); - break; - - case A_B_MOUSE: - /* - * Backward wheel_lines lines. - */ - cmd_exec(); - backward(wheel_lines, 0, 0); - break; - - case A_FF_LINE: - /* - * Force forward N (default 1) line. - */ - if (number <= 0) - number = 1; - cmd_exec(); - if (show_attn == OPT_ONPLUS && number > 1) - set_attnpos(bottompos); - forward((int) number, 1, 0); - break; - - case A_BF_LINE: - /* - * Force backward N (default 1) line. - */ - if (number <= 0) - number = 1; - cmd_exec(); - backward((int) number, 1, 0); - break; - - case A_FF_SCREEN: - /* - * Force forward one screen. - */ - if (number <= 0) - number = get_swindow(); - cmd_exec(); - if (show_attn == OPT_ONPLUS) - set_attnpos(bottompos); - forward((int) number, 1, 0); - break; - - case A_F_FOREVER: - /* - * Forward forever, ignoring EOF. - */ - if (show_attn) - set_attnpos(bottompos); - newaction = forw_loop(0); - break; - - case A_F_UNTIL_HILITE: - newaction = forw_loop(1); - break; - - case A_F_SCROLL: - /* - * Forward N lines - * (default same as last 'd' or 'u' command). - */ - if (number > 0) - wscroll = (int) number; - cmd_exec(); - if (show_attn == OPT_ONPLUS) - set_attnpos(bottompos); - forward(wscroll, 0, 0); - break; - - case A_B_SCROLL: - /* - * Forward N lines - * (default same as last 'd' or 'u' command). - */ - if (number > 0) - wscroll = (int) number; - cmd_exec(); - backward(wscroll, 0, 0); - break; - - case A_FREPAINT: - /* - * Flush buffers, then repaint screen. - * Don't flush the buffers on a pipe! - */ - clear_buffers(); - /* FALLTHRU */ - case A_REPAINT: - /* - * Repaint screen. - */ - cmd_exec(); - repaint(); - break; - - case A_GOLINE: - /* - * Go to line N, default beginning of file. - * If N <= 0, ignore jump_sline in order to avoid - * empty lines before the beginning of the file. - */ - save_jump_sline = jump_sline; - if (number <= 0) - { - number = 1; - jump_sline = 0; - } - cmd_exec(); - jump_back(number); - jump_sline = save_jump_sline; - break; - - case A_PERCENT: - /* - * Go to a specified percentage into the file. - */ - if (number < 0) - { - number = 0; - fraction = 0; - } - if (number > 100 || (number == 100 && fraction != 0)) - { - number = 100; - fraction = 0; - } - cmd_exec(); - jump_percent((int) number, fraction); - break; - - case A_GOEND: - /* - * Go to line N, default end of file. - */ - cmd_exec(); - if (number <= 0) - jump_forw(); - else - jump_back(number); - break; - - case A_GOEND_BUF: - /* - * Go to line N, default last buffered byte. - */ - cmd_exec(); - if (number <= 0) - jump_forw_buffered(); - else - jump_back(number); - break; - - case A_GOPOS: - /* - * Go to a specified byte position in the file. - */ - cmd_exec(); - if (number < 0) - number = 0; - jump_line_loc((POSITION) number, jump_sline); - break; - - case A_STAT: - /* - * Print file name, etc. - */ - if (ch_getflags() & CH_HELPFILE) - break; - cmd_exec(); - parg.p_string = eq_message(); - error("%s", &parg); - break; - - case A_VERSION: - /* - * Print version number. - */ - cmd_exec(); - dispversion(); - break; - - case A_QUIT: - /* - * Exit. - */ - if (curr_ifile != NULL_IFILE && - ch_getflags() & CH_HELPFILE) - { - /* - * Quit while viewing the help file - * just means return to viewing the - * previous file. - */ - hshift = save_hshift; - bs_mode = save_bs_mode; - if (edit_prev(1) == 0) - break; - } - if (extra != NULL) - quit(*extra); - quit(QUIT_OK); - break; + int c; + int action; + char *cbuf; + int newaction; + int save_jump_sline; + int save_search_type; + char *extra; + char tbuf[2]; + PARG parg; + IFILE old_ifile; + IFILE new_ifile; + char *tagfile; + + search_type = SRCH_FORW; + wscroll = (sc_height + 1) / 2; + newaction = A_NOACTION; + + for (;;) + { + clear_mca(); + cmd_accept(); + number = 0; + curropt = NULL; + + /* + * See if any signals need processing. + */ + if (sigs) + { + psignals(); + if (quitting) + quit(QUIT_SAVED_STATUS); + } + + /* + * See if window size changed, for systems that don't + * generate SIGWINCH. + */ + check_winch(); + + /* + * Display prompt and accept a character. + */ + cmd_reset(); + prompt(); + if (sigs) + continue; + if (newaction == A_NOACTION) + c = getcc(); + + again: + if (sigs) + continue; + + if (newaction != A_NOACTION) + { + action = newaction; + newaction = A_NOACTION; + } else + { + /* + * If we are in a multicharacter command, call mca_char. + * Otherwise we call fcmd_decode to determine the + * action to be performed. + */ + if (mca) + switch (mca_char(c)) + { + case MCA_MORE: + /* + * Need another character. + */ + c = getcc(); + goto again; + case MCA_DONE: + /* + * Command has been handled by mca_char. + * Start clean with a prompt. + */ + continue; + case NO_MCA: + /* + * Not a multi-char command + * (at least, not anymore). + */ + break; + } + + /* + * Decode the command character and decide what to do. + */ + if (mca) + { + /* + * We're in a multichar command. + * Add the character to the command buffer + * and display it on the screen. + * If the user backspaces past the start + * of the line, abort the command. + */ + if (cmd_char(c) == CC_QUIT || len_cmdbuf() == 0) + continue; + cbuf = get_cmdbuf(); + if (cbuf == NULL) + continue; + } else + { + /* + * Don't use cmd_char if we're starting fresh + * at the beginning of a command, because we + * don't want to echo the command until we know + * it is a multichar command. We also don't + * want erase_char/kill_char to be treated + * as line editing characters. + */ + tbuf[0] = c; + tbuf[1] = '\0'; + cbuf = tbuf; + } + extra = NULL; + action = fcmd_decode(cbuf, &extra); + /* + * If an "extra" string was returned, + * process it as a string of command characters. + */ + if (extra != NULL) + ungetsc(extra); + } + /* + * Clear the cmdbuf string. + * (But not if we're in the prefix of a command, + * because the partial command string is kept there.) + */ + if (action != A_PREFIX) + cmd_reset(); + + switch (action) + { + case A_DIGIT: + /* + * First digit of a number. + */ + start_mca(A_DIGIT, ":", (void*)NULL, CF_QUIT_ON_ERASE); + goto again; + + case A_F_WINDOW: + /* + * Forward one window (and set the window size). + */ + if (number > 0) + swindow = (int) number; + /* FALLTHRU */ + case A_F_SCREEN: + /* + * Forward one screen. + */ + if (number <= 0) + number = get_swindow(); + cmd_exec(); + if (show_attn) + set_attnpos(bottompos); + forward((int) number, 0, 1); + break; + + case A_B_WINDOW: + /* + * Backward one window (and set the window size). + */ + if (number > 0) + swindow = (int) number; + /* FALLTHRU */ + case A_B_SCREEN: + /* + * Backward one screen. + */ + if (number <= 0) + number = get_swindow(); + cmd_exec(); + backward((int) number, 0, 1); + break; + + case A_F_LINE: + /* + * Forward N (default 1) line. + */ + if (number <= 0) + number = 1; + cmd_exec(); + if (show_attn == OPT_ONPLUS && number > 1) + set_attnpos(bottompos); + forward((int) number, 0, 0); + break; + + case A_B_LINE: + /* + * Backward N (default 1) line. + */ + if (number <= 0) + number = 1; + cmd_exec(); + backward((int) number, 0, 0); + break; + + case A_F_MOUSE: + /* + * Forward wheel_lines lines. + */ + cmd_exec(); + forward(wheel_lines, 0, 0); + break; + + case A_B_MOUSE: + /* + * Backward wheel_lines lines. + */ + cmd_exec(); + backward(wheel_lines, 0, 0); + break; + + case A_FF_LINE: + /* + * Force forward N (default 1) line. + */ + if (number <= 0) + number = 1; + cmd_exec(); + if (show_attn == OPT_ONPLUS && number > 1) + set_attnpos(bottompos); + forward((int) number, 1, 0); + break; + + case A_BF_LINE: + /* + * Force backward N (default 1) line. + */ + if (number <= 0) + number = 1; + cmd_exec(); + backward((int) number, 1, 0); + break; + + case A_FF_SCREEN: + /* + * Force forward one screen. + */ + if (number <= 0) + number = get_swindow(); + cmd_exec(); + if (show_attn == OPT_ONPLUS) + set_attnpos(bottompos); + forward((int) number, 1, 0); + break; + + case A_F_FOREVER: + /* + * Forward forever, ignoring EOF. + */ + if (show_attn) + set_attnpos(bottompos); + newaction = forw_loop(0); + break; + + case A_F_UNTIL_HILITE: + newaction = forw_loop(1); + break; + + case A_F_SCROLL: + /* + * Forward N lines + * (default same as last 'd' or 'u' command). + */ + if (number > 0) + wscroll = (int) number; + cmd_exec(); + if (show_attn == OPT_ONPLUS) + set_attnpos(bottompos); + forward(wscroll, 0, 0); + break; + + case A_B_SCROLL: + /* + * Forward N lines + * (default same as last 'd' or 'u' command). + */ + if (number > 0) + wscroll = (int) number; + cmd_exec(); + backward(wscroll, 0, 0); + break; + + case A_FREPAINT: + /* + * Flush buffers, then repaint screen. + * Don't flush the buffers on a pipe! + */ + clear_buffers(); + /* FALLTHRU */ + case A_REPAINT: + /* + * Repaint screen. + */ + cmd_exec(); + repaint(); + break; + + case A_GOLINE: + /* + * Go to line N, default beginning of file. + * If N <= 0, ignore jump_sline in order to avoid + * empty lines before the beginning of the file. + */ + save_jump_sline = jump_sline; + if (number <= 0) + { + number = 1; + jump_sline = 0; + } + cmd_exec(); + jump_back(number); + jump_sline = save_jump_sline; + break; + + case A_PERCENT: + /* + * Go to a specified percentage into the file. + */ + if (number < 0) + { + number = 0; + fraction = 0; + } + if (number > 100 || (number == 100 && fraction != 0)) + { + number = 100; + fraction = 0; + } + cmd_exec(); + jump_percent((int) number, fraction); + break; + + case A_GOEND: + /* + * Go to line N, default end of file. + */ + cmd_exec(); + if (number <= 0) + jump_forw(); + else + jump_back(number); + break; + + case A_GOEND_BUF: + /* + * Go to line N, default last buffered byte. + */ + cmd_exec(); + if (number <= 0) + jump_forw_buffered(); + else + jump_back(number); + break; + + case A_GOPOS: + /* + * Go to a specified byte position in the file. + */ + cmd_exec(); + if (number < 0) + number = 0; + jump_line_loc((POSITION) number, jump_sline); + break; + + case A_STAT: + /* + * Print file name, etc. + */ + if (ch_getflags() & CH_HELPFILE) + break; + cmd_exec(); + parg.p_string = eq_message(); + error("%s", &parg); + break; + + case A_VERSION: + /* + * Print version number. + */ + cmd_exec(); + dispversion(); + break; + + case A_QUIT: + /* + * Exit. + */ + if (curr_ifile != NULL_IFILE && + ch_getflags() & CH_HELPFILE) + { + /* + * Quit while viewing the help file + * just means return to viewing the + * previous file. + */ + hshift = save_hshift; + bs_mode = save_bs_mode; + if (edit_prev(1) == 0) + break; + } + if (extra != NULL) + quit(*extra); + quit(QUIT_OK); + break; /* * Define abbreviation for a commonly used sequence below. */ #define DO_SEARCH() \ - if (number <= 0) number = 1; \ - mca_search(); \ - cmd_exec(); \ - multi_search((char *)NULL, (int) number, 0); - - - case A_F_SEARCH: - /* - * Search forward for a pattern. - * Get the first char of the pattern. - */ - search_type = SRCH_FORW | def_search_type; - if (number <= 0) - number = 1; - mca_search(); - c = getcc(); - goto again; - - case A_B_SEARCH: - /* - * Search backward for a pattern. - * Get the first char of the pattern. - */ - search_type = SRCH_BACK | def_search_type; - if (number <= 0) - number = 1; - mca_search(); - c = getcc(); - goto again; - - case A_FILTER: + if (number <= 0) number = 1; \ + mca_search(); \ + cmd_exec(); \ + multi_search((char *)NULL, (int) number, 0); + + + case A_F_SEARCH: + /* + * Search forward for a pattern. + * Get the first char of the pattern. + */ + search_type = SRCH_FORW | def_search_type; + if (number <= 0) + number = 1; + mca_search(); + c = getcc(); + goto again; + + case A_B_SEARCH: + /* + * Search backward for a pattern. + * Get the first char of the pattern. + */ + search_type = SRCH_BACK | def_search_type; + if (number <= 0) + number = 1; + mca_search(); + c = getcc(); + goto again; + + case A_FILTER: #if HILITE_SEARCH - search_type = SRCH_FORW | SRCH_FILTER; - mca_search(); - c = getcc(); - goto again; + search_type = SRCH_FORW | SRCH_FILTER; + mca_search(); + c = getcc(); + goto again; #else - error("Command not available", NULL_PARG); - break; + error("Command not available", NULL_PARG); + break; #endif - case A_AGAIN_SEARCH: - /* - * Repeat previous search. - */ - DO_SEARCH(); - break; - - case A_T_AGAIN_SEARCH: - /* - * Repeat previous search, multiple files. - */ - search_type |= SRCH_PAST_EOF; - DO_SEARCH(); - break; - - case A_REVERSE_SEARCH: - /* - * Repeat previous search, in reverse direction. - */ - save_search_type = search_type; - search_type = SRCH_REVERSE(search_type); - DO_SEARCH(); - search_type = save_search_type; - break; - - case A_T_REVERSE_SEARCH: - /* - * Repeat previous search, - * multiple files in reverse direction. - */ - save_search_type = search_type; - search_type = SRCH_REVERSE(search_type); - search_type |= SRCH_PAST_EOF; - DO_SEARCH(); - search_type = save_search_type; - break; - - case A_UNDO_SEARCH: - case A_CLR_SEARCH: - /* - * Clear search string highlighting. - */ - undo_search(action == A_CLR_SEARCH); - break; - - case A_HELP: - /* - * Help. - */ - if (ch_getflags() & CH_HELPFILE) - break; - cmd_exec(); - save_hshift = hshift; - hshift = 0; - save_bs_mode = bs_mode; - bs_mode = BS_SPECIAL; - (void) edit(FAKE_HELPFILE); - break; - - case A_EXAMINE: - /* - * Edit a new file. Get the filename. - */ + case A_AGAIN_SEARCH: + /* + * Repeat previous search. + */ + DO_SEARCH(); + break; + + case A_T_AGAIN_SEARCH: + /* + * Repeat previous search, multiple files. + */ + search_type |= SRCH_PAST_EOF; + DO_SEARCH(); + break; + + case A_REVERSE_SEARCH: + /* + * Repeat previous search, in reverse direction. + */ + save_search_type = search_type; + search_type = SRCH_REVERSE(search_type); + DO_SEARCH(); + search_type = save_search_type; + break; + + case A_T_REVERSE_SEARCH: + /* + * Repeat previous search, + * multiple files in reverse direction. + */ + save_search_type = search_type; + search_type = SRCH_REVERSE(search_type); + search_type |= SRCH_PAST_EOF; + DO_SEARCH(); + search_type = save_search_type; + break; + + case A_UNDO_SEARCH: + case A_CLR_SEARCH: + /* + * Clear search string highlighting. + */ + undo_search(action == A_CLR_SEARCH); + break; + + case A_HELP: + /* + * Help. + */ + if (ch_getflags() & CH_HELPFILE) + break; + cmd_exec(); + save_hshift = hshift; + hshift = 0; + save_bs_mode = bs_mode; + bs_mode = BS_SPECIAL; + (void) edit(FAKE_HELPFILE); + break; + + case A_EXAMINE: + /* + * Edit a new file. Get the filename. + */ #if EXAMINE - if (!secure) - { - start_mca(A_EXAMINE, "Examine: ", ml_examine, 0); - c = getcc(); - goto again; - } + if (!secure) + { + start_mca(A_EXAMINE, "Examine: ", ml_examine, 0); + c = getcc(); + goto again; + } #endif - error("Command not available", NULL_PARG); - break; - - case A_VISUAL: - /* - * Invoke an editor on the input file. - */ + error("Command not available", NULL_PARG); + break; + + case A_VISUAL: + /* + * Invoke an editor on the input file. + */ #if EDITOR - if (!secure) - { - if (ch_getflags() & CH_HELPFILE) - break; - if (strcmp(get_filename(curr_ifile), "-") == 0) - { - error("Cannot edit standard input", NULL_PARG); - break; - } - if (get_altfilename(curr_ifile) != NULL) - { - error("WARNING: This file was viewed via LESSOPEN", - NULL_PARG); - } - start_mca(A_SHELL, "!", ml_shell, 0); - /* - * Expand the editor prototype string - * and pass it to the system to execute. - * (Make sure the screen is displayed so the - * expansion of "+%lm" works.) - */ - make_display(); - cmd_exec(); - lsystem(pr_expand(editproto), (char*)NULL); - break; - } + if (!secure) + { + if (ch_getflags() & CH_HELPFILE) + break; + if (strcmp(get_filename(curr_ifile), "-") == 0) + { + error("Cannot edit standard input", NULL_PARG); + break; + } + if (get_altfilename(curr_ifile) != NULL) + { + error("WARNING: This file was viewed via LESSOPEN", + NULL_PARG); + } + start_mca(A_SHELL, "!", ml_shell, 0); + /* + * Expand the editor prototype string + * and pass it to the system to execute. + * (Make sure the screen is displayed so the + * expansion of "+%lm" works.) + */ + make_display(); + cmd_exec(); + lsystem(pr_expand(editproto), (char*)NULL); + break; + } #endif - error("Command not available", NULL_PARG); - break; + error("Command not available", NULL_PARG); + break; - case A_NEXT_FILE: - /* - * Examine next file. - */ + case A_NEXT_FILE: + /* + * Examine next file. + */ #if TAGS - if (ntags()) - { - error("No next file", NULL_PARG); - break; - } + if (ntags()) + { + error("No next file", NULL_PARG); + break; + } #endif - if (number <= 0) - number = 1; - if (edit_next((int) number)) - { - if (get_quit_at_eof() && eof_displayed() && - !(ch_getflags() & CH_HELPFILE)) - quit(QUIT_OK); - parg.p_string = (number > 1) ? "(N-th) " : ""; - error("No %snext file", &parg); - } - break; - - case A_PREV_FILE: - /* - * Examine previous file. - */ + if (number <= 0) + number = 1; + if (edit_next((int) number)) + { + if (get_quit_at_eof() && eof_displayed() && + !(ch_getflags() & CH_HELPFILE)) + quit(QUIT_OK); + parg.p_string = (number > 1) ? "(N-th) " : ""; + error("No %snext file", &parg); + } + break; + + case A_PREV_FILE: + /* + * Examine previous file. + */ #if TAGS - if (ntags()) - { - error("No previous file", NULL_PARG); - break; - } + if (ntags()) + { + error("No previous file", NULL_PARG); + break; + } #endif - if (number <= 0) - number = 1; - if (edit_prev((int) number)) - { - parg.p_string = (number > 1) ? "(N-th) " : ""; - error("No %sprevious file", &parg); - } - break; - - case A_NEXT_TAG: - /* - * Jump to the next tag in the current tag list. - */ + if (number <= 0) + number = 1; + if (edit_prev((int) number)) + { + parg.p_string = (number > 1) ? "(N-th) " : ""; + error("No %sprevious file", &parg); + } + break; + + case A_NEXT_TAG: + /* + * Jump to the next tag in the current tag list. + */ #if TAGS - if (number <= 0) - number = 1; - tagfile = nexttag((int) number); - if (tagfile == NULL) - { - error("No next tag", NULL_PARG); - break; - } - cmd_exec(); - if (edit(tagfile) == 0) - { - POSITION pos = tagsearch(); - if (pos != NULL_POSITION) - jump_loc(pos, jump_sline); - } + if (number <= 0) + number = 1; + tagfile = nexttag((int) number); + if (tagfile == NULL) + { + error("No next tag", NULL_PARG); + break; + } + cmd_exec(); + if (edit(tagfile) == 0) + { + POSITION pos = tagsearch(); + if (pos != NULL_POSITION) + jump_loc(pos, jump_sline); + } #else - error("Command not available", NULL_PARG); + error("Command not available", NULL_PARG); #endif - break; + break; - case A_PREV_TAG: - /* - * Jump to the previous tag in the current tag list. - */ + case A_PREV_TAG: + /* + * Jump to the previous tag in the current tag list. + */ #if TAGS - if (number <= 0) - number = 1; - tagfile = prevtag((int) number); - if (tagfile == NULL) - { - error("No previous tag", NULL_PARG); - break; - } - cmd_exec(); - if (edit(tagfile) == 0) - { - POSITION pos = tagsearch(); - if (pos != NULL_POSITION) - jump_loc(pos, jump_sline); - } + if (number <= 0) + number = 1; + tagfile = prevtag((int) number); + if (tagfile == NULL) + { + error("No previous tag", NULL_PARG); + break; + } + cmd_exec(); + if (edit(tagfile) == 0) + { + POSITION pos = tagsearch(); + if (pos != NULL_POSITION) + jump_loc(pos, jump_sline); + } #else - error("Command not available", NULL_PARG); + error("Command not available", NULL_PARG); #endif - break; - - case A_INDEX_FILE: - /* - * Examine a particular file. - */ - if (number <= 0) - number = 1; - if (edit_index((int) number)) - error("No such file", NULL_PARG); - break; - - case A_REMOVE_FILE: - /* - * Remove a file from the input file list. - */ - if (ch_getflags() & CH_HELPFILE) - break; - old_ifile = curr_ifile; - new_ifile = getoff_ifile(curr_ifile); - if (new_ifile == NULL_IFILE) - { - bell(); - break; - } - if (edit_ifile(new_ifile) != 0) - { - reedit_ifile(old_ifile); - break; - } - del_ifile(old_ifile); - break; - - case A_OPT_TOGGLE: - /* - * Change the setting of an option. - */ - optflag = OPT_TOGGLE; - optgetname = FALSE; - mca_opt_toggle(); - c = getcc(); - cbuf = opt_toggle_disallowed(c); - if (cbuf != NULL) - { - error(cbuf, NULL_PARG); - break; - } - goto again; - - case A_DISP_OPTION: - /* - * Report the setting of an option. - */ - optflag = OPT_NO_TOGGLE; - optgetname = FALSE; - mca_opt_toggle(); - c = getcc(); - goto again; - - case A_FIRSTCMD: - /* - * Set an initial command for new files. - */ - start_mca(A_FIRSTCMD, "+", (void*)NULL, 0); - c = getcc(); - goto again; - - case A_SHELL: - /* - * Shell escape. - */ + break; + + case A_INDEX_FILE: + /* + * Examine a particular file. + */ + if (number <= 0) + number = 1; + if (edit_index((int) number)) + error("No such file", NULL_PARG); + break; + + case A_REMOVE_FILE: + /* + * Remove a file from the input file list. + */ + if (ch_getflags() & CH_HELPFILE) + break; + old_ifile = curr_ifile; + new_ifile = getoff_ifile(curr_ifile); + if (new_ifile == NULL_IFILE) + { + bell(); + break; + } + if (edit_ifile(new_ifile) != 0) + { + reedit_ifile(old_ifile); + break; + } + del_ifile(old_ifile); + break; + + case A_OPT_TOGGLE: + /* + * Change the setting of an option. + */ + optflag = OPT_TOGGLE; + optgetname = FALSE; + mca_opt_toggle(); + c = getcc(); + cbuf = opt_toggle_disallowed(c); + if (cbuf != NULL) + { + error(cbuf, NULL_PARG); + break; + } + goto again; + + case A_DISP_OPTION: + /* + * Report the setting of an option. + */ + optflag = OPT_NO_TOGGLE; + optgetname = FALSE; + mca_opt_toggle(); + c = getcc(); + goto again; + + case A_FIRSTCMD: + /* + * Set an initial command for new files. + */ + start_mca(A_FIRSTCMD, "+", (void*)NULL, 0); + c = getcc(); + goto again; + + case A_SHELL: + /* + * Shell escape. + */ #if SHELL_ESCAPE - if (!secure) - { - start_mca(A_SHELL, "!", ml_shell, 0); - c = getcc(); - goto again; - } + if (!secure) + { + start_mca(A_SHELL, "!", ml_shell, 0); + c = getcc(); + goto again; + } #endif - error("Command not available", NULL_PARG); - break; - - case A_SETMARK: - case A_SETMARKBOT: - /* - * Set a mark. - */ - if (ch_getflags() & CH_HELPFILE) - break; - start_mca(A_SETMARK, "set mark: ", (void*)NULL, 0); - c = getcc(); - if (is_erase_char(c) || is_newline_char(c)) - break; - setmark(c, action == A_SETMARKBOT ? BOTTOM : TOP); - repaint(); - break; - - case A_CLRMARK: - /* - * Clear a mark. - */ - start_mca(A_CLRMARK, "clear mark: ", (void*)NULL, 0); - c = getcc(); - if (is_erase_char(c) || is_newline_char(c)) - break; - clrmark(c); - repaint(); - break; - - case A_GOMARK: - /* - * Jump to a marked position. - */ - start_mca(A_GOMARK, "goto mark: ", (void*)NULL, 0); - c = getcc(); - if (is_erase_char(c) || is_newline_char(c)) - break; - cmd_exec(); - gomark(c); - break; - - case A_PIPE: - /* - * Write part of the input to a pipe to a shell command. - */ + error("Command not available", NULL_PARG); + break; + + case A_SETMARK: + case A_SETMARKBOT: + /* + * Set a mark. + */ + if (ch_getflags() & CH_HELPFILE) + break; + start_mca(A_SETMARK, "set mark: ", (void*)NULL, 0); + c = getcc(); + if (is_erase_char(c) || is_newline_char(c)) + break; + setmark(c, action == A_SETMARKBOT ? BOTTOM : TOP); + repaint(); + break; + + case A_CLRMARK: + /* + * Clear a mark. + */ + start_mca(A_CLRMARK, "clear mark: ", (void*)NULL, 0); + c = getcc(); + if (is_erase_char(c) || is_newline_char(c)) + break; + clrmark(c); + repaint(); + break; + + case A_GOMARK: + /* + * Jump to a marked position. + */ + start_mca(A_GOMARK, "goto mark: ", (void*)NULL, 0); + c = getcc(); + if (is_erase_char(c) || is_newline_char(c)) + break; + cmd_exec(); + gomark(c); + break; + + case A_PIPE: + /* + * Write part of the input to a pipe to a shell command. + */ #if PIPEC - if (!secure) - { - start_mca(A_PIPE, "|mark: ", (void*)NULL, 0); - c = getcc(); - if (is_erase_char(c)) - break; - if (is_newline_char(c)) - c = '.'; - if (badmark(c)) - break; - pipec = c; - start_mca(A_PIPE, "!", ml_shell, 0); - c = getcc(); - goto again; - } + if (!secure) + { + start_mca(A_PIPE, "|mark: ", (void*)NULL, 0); + c = getcc(); + if (is_erase_char(c)) + break; + if (is_newline_char(c)) + c = '.'; + if (badmark(c)) + break; + pipec = c; + start_mca(A_PIPE, "!", ml_shell, 0); + c = getcc(); + goto again; + } #endif - error("Command not available", NULL_PARG); - break; - - case A_B_BRACKET: - case A_F_BRACKET: - start_mca(action, "Brackets: ", (void*)NULL, 0); - c = getcc(); - goto again; - - case A_LSHIFT: - /* - * Shift view left. - */ - if (number > 0) - shift_count = number; - else - number = (shift_count > 0) ? - shift_count : sc_width / 2; - if (number > hshift) - number = hshift; - hshift -= number; - screen_trashed = 1; - break; - - case A_RSHIFT: - /* - * Shift view right. - */ - if (number > 0) - shift_count = number; - else - number = (shift_count > 0) ? - shift_count : sc_width / 2; - hshift += number; - screen_trashed = 1; - break; - - case A_LLSHIFT: - /* - * Shift view left to margin. - */ - hshift = 0; - screen_trashed = 1; - break; - - case A_RRSHIFT: - /* - * Shift view right to view rightmost char on screen. - */ - hshift = rrshift(); - screen_trashed = 1; - break; - - case A_PREFIX: - /* - * The command is incomplete (more chars are needed). - * Display the current char, so the user knows - * what's going on, and get another character. - */ - if (mca != A_PREFIX) - { - cmd_reset(); - start_mca(A_PREFIX, " ", (void*)NULL, - CF_QUIT_ON_ERASE); - (void) cmd_char(c); - } - c = getcc(); - goto again; - - case A_NOACTION: - break; - - default: - bell(); - break; - } - } + error("Command not available", NULL_PARG); + break; + + case A_B_BRACKET: + case A_F_BRACKET: + start_mca(action, "Brackets: ", (void*)NULL, 0); + c = getcc(); + goto again; + + case A_LSHIFT: + /* + * Shift view left. + */ + if (number > 0) + shift_count = number; + else + number = (shift_count > 0) ? + shift_count : sc_width / 2; + if (number > hshift) + number = hshift; + hshift -= number; + screen_trashed = 1; + break; + + case A_RSHIFT: + /* + * Shift view right. + */ + if (number > 0) + shift_count = number; + else + number = (shift_count > 0) ? + shift_count : sc_width / 2; + hshift += number; + screen_trashed = 1; + break; + + case A_LLSHIFT: + /* + * Shift view left to margin. + */ + hshift = 0; + screen_trashed = 1; + break; + + case A_RRSHIFT: + /* + * Shift view right to view rightmost char on screen. + */ + hshift = rrshift(); + screen_trashed = 1; + break; + + case A_PREFIX: + /* + * The command is incomplete (more chars are needed). + * Display the current char, so the user knows + * what's going on, and get another character. + */ + if (mca != A_PREFIX) + { + cmd_reset(); + start_mca(A_PREFIX, " ", (void*)NULL, + CF_QUIT_ON_ERASE); + (void) cmd_char(c); + } + c = getcc(); + goto again; + + case A_NOACTION: + break; + + default: + bell(); + break; + } + } } diff --git a/compose.uni b/compose.uni index cc7ddcf..1752606 100644 --- a/compose.uni +++ b/compose.uni @@ -1,345 +1,345 @@ /* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Tue Jul 19 12:45:16 PDT 2022 */ - { 0x0300, 0x036f }, /* Mn */ - { 0x0483, 0x0487 }, /* Mn */ - { 0x0488, 0x0489 }, /* Me */ - { 0x0591, 0x05bd }, /* Mn */ - { 0x05bf, 0x05bf }, /* Mn */ - { 0x05c1, 0x05c2 }, /* Mn */ - { 0x05c4, 0x05c5 }, /* Mn */ - { 0x05c7, 0x05c7 }, /* Mn */ - { 0x0610, 0x061a }, /* Mn */ - { 0x064b, 0x065f }, /* Mn */ - { 0x0670, 0x0670 }, /* Mn */ - { 0x06d6, 0x06dc }, /* Mn */ - { 0x06df, 0x06e4 }, /* Mn */ - { 0x06e7, 0x06e8 }, /* Mn */ - { 0x06ea, 0x06ed }, /* Mn */ - { 0x0711, 0x0711 }, /* Mn */ - { 0x0730, 0x074a }, /* Mn */ - { 0x07a6, 0x07b0 }, /* Mn */ - { 0x07eb, 0x07f3 }, /* Mn */ - { 0x07fd, 0x07fd }, /* Mn */ - { 0x0816, 0x0819 }, /* Mn */ - { 0x081b, 0x0823 }, /* Mn */ - { 0x0825, 0x0827 }, /* Mn */ - { 0x0829, 0x082d }, /* Mn */ - { 0x0859, 0x085b }, /* Mn */ - { 0x0898, 0x089f }, /* Mn */ - { 0x08ca, 0x08e1 }, /* Mn */ - { 0x08e3, 0x0902 }, /* Mn */ - { 0x093a, 0x093a }, /* Mn */ - { 0x093c, 0x093c }, /* Mn */ - { 0x0941, 0x0948 }, /* Mn */ - { 0x094d, 0x094d }, /* Mn */ - { 0x0951, 0x0957 }, /* Mn */ - { 0x0962, 0x0963 }, /* Mn */ - { 0x0981, 0x0981 }, /* Mn */ - { 0x09bc, 0x09bc }, /* Mn */ - { 0x09c1, 0x09c4 }, /* Mn */ - { 0x09cd, 0x09cd }, /* Mn */ - { 0x09e2, 0x09e3 }, /* Mn */ - { 0x09fe, 0x09fe }, /* Mn */ - { 0x0a01, 0x0a02 }, /* Mn */ - { 0x0a3c, 0x0a3c }, /* Mn */ - { 0x0a41, 0x0a42 }, /* Mn */ - { 0x0a47, 0x0a48 }, /* Mn */ - { 0x0a4b, 0x0a4d }, /* Mn */ - { 0x0a51, 0x0a51 }, /* Mn */ - { 0x0a70, 0x0a71 }, /* Mn */ - { 0x0a75, 0x0a75 }, /* Mn */ - { 0x0a81, 0x0a82 }, /* Mn */ - { 0x0abc, 0x0abc }, /* Mn */ - { 0x0ac1, 0x0ac5 }, /* Mn */ - { 0x0ac7, 0x0ac8 }, /* Mn */ - { 0x0acd, 0x0acd }, /* Mn */ - { 0x0ae2, 0x0ae3 }, /* Mn */ - { 0x0afa, 0x0aff }, /* Mn */ - { 0x0b01, 0x0b01 }, /* Mn */ - { 0x0b3c, 0x0b3c }, /* Mn */ - { 0x0b3f, 0x0b3f }, /* Mn */ - { 0x0b41, 0x0b44 }, /* Mn */ - { 0x0b4d, 0x0b4d }, /* Mn */ - { 0x0b55, 0x0b56 }, /* Mn */ - { 0x0b62, 0x0b63 }, /* Mn */ - { 0x0b82, 0x0b82 }, /* Mn */ - { 0x0bc0, 0x0bc0 }, /* Mn */ - { 0x0bcd, 0x0bcd }, /* Mn */ - { 0x0c00, 0x0c00 }, /* Mn */ - { 0x0c04, 0x0c04 }, /* Mn */ - { 0x0c3c, 0x0c3c }, /* Mn */ - { 0x0c3e, 0x0c40 }, /* Mn */ - { 0x0c46, 0x0c48 }, /* Mn */ - { 0x0c4a, 0x0c4d }, /* Mn */ - { 0x0c55, 0x0c56 }, /* Mn */ - { 0x0c62, 0x0c63 }, /* Mn */ - { 0x0c81, 0x0c81 }, /* Mn */ - { 0x0cbc, 0x0cbc }, /* Mn */ - { 0x0cbf, 0x0cbf }, /* Mn */ - { 0x0cc6, 0x0cc6 }, /* Mn */ - { 0x0ccc, 0x0ccd }, /* Mn */ - { 0x0ce2, 0x0ce3 }, /* Mn */ - { 0x0d00, 0x0d01 }, /* Mn */ - { 0x0d3b, 0x0d3c }, /* Mn */ - { 0x0d41, 0x0d44 }, /* Mn */ - { 0x0d4d, 0x0d4d }, /* Mn */ - { 0x0d62, 0x0d63 }, /* Mn */ - { 0x0d81, 0x0d81 }, /* Mn */ - { 0x0dca, 0x0dca }, /* Mn */ - { 0x0dd2, 0x0dd4 }, /* Mn */ - { 0x0dd6, 0x0dd6 }, /* Mn */ - { 0x0e31, 0x0e31 }, /* Mn */ - { 0x0e34, 0x0e3a }, /* Mn */ - { 0x0e47, 0x0e4e }, /* Mn */ - { 0x0eb1, 0x0eb1 }, /* Mn */ - { 0x0eb4, 0x0ebc }, /* Mn */ - { 0x0ec8, 0x0ecd }, /* Mn */ - { 0x0f18, 0x0f19 }, /* Mn */ - { 0x0f35, 0x0f35 }, /* Mn */ - { 0x0f37, 0x0f37 }, /* Mn */ - { 0x0f39, 0x0f39 }, /* Mn */ - { 0x0f71, 0x0f7e }, /* Mn */ - { 0x0f80, 0x0f84 }, /* Mn */ - { 0x0f86, 0x0f87 }, /* Mn */ - { 0x0f8d, 0x0f97 }, /* Mn */ - { 0x0f99, 0x0fbc }, /* Mn */ - { 0x0fc6, 0x0fc6 }, /* Mn */ - { 0x102d, 0x1030 }, /* Mn */ - { 0x1032, 0x1037 }, /* Mn */ - { 0x1039, 0x103a }, /* Mn */ - { 0x103d, 0x103e }, /* Mn */ - { 0x1058, 0x1059 }, /* Mn */ - { 0x105e, 0x1060 }, /* Mn */ - { 0x1071, 0x1074 }, /* Mn */ - { 0x1082, 0x1082 }, /* Mn */ - { 0x1085, 0x1086 }, /* Mn */ - { 0x108d, 0x108d }, /* Mn */ - { 0x109d, 0x109d }, /* Mn */ - { 0x1160, 0x11ff }, /* Mn */ - { 0x135d, 0x135f }, /* Mn */ - { 0x1712, 0x1714 }, /* Mn */ - { 0x1732, 0x1733 }, /* Mn */ - { 0x1752, 0x1753 }, /* Mn */ - { 0x1772, 0x1773 }, /* Mn */ - { 0x17b4, 0x17b5 }, /* Mn */ - { 0x17b7, 0x17bd }, /* Mn */ - { 0x17c6, 0x17c6 }, /* Mn */ - { 0x17c9, 0x17d3 }, /* Mn */ - { 0x17dd, 0x17dd }, /* Mn */ - { 0x180b, 0x180d }, /* Mn */ - { 0x180f, 0x180f }, /* Mn */ - { 0x1885, 0x1886 }, /* Mn */ - { 0x18a9, 0x18a9 }, /* Mn */ - { 0x1920, 0x1922 }, /* Mn */ - { 0x1927, 0x1928 }, /* Mn */ - { 0x1932, 0x1932 }, /* Mn */ - { 0x1939, 0x193b }, /* Mn */ - { 0x1a17, 0x1a18 }, /* Mn */ - { 0x1a1b, 0x1a1b }, /* Mn */ - { 0x1a56, 0x1a56 }, /* Mn */ - { 0x1a58, 0x1a5e }, /* Mn */ - { 0x1a60, 0x1a60 }, /* Mn */ - { 0x1a62, 0x1a62 }, /* Mn */ - { 0x1a65, 0x1a6c }, /* Mn */ - { 0x1a73, 0x1a7c }, /* Mn */ - { 0x1a7f, 0x1a7f }, /* Mn */ - { 0x1ab0, 0x1abd }, /* Mn */ - { 0x1abe, 0x1abe }, /* Me */ - { 0x1abf, 0x1ace }, /* Mn */ - { 0x1b00, 0x1b03 }, /* Mn */ - { 0x1b34, 0x1b34 }, /* Mn */ - { 0x1b36, 0x1b3a }, /* Mn */ - { 0x1b3c, 0x1b3c }, /* Mn */ - { 0x1b42, 0x1b42 }, /* Mn */ - { 0x1b6b, 0x1b73 }, /* Mn */ - { 0x1b80, 0x1b81 }, /* Mn */ - { 0x1ba2, 0x1ba5 }, /* Mn */ - { 0x1ba8, 0x1ba9 }, /* Mn */ - { 0x1bab, 0x1bad }, /* Mn */ - { 0x1be6, 0x1be6 }, /* Mn */ - { 0x1be8, 0x1be9 }, /* Mn */ - { 0x1bed, 0x1bed }, /* Mn */ - { 0x1bef, 0x1bf1 }, /* Mn */ - { 0x1c2c, 0x1c33 }, /* Mn */ - { 0x1c36, 0x1c37 }, /* Mn */ - { 0x1cd0, 0x1cd2 }, /* Mn */ - { 0x1cd4, 0x1ce0 }, /* Mn */ - { 0x1ce2, 0x1ce8 }, /* Mn */ - { 0x1ced, 0x1ced }, /* Mn */ - { 0x1cf4, 0x1cf4 }, /* Mn */ - { 0x1cf8, 0x1cf9 }, /* Mn */ - { 0x1dc0, 0x1dff }, /* Mn */ - { 0x20d0, 0x20dc }, /* Mn */ - { 0x20dd, 0x20e0 }, /* Me */ - { 0x20e1, 0x20e1 }, /* Mn */ - { 0x20e2, 0x20e4 }, /* Me */ - { 0x20e5, 0x20f0 }, /* Mn */ - { 0x2cef, 0x2cf1 }, /* Mn */ - { 0x2d7f, 0x2d7f }, /* Mn */ - { 0x2de0, 0x2dff }, /* Mn */ - { 0x302a, 0x302d }, /* Mn */ - { 0x3099, 0x309a }, /* Mn */ - { 0xa66f, 0xa66f }, /* Mn */ - { 0xa670, 0xa672 }, /* Me */ - { 0xa674, 0xa67d }, /* Mn */ - { 0xa69e, 0xa69f }, /* Mn */ - { 0xa6f0, 0xa6f1 }, /* Mn */ - { 0xa802, 0xa802 }, /* Mn */ - { 0xa806, 0xa806 }, /* Mn */ - { 0xa80b, 0xa80b }, /* Mn */ - { 0xa825, 0xa826 }, /* Mn */ - { 0xa82c, 0xa82c }, /* Mn */ - { 0xa8c4, 0xa8c5 }, /* Mn */ - { 0xa8e0, 0xa8f1 }, /* Mn */ - { 0xa8ff, 0xa8ff }, /* Mn */ - { 0xa926, 0xa92d }, /* Mn */ - { 0xa947, 0xa951 }, /* Mn */ - { 0xa980, 0xa982 }, /* Mn */ - { 0xa9b3, 0xa9b3 }, /* Mn */ - { 0xa9b6, 0xa9b9 }, /* Mn */ - { 0xa9bc, 0xa9bd }, /* Mn */ - { 0xa9e5, 0xa9e5 }, /* Mn */ - { 0xaa29, 0xaa2e }, /* Mn */ - { 0xaa31, 0xaa32 }, /* Mn */ - { 0xaa35, 0xaa36 }, /* Mn */ - { 0xaa43, 0xaa43 }, /* Mn */ - { 0xaa4c, 0xaa4c }, /* Mn */ - { 0xaa7c, 0xaa7c }, /* Mn */ - { 0xaab0, 0xaab0 }, /* Mn */ - { 0xaab2, 0xaab4 }, /* Mn */ - { 0xaab7, 0xaab8 }, /* Mn */ - { 0xaabe, 0xaabf }, /* Mn */ - { 0xaac1, 0xaac1 }, /* Mn */ - { 0xaaec, 0xaaed }, /* Mn */ - { 0xaaf6, 0xaaf6 }, /* Mn */ - { 0xabe5, 0xabe5 }, /* Mn */ - { 0xabe8, 0xabe8 }, /* Mn */ - { 0xabed, 0xabed }, /* Mn */ - { 0xd7b0, 0xd7c6 }, /* Mn */ - { 0xd7cb, 0xd7fb }, /* Mn */ - { 0xfb1e, 0xfb1e }, /* Mn */ - { 0xfe00, 0xfe0f }, /* Mn */ - { 0xfe20, 0xfe2f }, /* Mn */ - { 0x101fd, 0x101fd }, /* Mn */ - { 0x102e0, 0x102e0 }, /* Mn */ - { 0x10376, 0x1037a }, /* Mn */ - { 0x10a01, 0x10a03 }, /* Mn */ - { 0x10a05, 0x10a06 }, /* Mn */ - { 0x10a0c, 0x10a0f }, /* Mn */ - { 0x10a38, 0x10a3a }, /* Mn */ - { 0x10a3f, 0x10a3f }, /* Mn */ - { 0x10ae5, 0x10ae6 }, /* Mn */ - { 0x10d24, 0x10d27 }, /* Mn */ - { 0x10eab, 0x10eac }, /* Mn */ - { 0x10f46, 0x10f50 }, /* Mn */ - { 0x10f82, 0x10f85 }, /* Mn */ - { 0x11001, 0x11001 }, /* Mn */ - { 0x11038, 0x11046 }, /* Mn */ - { 0x11070, 0x11070 }, /* Mn */ - { 0x11073, 0x11074 }, /* Mn */ - { 0x1107f, 0x11081 }, /* Mn */ - { 0x110b3, 0x110b6 }, /* Mn */ - { 0x110b9, 0x110ba }, /* Mn */ - { 0x110c2, 0x110c2 }, /* Mn */ - { 0x11100, 0x11102 }, /* Mn */ - { 0x11127, 0x1112b }, /* Mn */ - { 0x1112d, 0x11134 }, /* Mn */ - { 0x11173, 0x11173 }, /* Mn */ - { 0x11180, 0x11181 }, /* Mn */ - { 0x111b6, 0x111be }, /* Mn */ - { 0x111c9, 0x111cc }, /* Mn */ - { 0x111cf, 0x111cf }, /* Mn */ - { 0x1122f, 0x11231 }, /* Mn */ - { 0x11234, 0x11234 }, /* Mn */ - { 0x11236, 0x11237 }, /* Mn */ - { 0x1123e, 0x1123e }, /* Mn */ - { 0x112df, 0x112df }, /* Mn */ - { 0x112e3, 0x112ea }, /* Mn */ - { 0x11300, 0x11301 }, /* Mn */ - { 0x1133b, 0x1133c }, /* Mn */ - { 0x11340, 0x11340 }, /* Mn */ - { 0x11366, 0x1136c }, /* Mn */ - { 0x11370, 0x11374 }, /* Mn */ - { 0x11438, 0x1143f }, /* Mn */ - { 0x11442, 0x11444 }, /* Mn */ - { 0x11446, 0x11446 }, /* Mn */ - { 0x1145e, 0x1145e }, /* Mn */ - { 0x114b3, 0x114b8 }, /* Mn */ - { 0x114ba, 0x114ba }, /* Mn */ - { 0x114bf, 0x114c0 }, /* Mn */ - { 0x114c2, 0x114c3 }, /* Mn */ - { 0x115b2, 0x115b5 }, /* Mn */ - { 0x115bc, 0x115bd }, /* Mn */ - { 0x115bf, 0x115c0 }, /* Mn */ - { 0x115dc, 0x115dd }, /* Mn */ - { 0x11633, 0x1163a }, /* Mn */ - { 0x1163d, 0x1163d }, /* Mn */ - { 0x1163f, 0x11640 }, /* Mn */ - { 0x116ab, 0x116ab }, /* Mn */ - { 0x116ad, 0x116ad }, /* Mn */ - { 0x116b0, 0x116b5 }, /* Mn */ - { 0x116b7, 0x116b7 }, /* Mn */ - { 0x1171d, 0x1171f }, /* Mn */ - { 0x11722, 0x11725 }, /* Mn */ - { 0x11727, 0x1172b }, /* Mn */ - { 0x1182f, 0x11837 }, /* Mn */ - { 0x11839, 0x1183a }, /* Mn */ - { 0x1193b, 0x1193c }, /* Mn */ - { 0x1193e, 0x1193e }, /* Mn */ - { 0x11943, 0x11943 }, /* Mn */ - { 0x119d4, 0x119d7 }, /* Mn */ - { 0x119da, 0x119db }, /* Mn */ - { 0x119e0, 0x119e0 }, /* Mn */ - { 0x11a01, 0x11a0a }, /* Mn */ - { 0x11a33, 0x11a38 }, /* Mn */ - { 0x11a3b, 0x11a3e }, /* Mn */ - { 0x11a47, 0x11a47 }, /* Mn */ - { 0x11a51, 0x11a56 }, /* Mn */ - { 0x11a59, 0x11a5b }, /* Mn */ - { 0x11a8a, 0x11a96 }, /* Mn */ - { 0x11a98, 0x11a99 }, /* Mn */ - { 0x11c30, 0x11c36 }, /* Mn */ - { 0x11c38, 0x11c3d }, /* Mn */ - { 0x11c3f, 0x11c3f }, /* Mn */ - { 0x11c92, 0x11ca7 }, /* Mn */ - { 0x11caa, 0x11cb0 }, /* Mn */ - { 0x11cb2, 0x11cb3 }, /* Mn */ - { 0x11cb5, 0x11cb6 }, /* Mn */ - { 0x11d31, 0x11d36 }, /* Mn */ - { 0x11d3a, 0x11d3a }, /* Mn */ - { 0x11d3c, 0x11d3d }, /* Mn */ - { 0x11d3f, 0x11d45 }, /* Mn */ - { 0x11d47, 0x11d47 }, /* Mn */ - { 0x11d90, 0x11d91 }, /* Mn */ - { 0x11d95, 0x11d95 }, /* Mn */ - { 0x11d97, 0x11d97 }, /* Mn */ - { 0x11ef3, 0x11ef4 }, /* Mn */ - { 0x16af0, 0x16af4 }, /* Mn */ - { 0x16b30, 0x16b36 }, /* Mn */ - { 0x16f4f, 0x16f4f }, /* Mn */ - { 0x16f8f, 0x16f92 }, /* Mn */ - { 0x16fe4, 0x16fe4 }, /* Mn */ - { 0x1bc9d, 0x1bc9e }, /* Mn */ - { 0x1cf00, 0x1cf2d }, /* Mn */ - { 0x1cf30, 0x1cf46 }, /* Mn */ - { 0x1d167, 0x1d169 }, /* Mn */ - { 0x1d17b, 0x1d182 }, /* Mn */ - { 0x1d185, 0x1d18b }, /* Mn */ - { 0x1d1aa, 0x1d1ad }, /* Mn */ - { 0x1d242, 0x1d244 }, /* Mn */ - { 0x1da00, 0x1da36 }, /* Mn */ - { 0x1da3b, 0x1da6c }, /* Mn */ - { 0x1da75, 0x1da75 }, /* Mn */ - { 0x1da84, 0x1da84 }, /* Mn */ - { 0x1da9b, 0x1da9f }, /* Mn */ - { 0x1daa1, 0x1daaf }, /* Mn */ - { 0x1e000, 0x1e006 }, /* Mn */ - { 0x1e008, 0x1e018 }, /* Mn */ - { 0x1e01b, 0x1e021 }, /* Mn */ - { 0x1e023, 0x1e024 }, /* Mn */ - { 0x1e026, 0x1e02a }, /* Mn */ - { 0x1e130, 0x1e136 }, /* Mn */ - { 0x1e2ae, 0x1e2ae }, /* Mn */ - { 0x1e2ec, 0x1e2ef }, /* Mn */ - { 0x1e8d0, 0x1e8d6 }, /* Mn */ - { 0x1e944, 0x1e94a }, /* Mn */ - { 0xe0100, 0xe01ef }, /* Mn */ + { 0x0300, 0x036f }, /* Mn */ + { 0x0483, 0x0487 }, /* Mn */ + { 0x0488, 0x0489 }, /* Me */ + { 0x0591, 0x05bd }, /* Mn */ + { 0x05bf, 0x05bf }, /* Mn */ + { 0x05c1, 0x05c2 }, /* Mn */ + { 0x05c4, 0x05c5 }, /* Mn */ + { 0x05c7, 0x05c7 }, /* Mn */ + { 0x0610, 0x061a }, /* Mn */ + { 0x064b, 0x065f }, /* Mn */ + { 0x0670, 0x0670 }, /* Mn */ + { 0x06d6, 0x06dc }, /* Mn */ + { 0x06df, 0x06e4 }, /* Mn */ + { 0x06e7, 0x06e8 }, /* Mn */ + { 0x06ea, 0x06ed }, /* Mn */ + { 0x0711, 0x0711 }, /* Mn */ + { 0x0730, 0x074a }, /* Mn */ + { 0x07a6, 0x07b0 }, /* Mn */ + { 0x07eb, 0x07f3 }, /* Mn */ + { 0x07fd, 0x07fd }, /* Mn */ + { 0x0816, 0x0819 }, /* Mn */ + { 0x081b, 0x0823 }, /* Mn */ + { 0x0825, 0x0827 }, /* Mn */ + { 0x0829, 0x082d }, /* Mn */ + { 0x0859, 0x085b }, /* Mn */ + { 0x0898, 0x089f }, /* Mn */ + { 0x08ca, 0x08e1 }, /* Mn */ + { 0x08e3, 0x0902 }, /* Mn */ + { 0x093a, 0x093a }, /* Mn */ + { 0x093c, 0x093c }, /* Mn */ + { 0x0941, 0x0948 }, /* Mn */ + { 0x094d, 0x094d }, /* Mn */ + { 0x0951, 0x0957 }, /* Mn */ + { 0x0962, 0x0963 }, /* Mn */ + { 0x0981, 0x0981 }, /* Mn */ + { 0x09bc, 0x09bc }, /* Mn */ + { 0x09c1, 0x09c4 }, /* Mn */ + { 0x09cd, 0x09cd }, /* Mn */ + { 0x09e2, 0x09e3 }, /* Mn */ + { 0x09fe, 0x09fe }, /* Mn */ + { 0x0a01, 0x0a02 }, /* Mn */ + { 0x0a3c, 0x0a3c }, /* Mn */ + { 0x0a41, 0x0a42 }, /* Mn */ + { 0x0a47, 0x0a48 }, /* Mn */ + { 0x0a4b, 0x0a4d }, /* Mn */ + { 0x0a51, 0x0a51 }, /* Mn */ + { 0x0a70, 0x0a71 }, /* Mn */ + { 0x0a75, 0x0a75 }, /* Mn */ + { 0x0a81, 0x0a82 }, /* Mn */ + { 0x0abc, 0x0abc }, /* Mn */ + { 0x0ac1, 0x0ac5 }, /* Mn */ + { 0x0ac7, 0x0ac8 }, /* Mn */ + { 0x0acd, 0x0acd }, /* Mn */ + { 0x0ae2, 0x0ae3 }, /* Mn */ + { 0x0afa, 0x0aff }, /* Mn */ + { 0x0b01, 0x0b01 }, /* Mn */ + { 0x0b3c, 0x0b3c }, /* Mn */ + { 0x0b3f, 0x0b3f }, /* Mn */ + { 0x0b41, 0x0b44 }, /* Mn */ + { 0x0b4d, 0x0b4d }, /* Mn */ + { 0x0b55, 0x0b56 }, /* Mn */ + { 0x0b62, 0x0b63 }, /* Mn */ + { 0x0b82, 0x0b82 }, /* Mn */ + { 0x0bc0, 0x0bc0 }, /* Mn */ + { 0x0bcd, 0x0bcd }, /* Mn */ + { 0x0c00, 0x0c00 }, /* Mn */ + { 0x0c04, 0x0c04 }, /* Mn */ + { 0x0c3c, 0x0c3c }, /* Mn */ + { 0x0c3e, 0x0c40 }, /* Mn */ + { 0x0c46, 0x0c48 }, /* Mn */ + { 0x0c4a, 0x0c4d }, /* Mn */ + { 0x0c55, 0x0c56 }, /* Mn */ + { 0x0c62, 0x0c63 }, /* Mn */ + { 0x0c81, 0x0c81 }, /* Mn */ + { 0x0cbc, 0x0cbc }, /* Mn */ + { 0x0cbf, 0x0cbf }, /* Mn */ + { 0x0cc6, 0x0cc6 }, /* Mn */ + { 0x0ccc, 0x0ccd }, /* Mn */ + { 0x0ce2, 0x0ce3 }, /* Mn */ + { 0x0d00, 0x0d01 }, /* Mn */ + { 0x0d3b, 0x0d3c }, /* Mn */ + { 0x0d41, 0x0d44 }, /* Mn */ + { 0x0d4d, 0x0d4d }, /* Mn */ + { 0x0d62, 0x0d63 }, /* Mn */ + { 0x0d81, 0x0d81 }, /* Mn */ + { 0x0dca, 0x0dca }, /* Mn */ + { 0x0dd2, 0x0dd4 }, /* Mn */ + { 0x0dd6, 0x0dd6 }, /* Mn */ + { 0x0e31, 0x0e31 }, /* Mn */ + { 0x0e34, 0x0e3a }, /* Mn */ + { 0x0e47, 0x0e4e }, /* Mn */ + { 0x0eb1, 0x0eb1 }, /* Mn */ + { 0x0eb4, 0x0ebc }, /* Mn */ + { 0x0ec8, 0x0ecd }, /* Mn */ + { 0x0f18, 0x0f19 }, /* Mn */ + { 0x0f35, 0x0f35 }, /* Mn */ + { 0x0f37, 0x0f37 }, /* Mn */ + { 0x0f39, 0x0f39 }, /* Mn */ + { 0x0f71, 0x0f7e }, /* Mn */ + { 0x0f80, 0x0f84 }, /* Mn */ + { 0x0f86, 0x0f87 }, /* Mn */ + { 0x0f8d, 0x0f97 }, /* Mn */ + { 0x0f99, 0x0fbc }, /* Mn */ + { 0x0fc6, 0x0fc6 }, /* Mn */ + { 0x102d, 0x1030 }, /* Mn */ + { 0x1032, 0x1037 }, /* Mn */ + { 0x1039, 0x103a }, /* Mn */ + { 0x103d, 0x103e }, /* Mn */ + { 0x1058, 0x1059 }, /* Mn */ + { 0x105e, 0x1060 }, /* Mn */ + { 0x1071, 0x1074 }, /* Mn */ + { 0x1082, 0x1082 }, /* Mn */ + { 0x1085, 0x1086 }, /* Mn */ + { 0x108d, 0x108d }, /* Mn */ + { 0x109d, 0x109d }, /* Mn */ + { 0x1160, 0x11ff }, /* Mn */ + { 0x135d, 0x135f }, /* Mn */ + { 0x1712, 0x1714 }, /* Mn */ + { 0x1732, 0x1733 }, /* Mn */ + { 0x1752, 0x1753 }, /* Mn */ + { 0x1772, 0x1773 }, /* Mn */ + { 0x17b4, 0x17b5 }, /* Mn */ + { 0x17b7, 0x17bd }, /* Mn */ + { 0x17c6, 0x17c6 }, /* Mn */ + { 0x17c9, 0x17d3 }, /* Mn */ + { 0x17dd, 0x17dd }, /* Mn */ + { 0x180b, 0x180d }, /* Mn */ + { 0x180f, 0x180f }, /* Mn */ + { 0x1885, 0x1886 }, /* Mn */ + { 0x18a9, 0x18a9 }, /* Mn */ + { 0x1920, 0x1922 }, /* Mn */ + { 0x1927, 0x1928 }, /* Mn */ + { 0x1932, 0x1932 }, /* Mn */ + { 0x1939, 0x193b }, /* Mn */ + { 0x1a17, 0x1a18 }, /* Mn */ + { 0x1a1b, 0x1a1b }, /* Mn */ + { 0x1a56, 0x1a56 }, /* Mn */ + { 0x1a58, 0x1a5e }, /* Mn */ + { 0x1a60, 0x1a60 }, /* Mn */ + { 0x1a62, 0x1a62 }, /* Mn */ + { 0x1a65, 0x1a6c }, /* Mn */ + { 0x1a73, 0x1a7c }, /* Mn */ + { 0x1a7f, 0x1a7f }, /* Mn */ + { 0x1ab0, 0x1abd }, /* Mn */ + { 0x1abe, 0x1abe }, /* Me */ + { 0x1abf, 0x1ace }, /* Mn */ + { 0x1b00, 0x1b03 }, /* Mn */ + { 0x1b34, 0x1b34 }, /* Mn */ + { 0x1b36, 0x1b3a }, /* Mn */ + { 0x1b3c, 0x1b3c }, /* Mn */ + { 0x1b42, 0x1b42 }, /* Mn */ + { 0x1b6b, 0x1b73 }, /* Mn */ + { 0x1b80, 0x1b81 }, /* Mn */ + { 0x1ba2, 0x1ba5 }, /* Mn */ + { 0x1ba8, 0x1ba9 }, /* Mn */ + { 0x1bab, 0x1bad }, /* Mn */ + { 0x1be6, 0x1be6 }, /* Mn */ + { 0x1be8, 0x1be9 }, /* Mn */ + { 0x1bed, 0x1bed }, /* Mn */ + { 0x1bef, 0x1bf1 }, /* Mn */ + { 0x1c2c, 0x1c33 }, /* Mn */ + { 0x1c36, 0x1c37 }, /* Mn */ + { 0x1cd0, 0x1cd2 }, /* Mn */ + { 0x1cd4, 0x1ce0 }, /* Mn */ + { 0x1ce2, 0x1ce8 }, /* Mn */ + { 0x1ced, 0x1ced }, /* Mn */ + { 0x1cf4, 0x1cf4 }, /* Mn */ + { 0x1cf8, 0x1cf9 }, /* Mn */ + { 0x1dc0, 0x1dff }, /* Mn */ + { 0x20d0, 0x20dc }, /* Mn */ + { 0x20dd, 0x20e0 }, /* Me */ + { 0x20e1, 0x20e1 }, /* Mn */ + { 0x20e2, 0x20e4 }, /* Me */ + { 0x20e5, 0x20f0 }, /* Mn */ + { 0x2cef, 0x2cf1 }, /* Mn */ + { 0x2d7f, 0x2d7f }, /* Mn */ + { 0x2de0, 0x2dff }, /* Mn */ + { 0x302a, 0x302d }, /* Mn */ + { 0x3099, 0x309a }, /* Mn */ + { 0xa66f, 0xa66f }, /* Mn */ + { 0xa670, 0xa672 }, /* Me */ + { 0xa674, 0xa67d }, /* Mn */ + { 0xa69e, 0xa69f }, /* Mn */ + { 0xa6f0, 0xa6f1 }, /* Mn */ + { 0xa802, 0xa802 }, /* Mn */ + { 0xa806, 0xa806 }, /* Mn */ + { 0xa80b, 0xa80b }, /* Mn */ + { 0xa825, 0xa826 }, /* Mn */ + { 0xa82c, 0xa82c }, /* Mn */ + { 0xa8c4, 0xa8c5 }, /* Mn */ + { 0xa8e0, 0xa8f1 }, /* Mn */ + { 0xa8ff, 0xa8ff }, /* Mn */ + { 0xa926, 0xa92d }, /* Mn */ + { 0xa947, 0xa951 }, /* Mn */ + { 0xa980, 0xa982 }, /* Mn */ + { 0xa9b3, 0xa9b3 }, /* Mn */ + { 0xa9b6, 0xa9b9 }, /* Mn */ + { 0xa9bc, 0xa9bd }, /* Mn */ + { 0xa9e5, 0xa9e5 }, /* Mn */ + { 0xaa29, 0xaa2e }, /* Mn */ + { 0xaa31, 0xaa32 }, /* Mn */ + { 0xaa35, 0xaa36 }, /* Mn */ + { 0xaa43, 0xaa43 }, /* Mn */ + { 0xaa4c, 0xaa4c }, /* Mn */ + { 0xaa7c, 0xaa7c }, /* Mn */ + { 0xaab0, 0xaab0 }, /* Mn */ + { 0xaab2, 0xaab4 }, /* Mn */ + { 0xaab7, 0xaab8 }, /* Mn */ + { 0xaabe, 0xaabf }, /* Mn */ + { 0xaac1, 0xaac1 }, /* Mn */ + { 0xaaec, 0xaaed }, /* Mn */ + { 0xaaf6, 0xaaf6 }, /* Mn */ + { 0xabe5, 0xabe5 }, /* Mn */ + { 0xabe8, 0xabe8 }, /* Mn */ + { 0xabed, 0xabed }, /* Mn */ + { 0xd7b0, 0xd7c6 }, /* Mn */ + { 0xd7cb, 0xd7fb }, /* Mn */ + { 0xfb1e, 0xfb1e }, /* Mn */ + { 0xfe00, 0xfe0f }, /* Mn */ + { 0xfe20, 0xfe2f }, /* Mn */ + { 0x101fd, 0x101fd }, /* Mn */ + { 0x102e0, 0x102e0 }, /* Mn */ + { 0x10376, 0x1037a }, /* Mn */ + { 0x10a01, 0x10a03 }, /* Mn */ + { 0x10a05, 0x10a06 }, /* Mn */ + { 0x10a0c, 0x10a0f }, /* Mn */ + { 0x10a38, 0x10a3a }, /* Mn */ + { 0x10a3f, 0x10a3f }, /* Mn */ + { 0x10ae5, 0x10ae6 }, /* Mn */ + { 0x10d24, 0x10d27 }, /* Mn */ + { 0x10eab, 0x10eac }, /* Mn */ + { 0x10f46, 0x10f50 }, /* Mn */ + { 0x10f82, 0x10f85 }, /* Mn */ + { 0x11001, 0x11001 }, /* Mn */ + { 0x11038, 0x11046 }, /* Mn */ + { 0x11070, 0x11070 }, /* Mn */ + { 0x11073, 0x11074 }, /* Mn */ + { 0x1107f, 0x11081 }, /* Mn */ + { 0x110b3, 0x110b6 }, /* Mn */ + { 0x110b9, 0x110ba }, /* Mn */ + { 0x110c2, 0x110c2 }, /* Mn */ + { 0x11100, 0x11102 }, /* Mn */ + { 0x11127, 0x1112b }, /* Mn */ + { 0x1112d, 0x11134 }, /* Mn */ + { 0x11173, 0x11173 }, /* Mn */ + { 0x11180, 0x11181 }, /* Mn */ + { 0x111b6, 0x111be }, /* Mn */ + { 0x111c9, 0x111cc }, /* Mn */ + { 0x111cf, 0x111cf }, /* Mn */ + { 0x1122f, 0x11231 }, /* Mn */ + { 0x11234, 0x11234 }, /* Mn */ + { 0x11236, 0x11237 }, /* Mn */ + { 0x1123e, 0x1123e }, /* Mn */ + { 0x112df, 0x112df }, /* Mn */ + { 0x112e3, 0x112ea }, /* Mn */ + { 0x11300, 0x11301 }, /* Mn */ + { 0x1133b, 0x1133c }, /* Mn */ + { 0x11340, 0x11340 }, /* Mn */ + { 0x11366, 0x1136c }, /* Mn */ + { 0x11370, 0x11374 }, /* Mn */ + { 0x11438, 0x1143f }, /* Mn */ + { 0x11442, 0x11444 }, /* Mn */ + { 0x11446, 0x11446 }, /* Mn */ + { 0x1145e, 0x1145e }, /* Mn */ + { 0x114b3, 0x114b8 }, /* Mn */ + { 0x114ba, 0x114ba }, /* Mn */ + { 0x114bf, 0x114c0 }, /* Mn */ + { 0x114c2, 0x114c3 }, /* Mn */ + { 0x115b2, 0x115b5 }, /* Mn */ + { 0x115bc, 0x115bd }, /* Mn */ + { 0x115bf, 0x115c0 }, /* Mn */ + { 0x115dc, 0x115dd }, /* Mn */ + { 0x11633, 0x1163a }, /* Mn */ + { 0x1163d, 0x1163d }, /* Mn */ + { 0x1163f, 0x11640 }, /* Mn */ + { 0x116ab, 0x116ab }, /* Mn */ + { 0x116ad, 0x116ad }, /* Mn */ + { 0x116b0, 0x116b5 }, /* Mn */ + { 0x116b7, 0x116b7 }, /* Mn */ + { 0x1171d, 0x1171f }, /* Mn */ + { 0x11722, 0x11725 }, /* Mn */ + { 0x11727, 0x1172b }, /* Mn */ + { 0x1182f, 0x11837 }, /* Mn */ + { 0x11839, 0x1183a }, /* Mn */ + { 0x1193b, 0x1193c }, /* Mn */ + { 0x1193e, 0x1193e }, /* Mn */ + { 0x11943, 0x11943 }, /* Mn */ + { 0x119d4, 0x119d7 }, /* Mn */ + { 0x119da, 0x119db }, /* Mn */ + { 0x119e0, 0x119e0 }, /* Mn */ + { 0x11a01, 0x11a0a }, /* Mn */ + { 0x11a33, 0x11a38 }, /* Mn */ + { 0x11a3b, 0x11a3e }, /* Mn */ + { 0x11a47, 0x11a47 }, /* Mn */ + { 0x11a51, 0x11a56 }, /* Mn */ + { 0x11a59, 0x11a5b }, /* Mn */ + { 0x11a8a, 0x11a96 }, /* Mn */ + { 0x11a98, 0x11a99 }, /* Mn */ + { 0x11c30, 0x11c36 }, /* Mn */ + { 0x11c38, 0x11c3d }, /* Mn */ + { 0x11c3f, 0x11c3f }, /* Mn */ + { 0x11c92, 0x11ca7 }, /* Mn */ + { 0x11caa, 0x11cb0 }, /* Mn */ + { 0x11cb2, 0x11cb3 }, /* Mn */ + { 0x11cb5, 0x11cb6 }, /* Mn */ + { 0x11d31, 0x11d36 }, /* Mn */ + { 0x11d3a, 0x11d3a }, /* Mn */ + { 0x11d3c, 0x11d3d }, /* Mn */ + { 0x11d3f, 0x11d45 }, /* Mn */ + { 0x11d47, 0x11d47 }, /* Mn */ + { 0x11d90, 0x11d91 }, /* Mn */ + { 0x11d95, 0x11d95 }, /* Mn */ + { 0x11d97, 0x11d97 }, /* Mn */ + { 0x11ef3, 0x11ef4 }, /* Mn */ + { 0x16af0, 0x16af4 }, /* Mn */ + { 0x16b30, 0x16b36 }, /* Mn */ + { 0x16f4f, 0x16f4f }, /* Mn */ + { 0x16f8f, 0x16f92 }, /* Mn */ + { 0x16fe4, 0x16fe4 }, /* Mn */ + { 0x1bc9d, 0x1bc9e }, /* Mn */ + { 0x1cf00, 0x1cf2d }, /* Mn */ + { 0x1cf30, 0x1cf46 }, /* Mn */ + { 0x1d167, 0x1d169 }, /* Mn */ + { 0x1d17b, 0x1d182 }, /* Mn */ + { 0x1d185, 0x1d18b }, /* Mn */ + { 0x1d1aa, 0x1d1ad }, /* Mn */ + { 0x1d242, 0x1d244 }, /* Mn */ + { 0x1da00, 0x1da36 }, /* Mn */ + { 0x1da3b, 0x1da6c }, /* Mn */ + { 0x1da75, 0x1da75 }, /* Mn */ + { 0x1da84, 0x1da84 }, /* Mn */ + { 0x1da9b, 0x1da9f }, /* Mn */ + { 0x1daa1, 0x1daaf }, /* Mn */ + { 0x1e000, 0x1e006 }, /* Mn */ + { 0x1e008, 0x1e018 }, /* Mn */ + { 0x1e01b, 0x1e021 }, /* Mn */ + { 0x1e023, 0x1e024 }, /* Mn */ + { 0x1e026, 0x1e02a }, /* Mn */ + { 0x1e130, 0x1e136 }, /* Mn */ + { 0x1e2ae, 0x1e2ae }, /* Mn */ + { 0x1e2ec, 0x1e2ef }, /* Mn */ + { 0x1e8d0, 0x1e8d6 }, /* Mn */ + { 0x1e944, 0x1e94a }, /* Mn */ + { 0xe0100, 0xe01ef }, /* Mn */ diff --git a/configure b/configure index eb346f8..a499490 100644 --- a/configure +++ b/configure @@ -57,8 +57,8 @@ else arg=$1; case $arg in #( *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; esac; expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ' @@ -84,7 +84,7 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -IFS=" "" $as_nl" +IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. as_myself= @@ -213,23 +213,23 @@ do test -z "$as_dir" && as_dir=. as_found=: case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi - done;; + done;; esac as_found=false done $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes fi; } IFS=$as_save_IFS @@ -328,27 +328,27 @@ as_fn_mkdir_p () as_dirs="'$as_qdir' $as_dirs" as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || $as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -437,22 +437,22 @@ fi as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || $as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -501,10 +501,10 @@ ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *c*) ECHO_T=' ';; # ECHO_T is single tab character. xy) ECHO_C='\c';; *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; + ECHO_T=' ';; esac;; *) ECHO_N='-n';; @@ -811,7 +811,7 @@ do "enable_$ac_useropt" "*) ;; *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + ac_unrecognized_sep=', ';; esac eval enable_$ac_useropt=no ;; @@ -837,7 +837,7 @@ do "enable_$ac_useropt" "*) ;; *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + ac_unrecognized_sep=', ';; esac eval enable_$ac_useropt=\$ac_optarg ;; @@ -1050,7 +1050,7 @@ do "with_$ac_useropt" "*) ;; *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + ac_unrecognized_sep=', ';; esac eval with_$ac_useropt=\$ac_optarg ;; @@ -1066,7 +1066,7 @@ do "with_$ac_useropt" "*) ;; *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + ac_unrecognized_sep=', ';; esac eval with_$ac_useropt=no ;; @@ -1127,10 +1127,10 @@ if test -n "$ac_unrecognized_opts"; then fi # Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1183,27 +1183,27 @@ if test -z "$srcdir"; then # Try the directory containing this script, then the parent directory. ac_confdir=`$as_dirname -- "$as_myself" || $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || $as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. @@ -1217,8 +1217,8 @@ if test ! -r "$srcdir/$ac_unique_file"; then fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then srcdir=. @@ -1436,15 +1436,15 @@ $as_echo "$ac_try_echo"; } >&5 fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err + test -z "$ac_c_werror_flag" || + test ! -s conftest.err } && test -s conftest.$ac_objext; then : ac_retval=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1474,18 +1474,18 @@ $as_echo "$ac_try_echo"; } >&5 fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err + test -z "$ac_c_werror_flag" || + test ! -s conftest.err } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext + test "$cross_compiling" = yes || + test -x conftest$ac_exeext }; then : ac_retval=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1519,8 +1519,8 @@ $as_echo "$ac_try_echo"; } >&5 fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err }; then : ac_retval=0 else @@ -1591,7 +1591,7 @@ if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } else # Is the header compilable? @@ -1656,7 +1656,7 @@ else eval "$3=\$ac_header_compiler" fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -1688,7 +1688,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -1714,7 +1714,7 @@ int main () { if (sizeof ($2)) - return 0; + return 0; ; return 0; } @@ -1727,7 +1727,7 @@ int main () { if (sizeof (($2))) - return 0; + return 0; ; return 0; } @@ -1742,7 +1742,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -1809,7 +1809,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -1897,19 +1897,19 @@ do 2) as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi as_fn_append ac_configure_args " '$ac_arg'" ;; @@ -1954,8 +1954,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( *${as_nl}ac_space=\ *) sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ;; #( *) sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" @@ -1986,11 +1986,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo for ac_var in $ac_subst_files do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -2118,21 +2118,21 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2553,24 +2553,24 @@ do test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; * ) - break;; + break;; esac done test "$ac_cv_exeext" = no && ac_cv_exeext= @@ -2622,7 +2622,7 @@ for ac_file in conftest.exe conftest conftest.*; do case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; + break;; * ) break;; esac done @@ -2683,9 +2683,9 @@ $as_echo "$ac_try_echo"; } >&5 cross_compiling=no else if test "$cross_compiling" = maybe; then - cross_compiling=yes + cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. @@ -2825,8 +2825,8 @@ if ac_fn_c_try_compile "$LINENO"; then : else ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2924,7 +2924,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; } _ACEOF for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -3051,7 +3051,7 @@ do #else # include #endif - Syntax error + Syntax error _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : @@ -3110,7 +3110,7 @@ do #else # include #endif - Syntax error + Syntax error _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : @@ -3393,30 +3393,30 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi done done ;; @@ -3467,9 +3467,9 @@ else if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -3478,8 +3478,8 @@ else incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -3488,16 +3488,16 @@ main () return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO"; then : break fi rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32'; break fi rm -f core conftest.err conftest.$ac_objext - break + break done CC=$ac_save_CC rm -f conftest.$ac_ext @@ -3524,8 +3524,8 @@ else incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -3548,8 +3548,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -3593,8 +3593,8 @@ else incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -3617,8 +3617,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -4124,9 +4124,9 @@ else # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -4137,7 +4137,7 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) return 2; return 0; } @@ -4163,7 +4163,7 @@ fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default @@ -5703,8 +5703,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. @@ -5727,15 +5727,15 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" + cat confcache >"$cache_file" else case $cache_file in #( */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( *) - mv -f confcache "$cache_file" ;; - esac + mv -f confcache "$cache_file" ;; + esac fi fi else @@ -5840,8 +5840,8 @@ else arg=$1; case $arg in #( *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; esac; expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ' @@ -5867,7 +5867,7 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -IFS=" "" $as_nl" +IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. as_myself= @@ -6016,22 +6016,22 @@ fi as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || $as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -6044,10 +6044,10 @@ ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *c*) ECHO_T=' ';; # ECHO_T is single tab character. xy) ECHO_C='\c';; *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; + ECHO_T=' ';; esac;; *) ECHO_N='-n';; @@ -6100,27 +6100,27 @@ as_fn_mkdir_p () as_dirs="'$as_qdir' $as_dirs" as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || $as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -6530,21 +6530,21 @@ _ACEOF # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ h s/// s/^/:/ -s/[ ]*$/:/ +s/[ ]*$/:/ s/:\$(srcdir):/:/g s/:\${srcdir}:/:/g s/:@srcdir@:/:/g s/^:*// s/:*$// x -s/\(=[ ]*\).*/\1/ +s/\(=[ ]*\).*/\1/ G s/\n// -s/^[^=]*=[ ]*$// +s/^[^=]*=[ ]*$// }' fi @@ -6586,23 +6586,23 @@ sed -n ' s/.\{148\}/&'"$ac_delim"'/g t rset :rset -s/^[ ]*#[ ]*define[ ][ ]*/ / +s/^[ ]*#[ ]*define[ ][ ]*/ / t def d :def s/\\$// t bsnl s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p d :bsnl s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ D["\1"]=" \3\\\\\\n"\\/p t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p t cont d :cont @@ -6690,14 +6690,14 @@ do case $ac_f in -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6707,8 +6707,8 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 @@ -6731,27 +6731,27 @@ $as_echo "$as_me: creating $ac_file" >&6;} ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || $as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. @@ -6859,7 +6859,7 @@ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 @@ -6889,7 +6889,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ @@ -6936,4 +6936,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/configure.ac b/configure.ac index f7c6481..2ff5d01 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # You may distribute under the terms of either the GNU General Public # License or the Less License, as specified in the README file. # -# For more information about less, or for information on how to +# For more information about less, or for information on how to # contact the author, see the README file. # Autoconf initialization. @@ -194,73 +194,73 @@ LIBS="$LIBS $TERMLIBS" # Autoheader templates for symbols defined later by AC_DEFINE. AH_TEMPLATE([HAVE_GNU_REGEX], - [GNU regex library]) + [GNU regex library]) AH_TEMPLATE([HAVE_POSIX_REGCOMP], - [POSIX regcomp() and regex.h]) + [POSIX regcomp() and regex.h]) AH_TEMPLATE([HAVE_PCRE], - [PCRE (Perl-compatible regular expression) library]) + [PCRE (Perl-compatible regular expression) library]) AH_TEMPLATE([HAVE_PCRE2], - [PCRE2 (Perl-compatible regular expression) library]) + [PCRE2 (Perl-compatible regular expression) library]) AH_TEMPLATE([HAVE_RE_COMP], - [BSD re_comp()]) + [BSD re_comp()]) AH_TEMPLATE([HAVE_REGCMP], - [System V regcmp()]) + [System V regcmp()]) AH_TEMPLATE([HAVE_V8_REGCOMP], - [Henry Spencer V8 regcomp() and regexp.h]) + [Henry Spencer V8 regcomp() and regexp.h]) AH_TEMPLATE([NO_REGEX], - [pattern matching is supported, but without metacharacters.]) + [pattern matching is supported, but without metacharacters.]) AH_TEMPLATE([HAVE_REGEXEC2], - []) + []) AH_TEMPLATE([HAVE_VOID], - [Define HAVE_VOID if your compiler supports the "void" type.]) + [Define HAVE_VOID if your compiler supports the "void" type.]) AH_TEMPLATE([HAVE_FLOAT], - [Define HAVE_FLOAT if your compiler supports the "double" type.]) + [Define HAVE_FLOAT if your compiler supports the "double" type.]) AH_TEMPLATE([HAVE_CONST], - [Define HAVE_CONST if your compiler supports the "const" modifier.]) + [Define HAVE_CONST if your compiler supports the "const" modifier.]) AH_TEMPLATE([HAVE_STAT_INO], - [Define HAVE_STAT_INO if your struct stat has st_ino and st_dev.]) + [Define HAVE_STAT_INO if your struct stat has st_ino and st_dev.]) AH_TEMPLATE([HAVE_PROCFS], - [Define HAVE_PROCFS if have have fstatfs with f_type and PROC_SUPER_MAGIC.]) + [Define HAVE_PROCFS if have have fstatfs with f_type and PROC_SUPER_MAGIC.]) AH_TEMPLATE([HAVE_TIME_T], - [Define HAVE_TIME_T if your system supports the "time_t" type.]) + [Define HAVE_TIME_T if your system supports the "time_t" type.]) AH_TEMPLATE([HAVE_STRERROR], - [Define HAVE_STRERROR if you have the strerror() function.]) + [Define HAVE_STRERROR if you have the strerror() function.]) AH_TEMPLATE([HAVE_FILENO], - [Define HAVE_FILENO if you have the fileno() macro.]) + [Define HAVE_FILENO if you have the fileno() macro.]) AH_TEMPLATE([HAVE_ERRNO], - [Define HAVE_ERRNO if you have the errno variable.]) + [Define HAVE_ERRNO if you have the errno variable.]) AH_TEMPLATE([MUST_DEFINE_ERRNO], - [Define MUST_DEFINE_ERRNO if you have errno but it is not define in errno.h.]) + [Define MUST_DEFINE_ERRNO if you have errno but it is not define in errno.h.]) AH_TEMPLATE([HAVE_SYS_ERRLIST], - [Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable.]) + [Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable.]) AH_TEMPLATE([HAVE_OSPEED], - [Define HAVE_OSPEED if your termcap library has the ospeed variable.]) + [Define HAVE_OSPEED if your termcap library has the ospeed variable.]) AH_TEMPLATE([MUST_DEFINE_OSPEED], - [Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined in termcap.h.]) + [Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined in termcap.h.]) AH_TEMPLATE([HAVE_LOCALE], - [Define HAVE_LOCALE if you have locale.h and setlocale.]) + [Define HAVE_LOCALE if you have locale.h and setlocale.]) AH_TEMPLATE([HAVE_TERMIOS_FUNCS], - [Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr.]) + [Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr.]) AH_TEMPLATE([HAVE_UPPER_LOWER], - [Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower.]) + [Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower.]) AH_TEMPLATE([HAVE_WCTYPE], - [Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower.]) + [Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower.]) AH_TEMPLATE([HAVE_SIGSET_T], - [Define HAVE_SIGSET_T you have the sigset_t type.]) + [Define HAVE_SIGSET_T you have the sigset_t type.]) AH_TEMPLATE([HAVE_SIGEMPTYSET], - [Define HAVE_SIGEMPTYSET if you have the sigemptyset macro.]) + [Define HAVE_SIGEMPTYSET if you have the sigemptyset macro.]) AH_TEMPLATE([EDIT_PGM], - [Define EDIT_PGM to your editor.]) + [Define EDIT_PGM to your editor.]) AH_TEMPLATE([SECURE_COMPILE], - [Define SECURE_COMPILE=1 to build a secure version of less.]) + [Define SECURE_COMPILE=1 to build a secure version of less.]) # Checks for identifiers. AC_TYPE_OFF_T AC_MSG_CHECKING(for void) -AC_TRY_COMPILE(, [void *foo = 0;], +AC_TRY_COMPILE(, [void *foo = 0;], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for const) -AC_TRY_COMPILE(, [const int foo = 0;], +AC_TRY_COMPILE(, [const int foo = 0;], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for time_t) AC_TRY_COMPILE([#include ], [time_t t = 0;], @@ -330,7 +330,7 @@ AC_TRY_LINK([ [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for sys_errlist) -AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], +AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) AC_CHECK_TYPES([sigset_t],,,[#include ]) @@ -346,13 +346,13 @@ AC_MSG_CHECKING(for errno) AC_TRY_LINK([ #if HAVE_ERRNO_H #include -#endif], [static int x; x = errno;], +#endif], [static int x; x = errno;], [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes]) if test $have_errno = no; then AC_TRY_LINK([ #if HAVE_ERRNO_H #include -#endif], [extern int errno; static int x; x = errno;], +#endif], [extern int errno; static int x; x = errno;], [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)], [AC_MSG_RESULT(no)]) fi @@ -387,7 +387,7 @@ AC_TRY_LINK([ #endif], [ospeed = 0;], [AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes]) if test $have_ospeed = no; then -AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], +AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)], [AC_MSG_RESULT(no)]) fi @@ -405,7 +405,7 @@ AC_ARG_WITH(no-float, [ --with-no-float Do not use floating point], WANT_NO_FLOAT=1, WANT_NO_FLOAT=0) if test $WANT_NO_FLOAT = 0; then - AC_TRY_LINK(, [double f1 = 12.5; double f2 = f1*f1/2.5;], + AC_TRY_LINK(, [double f1 = 12.5; double f2 = f1*f1/2.5;], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FLOAT)], [AC_MSG_RESULT(no)]) else AC_MSG_RESULT(disabled by user) @@ -459,28 +459,28 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = pcre2; then -AC_CHECK_LIB(pcre2-8, pcre2_compile_8, +AC_CHECK_LIB(pcre2-8, pcre2_compile_8, [AC_DEFINE(HAVE_PCRE2) LIBS="$LIBS -lpcre2-8" have_regex=yes; supported_regex="$supported_regex pcre2"], []) 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_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 = gnu; then -AC_CHECK_LIB(c, re_compile_pattern, +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_CHECK_FUNC(regcmp, [AC_DEFINE(HAVE_REGCMP) have_regex=yes; supported_regex="$supported_regex regcmp"],[]) fi fi @@ -496,7 +496,7 @@ 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_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 @@ -545,100 +545,100 @@ AH_TOP([ * be safe to run by unprivileged users. * SECURE_COMPILE is set by the --with-secure configure option. */ -#define SECURE SECURE_COMPILE +#define SECURE SECURE_COMPILE /* * SHELL_ESCAPE is 1 if you wish to allow shell escapes. * (This is possible only if your system supplies the system() function.) */ -#define SHELL_ESCAPE (!SECURE) +#define SHELL_ESCAPE (!SECURE) /* * EXAMINE is 1 if you wish to allow examining files by name from within less. */ -#define EXAMINE (!SECURE) +#define EXAMINE (!SECURE) /* * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key * to complete filenames at prompts. */ -#define TAB_COMPLETE_FILENAME (!SECURE) +#define TAB_COMPLETE_FILENAME (!SECURE) /* * CMD_HISTORY is 1 if you wish to allow keys to cycle through * previous commands at prompts. */ -#define CMD_HISTORY 1 +#define CMD_HISTORY 1 /* - * HILITE_SEARCH is 1 if you wish to have search targets to be + * HILITE_SEARCH is 1 if you wish to have search targets to be * displayed in standout mode. */ -#define HILITE_SEARCH 1 +#define HILITE_SEARCH 1 /* * EDITOR is 1 if you wish to allow editor invocation (the "v" command). * (This is possible only if your system supplies the system() function.) * EDIT_PGM is the name of the (default) editor to be invoked. */ -#define EDITOR (!SECURE) +#define EDITOR (!SECURE) /* * TAGS is 1 if you wish to support tag files. */ -#define TAGS (!SECURE) +#define TAGS (!SECURE) /* - * USERFILE is 1 if you wish to allow a .less file to specify + * USERFILE is 1 if you wish to allow a .less file to specify * user-defined key bindings. */ -#define USERFILE (!SECURE) +#define USERFILE (!SECURE) /* * GLOB is 1 if you wish to have shell metacharacters expanded in filenames. * This will generally work if your system provides the "popen" function * and the "echo" shell command. */ -#define GLOB (!SECURE) +#define GLOB (!SECURE) /* * PIPEC is 1 if you wish to have the "|" command * which allows the user to pipe data into a shell command. */ -#define PIPEC (!SECURE && HAVE_POPEN) +#define PIPEC (!SECURE && HAVE_POPEN) /* * LOGFILE is 1 if you wish to allow the -o option (to create log files). */ -#define LOGFILE (!SECURE) +#define LOGFILE (!SECURE) /* * GNU_OPTIONS is 1 if you wish to support the GNU-style command * line options --help and --version. */ -#define GNU_OPTIONS 1 +#define GNU_OPTIONS 1 /* * ONLY_RETURN is 1 if you want RETURN to be the only input which * will continue past an error message. * Otherwise, any key will continue past an error message. */ -#define ONLY_RETURN 0 +#define ONLY_RETURN 0 /* - * LESSKEYFILE is the filename of the default lesskey output file + * LESSKEYFILE is the filename of the default lesskey output file * (in the HOME directory). * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file. - * DEF_LESSKEYINFILE is the filename of the default lesskey input + * DEF_LESSKEYINFILE is the filename of the default lesskey input * (in the HOME directory). * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ -#define LESSKEYFILE ".less" -#define LESSKEYFILE_SYS SYSDIR "/sysless" -#define DEF_LESSKEYINFILE ".lesskey" -#define LESSKEYINFILE_SYS SYSDIR "/syslesskey" -#define LESSHISTFILE ".lesshst" +#define LESSKEYFILE ".less" +#define LESSKEYFILE_SYS SYSDIR "/sysless" +#define DEF_LESSKEYINFILE ".lesskey" +#define LESSKEYINFILE_SYS SYSDIR "/syslesskey" +#define LESSHISTFILE ".lesshst" /* Settings always true on Unix. */ @@ -646,12 +646,12 @@ AH_TOP([ /* * Define MSDOS_COMPILER if compiling under Microsoft C. */ -#define MSDOS_COMPILER 0 +#define MSDOS_COMPILER 0 /* * Pathname separator character. */ -#define PATHNAME_SEP "/" +#define PATHNAME_SEP "/" /* * The value returned from tgetent on success. @@ -660,14 +660,14 @@ AH_TOP([ #define TGETENT_OK 1 /* - * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. + * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. */ -#define HAVE_ANSI_PROTOS 1 +#define HAVE_ANSI_PROTOS 1 /* * HAVE_SYS_TYPES_H is 1 if your system has . */ -#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TYPES_H 1 /* * Define if you have the header file. @@ -678,28 +678,28 @@ AH_TOP([ * HAVE_PERROR is 1 if your system has the perror() call. * (Actually, if it has sys_errlist, sys_nerr and errno.) */ -#define HAVE_PERROR 1 +#define HAVE_PERROR 1 /* * HAVE_TIME is 1 if your system has the time() call. */ -#define HAVE_TIME 1 +#define HAVE_TIME 1 /* * HAVE_SHELL is 1 if your system supports a SHELL command interpreter. */ -#define HAVE_SHELL 1 +#define HAVE_SHELL 1 /* * Default shell metacharacters and meta-escape character. */ -#define DEF_METACHARS "; *?\t\n'\"()<>[]|&^`#\\$%=~{}," -#define DEF_METAESCAPE "\\" +#define DEF_METACHARS "; *?\t\n'\"()<>[]|&^`#\\$%=~{}," +#define DEF_METAESCAPE "\\" -/* +/* * HAVE_DUP is 1 if your system has the dup() call. */ -#define HAVE_DUP 1 +#define HAVE_DUP 1 /* Define to 1 if you have the memcpy() function. */ #define HAVE_MEMCPY 1 @@ -717,25 +717,25 @@ 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 */ -#define OUTBUF_SIZE 1024 /* Output buffer */ -#define PROMPT_SIZE 200 /* 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 512 /* Max size of line in tags file */ -#define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#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 */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 200 /* 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 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 */ +#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. */ diff --git a/cvt.c b/cvt.c index bb46492..60ee817 100644 --- a/cvt.c +++ b/cvt.c @@ -19,34 +19,34 @@ extern int utf_mode; /* * Get the length of a buffer needed to convert a string. */ - public int + public int cvt_length(len, ops) - int len; - int ops; + int len; + int ops; { - if (utf_mode) - /* - * Just copying a string in UTF-8 mode can cause it to grow - * in length. - * Four output bytes for one input byte is the worst case. - */ - len *= 4; - return (len + 1); + if (utf_mode) + /* + * Just copying a string in UTF-8 mode can cause it to grow + * in length. + * Four output bytes for one input byte is the worst case. + */ + len *= 4; + return (len + 1); } /* * Allocate a chpos array for use by cvt_text. */ - public int * + public int * cvt_alloc_chpos(len) - int len; + int len; { - int i; - int *chpos = (int *) ecalloc(sizeof(int), len); - /* Initialize all entries to an invalid position. */ - for (i = 0; i < len; i++) - chpos[i] = -1; - return (chpos); + int i; + int *chpos = (int *) ecalloc(sizeof(int), len); + /* Initialize all entries to an invalid position. */ + for (i = 0; i < len; i++) + chpos[i] = -1; + return (chpos); } /* @@ -54,65 +54,65 @@ cvt_alloc_chpos(len) * Returns converted text in odst. The original offset of each * odst character (when it was in osrc) is returned in the chpos array. */ - public void + public void cvt_text(odst, osrc, chpos, lenp, ops) - char *odst; - char *osrc; - int *chpos; - int *lenp; - int ops; + char *odst; + char *osrc; + int *chpos; + int *lenp; + int ops; { - char *dst; - char *edst = odst; - char *src; - char *src_end; - LWCHAR ch; + char *dst; + char *edst = odst; + char *src; + char *src_end; + LWCHAR ch; - if (lenp != NULL) - src_end = osrc + *lenp; - else - src_end = osrc + strlen(osrc); + if (lenp != NULL) + src_end = osrc + *lenp; + else + src_end = osrc + strlen(osrc); - for (src = osrc, dst = odst; src < src_end; ) - { - int src_pos = (int) (src - osrc); - int dst_pos = (int) (dst - odst); - struct ansi_state *pansi; - ch = step_char(&src, +1, src_end); - if ((ops & CVT_BS) && ch == '\b' && dst > odst) - { - /* Delete backspace and preceding char. */ - do { - dst--; - } while (dst > odst && utf_mode && - !IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst)); - } else if ((ops & CVT_ANSI) && (pansi = ansi_start(ch)) != NULL) - { - /* Skip to end of ANSI escape sequence. */ - while (src < src_end) - { - if (ansi_step(pansi, ch) != ANSI_MID) - break; - ch = *src++; - } - ansi_done(pansi); - } else - { - /* Just copy the char to the destination buffer. */ - if ((ops & CVT_TO_LC) && IS_UPPER(ch)) - ch = TO_LOWER(ch); - put_wchar(&dst, ch); - /* Record the original position of the char. */ - if (chpos != NULL) - chpos[dst_pos] = src_pos; - } - if (dst > edst) - edst = dst; - } - if ((ops & CVT_CRLF) && edst > odst && edst[-1] == '\r') - edst--; - *edst = '\0'; - if (lenp != NULL) - *lenp = (int) (edst - odst); - /* FIXME: why was this here? if (chpos != NULL) chpos[dst - odst] = src - osrc; */ + for (src = osrc, dst = odst; src < src_end; ) + { + int src_pos = (int) (src - osrc); + int dst_pos = (int) (dst - odst); + struct ansi_state *pansi; + ch = step_char(&src, +1, src_end); + if ((ops & CVT_BS) && ch == '\b' && dst > odst) + { + /* Delete backspace and preceding char. */ + do { + dst--; + } while (dst > odst && utf_mode && + !IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst)); + } else if ((ops & CVT_ANSI) && (pansi = ansi_start(ch)) != NULL) + { + /* Skip to end of ANSI escape sequence. */ + while (src < src_end) + { + if (ansi_step(pansi, ch) != ANSI_MID) + break; + ch = *src++; + } + ansi_done(pansi); + } else + { + /* Just copy the char to the destination buffer. */ + if ((ops & CVT_TO_LC) && IS_UPPER(ch)) + ch = TO_LOWER(ch); + put_wchar(&dst, ch); + /* Record the original position of the char. */ + if (chpos != NULL) + chpos[dst_pos] = src_pos; + } + if (dst > edst) + edst = dst; + } + if ((ops & CVT_CRLF) && edst > odst && edst[-1] == '\r') + edst--; + *edst = '\0'; + if (lenp != NULL) + *lenp = (int) (edst - odst); + /* FIXME: why was this here? if (chpos != NULL) chpos[dst - odst] = src - osrc; */ } diff --git a/decode.c b/decode.c index 0444cab..e0f8827 100644 --- a/decode.c +++ b/decode.c @@ -40,7 +40,7 @@ extern int screen_trashed; extern int sc_height; #define SK(k) \ - SK_SPECIAL_KEY, (k), 6, 1, 1, 1 + SK_SPECIAL_KEY, (k), 6, 1, 1, 1 /* * Command table is ordered roughly according to expected * frequency of use, so the common commands are near the beginning. @@ -48,176 +48,176 @@ extern int sc_height; static unsigned char cmdtable[] = { - '\r',0, A_F_LINE, - '\n',0, A_F_LINE, - 'e',0, A_F_LINE, - 'j',0, A_F_LINE, - SK(SK_DOWN_ARROW),0, A_F_LINE, - CONTROL('E'),0, A_F_LINE, - CONTROL('N'),0, A_F_LINE, - 'k',0, A_B_LINE, - 'y',0, A_B_LINE, - CONTROL('Y'),0, A_B_LINE, - SK(SK_CONTROL_K),0, A_B_LINE, - CONTROL('P'),0, A_B_LINE, - SK(SK_UP_ARROW),0, A_B_LINE, - 'J',0, A_FF_LINE, - 'K',0, A_BF_LINE, - 'Y',0, A_BF_LINE, - 'd',0, A_F_SCROLL, - CONTROL('D'),0, A_F_SCROLL, - 'u',0, A_B_SCROLL, - CONTROL('U'),0, A_B_SCROLL, - ESC,'[','M',0, A_X11MOUSE_IN, - ESC,'[','<',0, A_X116MOUSE_IN, - ' ',0, A_F_SCREEN, - 'f',0, A_F_SCREEN, - CONTROL('F'),0, A_F_SCREEN, - CONTROL('V'),0, A_F_SCREEN, - SK(SK_PAGE_DOWN),0, A_F_SCREEN, - 'b',0, A_B_SCREEN, - CONTROL('B'),0, A_B_SCREEN, - ESC,'v',0, A_B_SCREEN, - SK(SK_PAGE_UP),0, A_B_SCREEN, - 'z',0, A_F_WINDOW, - 'w',0, A_B_WINDOW, - ESC,' ',0, A_FF_SCREEN, - 'F',0, A_F_FOREVER, - ESC,'F',0, A_F_UNTIL_HILITE, - 'R',0, A_FREPAINT, - 'r',0, A_REPAINT, - CONTROL('R'),0, A_REPAINT, - CONTROL('L'),0, A_REPAINT, - ESC,'u',0, A_UNDO_SEARCH, - ESC,'U',0, A_CLR_SEARCH, - 'g',0, A_GOLINE, - SK(SK_HOME),0, A_GOLINE, - '<',0, A_GOLINE, - ESC,'<',0, A_GOLINE, - 'p',0, A_PERCENT, - '%',0, A_PERCENT, - ESC,'[',0, A_LSHIFT, - ESC,']',0, A_RSHIFT, - ESC,'(',0, A_LSHIFT, - ESC,')',0, A_RSHIFT, - ESC,'{',0, A_LLSHIFT, - ESC,'}',0, A_RRSHIFT, - SK(SK_RIGHT_ARROW),0, A_RSHIFT, - SK(SK_LEFT_ARROW),0, A_LSHIFT, - SK(SK_CTL_RIGHT_ARROW),0, A_RRSHIFT, - SK(SK_CTL_LEFT_ARROW),0, A_LLSHIFT, - '{',0, A_F_BRACKET|A_EXTRA, '{','}',0, - '}',0, A_B_BRACKET|A_EXTRA, '{','}',0, - '(',0, A_F_BRACKET|A_EXTRA, '(',')',0, - ')',0, A_B_BRACKET|A_EXTRA, '(',')',0, - '[',0, A_F_BRACKET|A_EXTRA, '[',']',0, - ']',0, A_B_BRACKET|A_EXTRA, '[',']',0, - ESC,CONTROL('F'),0, A_F_BRACKET, - ESC,CONTROL('B'),0, A_B_BRACKET, - 'G',0, A_GOEND, - ESC,'G',0, A_GOEND_BUF, - ESC,'>',0, A_GOEND, - '>',0, A_GOEND, - SK(SK_END),0, A_GOEND, - 'P',0, A_GOPOS, + '\r',0, A_F_LINE, + '\n',0, A_F_LINE, + 'e',0, A_F_LINE, + 'j',0, A_F_LINE, + SK(SK_DOWN_ARROW),0, A_F_LINE, + CONTROL('E'),0, A_F_LINE, + CONTROL('N'),0, A_F_LINE, + 'k',0, A_B_LINE, + 'y',0, A_B_LINE, + CONTROL('Y'),0, A_B_LINE, + SK(SK_CONTROL_K),0, A_B_LINE, + CONTROL('P'),0, A_B_LINE, + SK(SK_UP_ARROW),0, A_B_LINE, + 'J',0, A_FF_LINE, + 'K',0, A_BF_LINE, + 'Y',0, A_BF_LINE, + 'd',0, A_F_SCROLL, + CONTROL('D'),0, A_F_SCROLL, + 'u',0, A_B_SCROLL, + CONTROL('U'),0, A_B_SCROLL, + ESC,'[','M',0, A_X11MOUSE_IN, + ESC,'[','<',0, A_X116MOUSE_IN, + ' ',0, A_F_SCREEN, + 'f',0, A_F_SCREEN, + CONTROL('F'),0, A_F_SCREEN, + CONTROL('V'),0, A_F_SCREEN, + SK(SK_PAGE_DOWN),0, A_F_SCREEN, + 'b',0, A_B_SCREEN, + CONTROL('B'),0, A_B_SCREEN, + ESC,'v',0, A_B_SCREEN, + SK(SK_PAGE_UP),0, A_B_SCREEN, + 'z',0, A_F_WINDOW, + 'w',0, A_B_WINDOW, + ESC,' ',0, A_FF_SCREEN, + 'F',0, A_F_FOREVER, + ESC,'F',0, A_F_UNTIL_HILITE, + 'R',0, A_FREPAINT, + 'r',0, A_REPAINT, + CONTROL('R'),0, A_REPAINT, + CONTROL('L'),0, A_REPAINT, + ESC,'u',0, A_UNDO_SEARCH, + ESC,'U',0, A_CLR_SEARCH, + 'g',0, A_GOLINE, + SK(SK_HOME),0, A_GOLINE, + '<',0, A_GOLINE, + ESC,'<',0, A_GOLINE, + 'p',0, A_PERCENT, + '%',0, A_PERCENT, + ESC,'[',0, A_LSHIFT, + ESC,']',0, A_RSHIFT, + ESC,'(',0, A_LSHIFT, + ESC,')',0, A_RSHIFT, + ESC,'{',0, A_LLSHIFT, + ESC,'}',0, A_RRSHIFT, + SK(SK_RIGHT_ARROW),0, A_RSHIFT, + SK(SK_LEFT_ARROW),0, A_LSHIFT, + SK(SK_CTL_RIGHT_ARROW),0, A_RRSHIFT, + SK(SK_CTL_LEFT_ARROW),0, A_LLSHIFT, + '{',0, A_F_BRACKET|A_EXTRA, '{','}',0, + '}',0, A_B_BRACKET|A_EXTRA, '{','}',0, + '(',0, A_F_BRACKET|A_EXTRA, '(',')',0, + ')',0, A_B_BRACKET|A_EXTRA, '(',')',0, + '[',0, A_F_BRACKET|A_EXTRA, '[',']',0, + ']',0, A_B_BRACKET|A_EXTRA, '[',']',0, + ESC,CONTROL('F'),0, A_F_BRACKET, + ESC,CONTROL('B'),0, A_B_BRACKET, + 'G',0, A_GOEND, + ESC,'G',0, A_GOEND_BUF, + ESC,'>',0, A_GOEND, + '>',0, A_GOEND, + SK(SK_END),0, A_GOEND, + 'P',0, A_GOPOS, - '0',0, A_DIGIT, - '1',0, A_DIGIT, - '2',0, A_DIGIT, - '3',0, A_DIGIT, - '4',0, A_DIGIT, - '5',0, A_DIGIT, - '6',0, A_DIGIT, - '7',0, A_DIGIT, - '8',0, A_DIGIT, - '9',0, A_DIGIT, - '.',0, A_DIGIT, + '0',0, A_DIGIT, + '1',0, A_DIGIT, + '2',0, A_DIGIT, + '3',0, A_DIGIT, + '4',0, A_DIGIT, + '5',0, A_DIGIT, + '6',0, A_DIGIT, + '7',0, A_DIGIT, + '8',0, A_DIGIT, + '9',0, A_DIGIT, + '.',0, A_DIGIT, - '=',0, A_STAT, - CONTROL('G'),0, A_STAT, - ':','f',0, A_STAT, - '/',0, A_F_SEARCH, - '?',0, A_B_SEARCH, - ESC,'/',0, A_F_SEARCH|A_EXTRA, '*',0, - ESC,'?',0, A_B_SEARCH|A_EXTRA, '*',0, - 'n',0, A_AGAIN_SEARCH, - ESC,'n',0, A_T_AGAIN_SEARCH, - 'N',0, A_REVERSE_SEARCH, - ESC,'N',0, A_T_REVERSE_SEARCH, - '&',0, A_FILTER, - 'm',0, A_SETMARK, - 'M',0, A_SETMARKBOT, - ESC,'m',0, A_CLRMARK, - '\'',0, A_GOMARK, - CONTROL('X'),CONTROL('X'),0, A_GOMARK, - 'E',0, A_EXAMINE, - ':','e',0, A_EXAMINE, - CONTROL('X'),CONTROL('V'),0, A_EXAMINE, - ':','n',0, A_NEXT_FILE, - ':','p',0, A_PREV_FILE, - 't',0, A_NEXT_TAG, - 'T',0, A_PREV_TAG, - ':','x',0, A_INDEX_FILE, - ':','d',0, A_REMOVE_FILE, - '-',0, A_OPT_TOGGLE, - ':','t',0, A_OPT_TOGGLE|A_EXTRA, 't',0, - 's',0, A_OPT_TOGGLE|A_EXTRA, 'o',0, - '_',0, A_DISP_OPTION, - '|',0, A_PIPE, - 'v',0, A_VISUAL, - '!',0, A_SHELL, - '+',0, A_FIRSTCMD, + '=',0, A_STAT, + CONTROL('G'),0, A_STAT, + ':','f',0, A_STAT, + '/',0, A_F_SEARCH, + '?',0, A_B_SEARCH, + ESC,'/',0, A_F_SEARCH|A_EXTRA, '*',0, + ESC,'?',0, A_B_SEARCH|A_EXTRA, '*',0, + 'n',0, A_AGAIN_SEARCH, + ESC,'n',0, A_T_AGAIN_SEARCH, + 'N',0, A_REVERSE_SEARCH, + ESC,'N',0, A_T_REVERSE_SEARCH, + '&',0, A_FILTER, + 'm',0, A_SETMARK, + 'M',0, A_SETMARKBOT, + ESC,'m',0, A_CLRMARK, + '\'',0, A_GOMARK, + CONTROL('X'),CONTROL('X'),0, A_GOMARK, + 'E',0, A_EXAMINE, + ':','e',0, A_EXAMINE, + CONTROL('X'),CONTROL('V'),0, A_EXAMINE, + ':','n',0, A_NEXT_FILE, + ':','p',0, A_PREV_FILE, + 't',0, A_NEXT_TAG, + 'T',0, A_PREV_TAG, + ':','x',0, A_INDEX_FILE, + ':','d',0, A_REMOVE_FILE, + '-',0, A_OPT_TOGGLE, + ':','t',0, A_OPT_TOGGLE|A_EXTRA, 't',0, + 's',0, A_OPT_TOGGLE|A_EXTRA, 'o',0, + '_',0, A_DISP_OPTION, + '|',0, A_PIPE, + 'v',0, A_VISUAL, + '!',0, A_SHELL, + '+',0, A_FIRSTCMD, - 'H',0, A_HELP, - 'h',0, A_HELP, - SK(SK_F1),0, A_HELP, - 'V',0, A_VERSION, - 'q',0, A_QUIT, - 'Q',0, A_QUIT, - ':','q',0, A_QUIT, - ':','Q',0, A_QUIT, - 'Z','Z',0, A_QUIT + 'H',0, A_HELP, + 'h',0, A_HELP, + SK(SK_F1),0, A_HELP, + 'V',0, A_VERSION, + 'q',0, A_QUIT, + 'Q',0, A_QUIT, + ':','q',0, A_QUIT, + ':','Q',0, A_QUIT, + 'Z','Z',0, A_QUIT }; static unsigned char edittable[] = { - '\t',0, EC_F_COMPLETE, /* TAB */ - '\17',0, EC_B_COMPLETE, /* BACKTAB */ - SK(SK_BACKTAB),0, EC_B_COMPLETE, /* BACKTAB */ - ESC,'\t',0, EC_B_COMPLETE, /* ESC TAB */ - CONTROL('L'),0, EC_EXPAND, /* CTRL-L */ - CONTROL('V'),0, EC_LITERAL, /* BACKSLASH */ - CONTROL('A'),0, EC_LITERAL, /* BACKSLASH */ - ESC,'l',0, EC_RIGHT, /* ESC l */ - SK(SK_RIGHT_ARROW),0, EC_RIGHT, /* RIGHTARROW */ - ESC,'h',0, EC_LEFT, /* ESC h */ - SK(SK_LEFT_ARROW),0, EC_LEFT, /* LEFTARROW */ - ESC,'b',0, EC_W_LEFT, /* ESC b */ - ESC,SK(SK_LEFT_ARROW),0, EC_W_LEFT, /* ESC LEFTARROW */ - SK(SK_CTL_LEFT_ARROW),0, EC_W_LEFT, /* CTRL-LEFTARROW */ - ESC,'w',0, EC_W_RIGHT, /* ESC w */ - ESC,SK(SK_RIGHT_ARROW),0, EC_W_RIGHT, /* ESC RIGHTARROW */ - SK(SK_CTL_RIGHT_ARROW),0, EC_W_RIGHT, /* CTRL-RIGHTARROW */ - ESC,'i',0, EC_INSERT, /* ESC i */ - SK(SK_INSERT),0, EC_INSERT, /* INSERT */ - ESC,'x',0, EC_DELETE, /* ESC x */ - SK(SK_DELETE),0, EC_DELETE, /* DELETE */ - ESC,'X',0, EC_W_DELETE, /* ESC X */ - ESC,SK(SK_DELETE),0, EC_W_DELETE, /* ESC DELETE */ - SK(SK_CTL_DELETE),0, EC_W_DELETE, /* CTRL-DELETE */ - SK(SK_CTL_BACKSPACE),0, EC_W_BACKSPACE, /* CTRL-BACKSPACE */ - ESC,SK(SK_BACKSPACE),0, EC_W_BACKSPACE, /* ESC BACKSPACE */ - ESC,'0',0, EC_HOME, /* ESC 0 */ - SK(SK_HOME),0, EC_HOME, /* HOME */ - ESC,'$',0, EC_END, /* ESC $ */ - SK(SK_END),0, EC_END, /* END */ - ESC,'k',0, EC_UP, /* ESC k */ - SK(SK_UP_ARROW),0, EC_UP, /* UPARROW */ - ESC,'j',0, EC_DOWN, /* ESC j */ - SK(SK_DOWN_ARROW),0, EC_DOWN, /* DOWNARROW */ - CONTROL('G'),0, EC_ABORT, /* CTRL-G */ - ESC,'[','M',0, EC_X11MOUSE, /* X11 mouse report */ - ESC,'[','<',0, EC_X116MOUSE, /* X11 1006 mouse report */ + '\t',0, EC_F_COMPLETE, /* TAB */ + '\17',0, EC_B_COMPLETE, /* BACKTAB */ + SK(SK_BACKTAB),0, EC_B_COMPLETE, /* BACKTAB */ + ESC,'\t',0, EC_B_COMPLETE, /* ESC TAB */ + CONTROL('L'),0, EC_EXPAND, /* CTRL-L */ + CONTROL('V'),0, EC_LITERAL, /* BACKSLASH */ + CONTROL('A'),0, EC_LITERAL, /* BACKSLASH */ + ESC,'l',0, EC_RIGHT, /* ESC l */ + SK(SK_RIGHT_ARROW),0, EC_RIGHT, /* RIGHTARROW */ + ESC,'h',0, EC_LEFT, /* ESC h */ + SK(SK_LEFT_ARROW),0, EC_LEFT, /* LEFTARROW */ + ESC,'b',0, EC_W_LEFT, /* ESC b */ + ESC,SK(SK_LEFT_ARROW),0, EC_W_LEFT, /* ESC LEFTARROW */ + SK(SK_CTL_LEFT_ARROW),0, EC_W_LEFT, /* CTRL-LEFTARROW */ + ESC,'w',0, EC_W_RIGHT, /* ESC w */ + ESC,SK(SK_RIGHT_ARROW),0, EC_W_RIGHT, /* ESC RIGHTARROW */ + SK(SK_CTL_RIGHT_ARROW),0, EC_W_RIGHT, /* CTRL-RIGHTARROW */ + ESC,'i',0, EC_INSERT, /* ESC i */ + SK(SK_INSERT),0, EC_INSERT, /* INSERT */ + ESC,'x',0, EC_DELETE, /* ESC x */ + SK(SK_DELETE),0, EC_DELETE, /* DELETE */ + ESC,'X',0, EC_W_DELETE, /* ESC X */ + ESC,SK(SK_DELETE),0, EC_W_DELETE, /* ESC DELETE */ + SK(SK_CTL_DELETE),0, EC_W_DELETE, /* CTRL-DELETE */ + SK(SK_CTL_BACKSPACE),0, EC_W_BACKSPACE, /* CTRL-BACKSPACE */ + ESC,SK(SK_BACKSPACE),0, EC_W_BACKSPACE, /* ESC BACKSPACE */ + ESC,'0',0, EC_HOME, /* ESC 0 */ + SK(SK_HOME),0, EC_HOME, /* HOME */ + ESC,'$',0, EC_END, /* ESC $ */ + SK(SK_END),0, EC_END, /* END */ + ESC,'k',0, EC_UP, /* ESC k */ + SK(SK_UP_ARROW),0, EC_UP, /* UPARROW */ + ESC,'j',0, EC_DOWN, /* ESC j */ + SK(SK_DOWN_ARROW),0, EC_DOWN, /* DOWNARROW */ + CONTROL('G'),0, EC_ABORT, /* CTRL-G */ + ESC,'[','M',0, EC_X11MOUSE, /* X11 mouse report */ + ESC,'[','<',0, EC_X116MOUSE, /* X11 1006 mouse report */ }; /* @@ -225,9 +225,9 @@ static unsigned char edittable[] = */ struct tablelist { - struct tablelist *t_next; - char *t_start; - char *t_end; + struct tablelist *t_next; + char *t_start; + char *t_end; }; /* @@ -242,850 +242,849 @@ static struct tablelist *list_sysvar_tables = NULL; /* * Expand special key abbreviations in a command table. */ - static void + static void expand_special_keys(table, len) - char *table; - int len; + char *table; + int len; { - char *fm; - char *to; - int a; - char *repl; - int klen; + char *fm; + char *to; + int a; + char *repl; + int klen; - for (fm = table; fm < table + len; ) - { - /* - * Rewrite each command in the table with any - * special key abbreviations expanded. - */ - for (to = fm; *fm != '\0'; ) - { - if (*fm != SK_SPECIAL_KEY) - { - *to++ = *fm++; - continue; - } - /* - * After SK_SPECIAL_KEY, next byte is the type - * of special key (one of the SK_* constants), - * and the byte after that is the number of bytes, - * N, reserved by the abbreviation (including the - * SK_SPECIAL_KEY and key type bytes). - * Replace all N bytes with the actual bytes - * output by the special key on this terminal. - */ - repl = special_key_str(fm[1]); - klen = fm[2] & 0377; - fm += klen; - if (repl == NULL || (int) strlen(repl) > klen) - repl = "\377"; - while (*repl != '\0') - *to++ = *repl++; - } - *to++ = '\0'; - /* - * Fill any unused bytes between end of command and - * the action byte with A_SKIP. - */ - while (to <= fm) - *to++ = A_SKIP; - fm++; - a = *fm++ & 0377; - if (a & A_EXTRA) - { - while (*fm++ != '\0') - continue; - } - } + for (fm = table; fm < table + len; ) + { + /* + * Rewrite each command in the table with any + * special key abbreviations expanded. + */ + for (to = fm; *fm != '\0'; ) + { + if (*fm != SK_SPECIAL_KEY) + { + *to++ = *fm++; + continue; + } + /* + * After SK_SPECIAL_KEY, next byte is the type + * of special key (one of the SK_* constants), + * and the byte after that is the number of bytes, + * N, reserved by the abbreviation (including the + * SK_SPECIAL_KEY and key type bytes). + * Replace all N bytes with the actual bytes + * output by the special key on this terminal. + */ + repl = special_key_str(fm[1]); + klen = fm[2] & 0377; + fm += klen; + if (repl == NULL || (int) strlen(repl) > klen) + repl = "\377"; + while (*repl != '\0') + *to++ = *repl++; + } + *to++ = '\0'; + /* + * Fill any unused bytes between end of command and + * the action byte with A_SKIP. + */ + while (to <= fm) + *to++ = A_SKIP; + fm++; + a = *fm++ & 0377; + if (a & A_EXTRA) + { + while (*fm++ != '\0') + continue; + } + } } /* * Expand special key abbreviations in a list of command tables. */ - static void + static void expand_cmd_table(tlist) - struct tablelist *tlist; + struct tablelist *tlist; { - struct tablelist *t; - for (t = tlist; t != NULL; t = t->t_next) - { - expand_special_keys(t->t_start, t->t_end - t->t_start); - } + struct tablelist *t; + for (t = tlist; t != NULL; t = t->t_next) + { + expand_special_keys(t->t_start, t->t_end - t->t_start); + } } /* * Expand special key abbreviations in all command tables. */ - public void + public void expand_cmd_tables(VOID_PARAM) { - expand_cmd_table(list_fcmd_tables); - expand_cmd_table(list_ecmd_tables); - expand_cmd_table(list_var_tables); - expand_cmd_table(list_sysvar_tables); + expand_cmd_table(list_fcmd_tables); + expand_cmd_table(list_ecmd_tables); + expand_cmd_table(list_var_tables); + expand_cmd_table(list_sysvar_tables); } /* * Initialize the command lists. */ - public void + public void init_cmds(VOID_PARAM) { - /* - * Add the default command tables. - */ - add_fcmd_table((char*)cmdtable, sizeof(cmdtable)); - add_ecmd_table((char*)edittable, sizeof(edittable)); + /* + * Add the default command tables. + */ + add_fcmd_table((char*)cmdtable, sizeof(cmdtable)); + add_ecmd_table((char*)edittable, sizeof(edittable)); #if USERFILE #ifdef BINDIR /* For backwards compatibility */ - /* Try to add tables in the OLD system lesskey file. */ - add_hometable(lesskey, NULL, BINDIR "/.sysless", 1); + /* Try to add tables in the OLD system lesskey file. */ + add_hometable(lesskey, NULL, BINDIR "/.sysless", 1); #endif - /* - * Try to load lesskey source file or binary file. - * If the source file succeeds, don't load binary file. - * The binary file is likely to have been generated from - * a (possibly out of date) copy of the src file, - * so loading it is at best redundant. - */ - /* - * Try to add tables in system lesskey src file. - */ -#if HAVE_LESSKEYSRC - if (add_hometable(lesskey_src, "LESSKEYIN_SYSTEM", LESSKEYINFILE_SYS, 1) != 0) + /* + * Try to load lesskey source file or binary file. + * If the source file succeeds, don't load binary file. + * The binary file is likely to have been generated from + * a (possibly out of date) copy of the src file, + * so loading it is at best redundant. + */ + /* + * Try to add tables in system lesskey src file. + */ +#if HAVE_LESSKEYSRC + if (add_hometable(lesskey_src, "LESSKEYIN_SYSTEM", LESSKEYINFILE_SYS, 1) != 0) #endif - { - /* - * Try to add the tables in the system lesskey binary file. - */ - add_hometable(lesskey, "LESSKEY_SYSTEM", LESSKEYFILE_SYS, 1); - } - /* - * Try to add tables in the lesskey src file "$HOME/.lesskey". - */ -#if HAVE_LESSKEYSRC - if (add_hometable(lesskey_src, "LESSKEYIN", DEF_LESSKEYINFILE, 0) != 0) + { + /* + * Try to add the tables in the system lesskey binary file. + */ + add_hometable(lesskey, "LESSKEY_SYSTEM", LESSKEYFILE_SYS, 1); + } + /* + * Try to add tables in the lesskey src file "$HOME/.lesskey". + */ +#if HAVE_LESSKEYSRC + if (add_hometable(lesskey_src, "LESSKEYIN", DEF_LESSKEYINFILE, 0) != 0) #endif - { - /* - * Try to add the tables in the standard lesskey binary file "$HOME/.less". - */ - add_hometable(lesskey, "LESSKEY", LESSKEYFILE, 0); - } + { + /* + * Try to add the tables in the standard lesskey binary file "$HOME/.less". + */ + add_hometable(lesskey, "LESSKEY", LESSKEYFILE, 0); + } #endif } /* * Add a command table. */ - static int + static int add_cmd_table(tlist, buf, len) - struct tablelist **tlist; - char *buf; - int len; + struct tablelist **tlist; + char *buf; + int len; { - struct tablelist *t; + struct tablelist *t; - if (len == 0) - return (0); - /* - * Allocate a tablelist structure, initialize it, - * and link it into the list of tables. - */ - if ((t = (struct tablelist *) - calloc(1, sizeof(struct tablelist))) == NULL) - { - return (-1); - } - t->t_start = buf; - t->t_end = buf + len; - t->t_next = *tlist; - *tlist = t; - return (0); + if (len == 0) + return (0); + /* + * Allocate a tablelist structure, initialize it, + * and link it into the list of tables. + */ + if ((t = (struct tablelist *) + calloc(1, sizeof(struct tablelist))) == NULL) + { + return (-1); + } + t->t_start = buf; + t->t_end = buf + len; + t->t_next = *tlist; + *tlist = t; + return (0); } /* * Add a command table. */ - public void + public void add_fcmd_table(buf, len) - char *buf; - int len; + char *buf; + int len; { - if (add_cmd_table(&list_fcmd_tables, buf, len) < 0) - error("Warning: some commands disabled", NULL_PARG); + if (add_cmd_table(&list_fcmd_tables, buf, len) < 0) + error("Warning: some commands disabled", NULL_PARG); } /* * Add an editing command table. */ - public void + public void add_ecmd_table(buf, len) - char *buf; - int len; + char *buf; + int len; { - if (add_cmd_table(&list_ecmd_tables, buf, len) < 0) - error("Warning: some edit commands disabled", NULL_PARG); + if (add_cmd_table(&list_ecmd_tables, buf, len) < 0) + error("Warning: some edit commands disabled", NULL_PARG); } /* * Add an environment variable table. */ - static void + static void add_var_table(tlist, buf, len) - struct tablelist **tlist; - char *buf; - int len; + struct tablelist **tlist; + char *buf; + int len; { - if (add_cmd_table(tlist, buf, len) < 0) - error("Warning: environment variables from lesskey file unavailable", NULL_PARG); + if (add_cmd_table(tlist, buf, len) < 0) + error("Warning: environment variables from lesskey file unavailable", NULL_PARG); } /* * Return action for a mouse wheel down event. */ - static int + static int mouse_wheel_down(VOID_PARAM) { - return ((mousecap == OPT_ONPLUS) ? A_B_MOUSE : A_F_MOUSE); + return ((mousecap == OPT_ONPLUS) ? A_B_MOUSE : A_F_MOUSE); } /* * Return action for a mouse wheel up event. */ - static int + static int mouse_wheel_up(VOID_PARAM) { - return ((mousecap == OPT_ONPLUS) ? A_F_MOUSE : A_B_MOUSE); + return ((mousecap == OPT_ONPLUS) ? A_F_MOUSE : A_B_MOUSE); } /* * Return action for a mouse button release event. */ - static int + static int mouse_button_rel(x, y) - int x; - int y; + int x; + int y; { - /* - * {{ It would be better to return an action and then do this - * in commands() but it's nontrivial to pass y to it. }} - */ - if (y < sc_height-1) - { - setmark('#', y); - screen_trashed = 1; - } - return (A_NOACTION); + /* + * {{ It would be better to return an action and then do this + * in commands() but it's nontrivial to pass y to it. }} + */ + if (y < sc_height-1) + { + setmark('#', y); + screen_trashed = 1; + } + return (A_NOACTION); } /* * Read a decimal integer. Return the integer and set *pterm to the terminating char. */ - static int + static int getcc_int(pterm) - char* pterm; + char* pterm; { - int num = 0; - int digits = 0; - for (;;) - { - char ch = getcc(); - if (ch < '0' || ch > '9') - { - if (pterm != NULL) *pterm = ch; - if (digits == 0) - return (-1); - return (num); - } - num = (10 * num) + (ch - '0'); - ++digits; - } + int num = 0; + int digits = 0; + for (;;) + { + char ch = getcc(); + if (ch < '0' || ch > '9') + { + if (pterm != NULL) *pterm = ch; + if (digits == 0) + return (-1); + return (num); + } + num = (10 * num) + (ch - '0'); + ++digits; + } } /* * Read suffix of mouse input and return the action to take. * The prefix ("\e[M") has already been read. */ - static int + static int x11mouse_action(skip) - int skip; + int skip; { - int b = getcc() - X11MOUSE_OFFSET; - int x = getcc() - X11MOUSE_OFFSET-1; - int y = getcc() - X11MOUSE_OFFSET-1; - if (skip) - return (A_NOACTION); - switch (b) { - default: - return (A_NOACTION); - case X11MOUSE_WHEEL_DOWN: - return mouse_wheel_down(); - case X11MOUSE_WHEEL_UP: - return mouse_wheel_up(); - case X11MOUSE_BUTTON_REL: - return mouse_button_rel(x, y); - } + int b = getcc() - X11MOUSE_OFFSET; + int x = getcc() - X11MOUSE_OFFSET-1; + int y = getcc() - X11MOUSE_OFFSET-1; + if (skip) + return (A_NOACTION); + switch (b) { + default: + return (A_NOACTION); + case X11MOUSE_WHEEL_DOWN: + return mouse_wheel_down(); + case X11MOUSE_WHEEL_UP: + return mouse_wheel_up(); + case X11MOUSE_BUTTON_REL: + return mouse_button_rel(x, y); + } } /* * Read suffix of mouse input and return the action to take. * The prefix ("\e[<") has already been read. */ - static int + static int x116mouse_action(skip) - int skip; + int skip; { - char ch; - int x, y; - int b = getcc_int(&ch); - if (b < 0 || ch != ';') return (A_NOACTION); - x = getcc_int(&ch) - 1; - if (x < 0 || ch != ';') return (A_NOACTION); - y = getcc_int(&ch) - 1; - if (y < 0) return (A_NOACTION); - if (skip) - return (A_NOACTION); - switch (b) { - case X11MOUSE_WHEEL_DOWN: - return mouse_wheel_down(); - case X11MOUSE_WHEEL_UP: - return mouse_wheel_up(); - default: - if (ch != 'm') return (A_NOACTION); - return mouse_button_rel(x, y); - } + char ch; + int x, y; + int b = getcc_int(&ch); + if (b < 0 || ch != ';') return (A_NOACTION); + x = getcc_int(&ch) - 1; + if (x < 0 || ch != ';') return (A_NOACTION); + y = getcc_int(&ch) - 1; + if (y < 0) return (A_NOACTION); + if (skip) + return (A_NOACTION); + switch (b) { + case X11MOUSE_WHEEL_DOWN: + return mouse_wheel_down(); + case X11MOUSE_WHEEL_UP: + return mouse_wheel_up(); + default: + if (ch != 'm') return (A_NOACTION); + return mouse_button_rel(x, y); + } } /* * Search a single command table for the command string in cmd. */ - static int + static int cmd_search(cmd, table, endtable, sp) - char *cmd; - char *table; - char *endtable; - char **sp; + char *cmd; + char *table; + char *endtable; + char **sp; { - char *p; - char *q; - int a; + char *p; + char *q; + int a; - *sp = NULL; - for (p = table, q = cmd; p < endtable; p++, q++) - { - if (*p == *q) - { - /* - * Current characters match. - * If we're at the end of the string, we've found it. - * Return the action code, which is the character - * after the null at the end of the string - * in the command table. - */ - if (*p == '\0') - { - a = *++p & 0377; - while (a == A_SKIP) - a = *++p & 0377; - if (a == A_END_LIST) - { - /* - * We get here only if the original - * cmd string passed in was empty (""). - * I don't think that can happen, - * but just in case ... - */ - return (A_UINVALID); - } - /* - * Check for an "extra" string. - */ - if (a & A_EXTRA) - { - *sp = ++p; - a &= ~A_EXTRA; - } - if (a == A_X11MOUSE_IN) - a = x11mouse_action(0); - else if (a == A_X116MOUSE_IN) - a = x116mouse_action(0); - return (a); - } - } else if (*q == '\0') - { - /* - * Hit the end of the user's command, - * but not the end of the string in the command table. - * The user's command is incomplete. - */ - return (A_PREFIX); - } else - { - /* - * Not a match. - * Skip ahead to the next command in the - * command table, and reset the pointer - * to the beginning of the user's command. - */ - if (*p == '\0' && p[1] == A_END_LIST) - { - /* - * A_END_LIST is a special marker that tells - * us to abort the cmd search. - */ - return (A_UINVALID); - } - while (*p++ != '\0') - continue; - while (*p == A_SKIP) - p++; - if (*p & A_EXTRA) - while (*++p != '\0') - continue; - q = cmd-1; - } - } - /* - * No match found in the entire command table. - */ - return (A_INVALID); + *sp = NULL; + for (p = table, q = cmd; p < endtable; p++, q++) + { + if (*p == *q) + { + /* + * Current characters match. + * If we're at the end of the string, we've found it. + * Return the action code, which is the character + * after the null at the end of the string + * in the command table. + */ + if (*p == '\0') + { + a = *++p & 0377; + while (a == A_SKIP) + a = *++p & 0377; + if (a == A_END_LIST) + { + /* + * We get here only if the original + * cmd string passed in was empty (""). + * I don't think that can happen, + * but just in case ... + */ + return (A_UINVALID); + } + /* + * Check for an "extra" string. + */ + if (a & A_EXTRA) + { + *sp = ++p; + a &= ~A_EXTRA; + } + if (a == A_X11MOUSE_IN) + a = x11mouse_action(0); + else if (a == A_X116MOUSE_IN) + a = x116mouse_action(0); + return (a); + } + } else if (*q == '\0') + { + /* + * Hit the end of the user's command, + * but not the end of the string in the command table. + * The user's command is incomplete. + */ + return (A_PREFIX); + } else + { + /* + * Not a match. + * Skip ahead to the next command in the + * command table, and reset the pointer + * to the beginning of the user's command. + */ + if (*p == '\0' && p[1] == A_END_LIST) + { + /* + * A_END_LIST is a special marker that tells + * us to abort the cmd search. + */ + return (A_UINVALID); + } + while (*p++ != '\0') + continue; + while (*p == A_SKIP) + p++; + if (*p & A_EXTRA) + while (*++p != '\0') + continue; + q = cmd-1; + } + } + /* + * No match found in the entire command table. + */ + return (A_INVALID); } /* * Decode a command character and return the associated action. * The "extra" string, if any, is returned in sp. */ - static int + static int cmd_decode(tlist, cmd, sp) - struct tablelist *tlist; - char *cmd; - char **sp; + struct tablelist *tlist; + char *cmd; + char **sp; { - struct tablelist *t; - int action = A_INVALID; + struct tablelist *t; + int action = A_INVALID; - /* - * Search thru all the command tables. - * Stop when we find an action which is not A_INVALID. - */ - for (t = tlist; t != NULL; t = t->t_next) - { - action = cmd_search(cmd, t->t_start, t->t_end, sp); - if (action != A_INVALID) - break; - } - if (action == A_UINVALID) - action = A_INVALID; - return (action); + /* + * Search thru all the command tables. + * Stop when we find an action which is not A_INVALID. + */ + for (t = tlist; t != NULL; t = t->t_next) + { + action = cmd_search(cmd, t->t_start, t->t_end, sp); + if (action != A_INVALID) + break; + } + if (action == A_UINVALID) + action = A_INVALID; + return (action); } /* * Decode a command from the cmdtables list. */ - public int + public int fcmd_decode(cmd, sp) - char *cmd; - char **sp; + char *cmd; + char **sp; { - return (cmd_decode(list_fcmd_tables, cmd, sp)); + return (cmd_decode(list_fcmd_tables, cmd, sp)); } /* * Decode a command from the edittables list. */ - public int + public int ecmd_decode(cmd, sp) - char *cmd; - char **sp; + char *cmd; + char **sp; { - return (cmd_decode(list_ecmd_tables, cmd, sp)); + return (cmd_decode(list_ecmd_tables, cmd, sp)); } /* * Get the value of an environment variable. * Looks first in the lesskey file, then in the real environment. */ - public char * + public char * lgetenv(var) - char *var; + char *var; { - int a; - char *s; + int a; + char *s; - a = cmd_decode(list_var_tables, var, &s); - if (a == EV_OK) - return (s); - s = getenv(var); - if (s != NULL && *s != '\0') - return (s); - a = cmd_decode(list_sysvar_tables, var, &s); - if (a == EV_OK) - return (s); - return (NULL); + a = cmd_decode(list_var_tables, var, &s); + if (a == EV_OK) + return (s); + s = getenv(var); + if (s != NULL && *s != '\0') + return (s); + a = cmd_decode(list_sysvar_tables, var, &s); + if (a == EV_OK) + return (s); + return (NULL); } /* - * Is a string null or empty? + * Is a string null or empty? */ - public int + public int isnullenv(s) - char* s; + char* s; { - return (s == NULL || *s == '\0'); + return (s == NULL || *s == '\0'); } #if USERFILE /* * Get an "integer" from a lesskey file. - * Integers are stored in a funny format: + * Integers are stored in a funny format: * two bytes, low order first, in radix KRADIX. */ - static int + static int gint(sp) - char **sp; + char **sp; { - int n; + int n; - n = *(*sp)++; - n += *(*sp)++ * KRADIX; - return (n); + n = *(*sp)++; + n += *(*sp)++ * KRADIX; + return (n); } /* * Process an old (pre-v241) lesskey file. */ - static int + static int old_lesskey(buf, len) - char *buf; - int len; + char *buf; + int len; { - /* - * Old-style lesskey file. - * The file must end with either - * ...,cmd,0,action - * or ...,cmd,0,action|A_EXTRA,string,0 - * So the last byte or the second to last byte must be zero. - */ - if (buf[len-1] != '\0' && buf[len-2] != '\0') - return (-1); - add_fcmd_table(buf, len); - return (0); + /* + * Old-style lesskey file. + * The file must end with either + * ...,cmd,0,action + * or ...,cmd,0,action|A_EXTRA,string,0 + * So the last byte or the second to last byte must be zero. + */ + if (buf[len-1] != '\0' && buf[len-2] != '\0') + return (-1); + add_fcmd_table(buf, len); + return (0); } -/* +/* * Process a new (post-v241) lesskey file. */ - static int + static int new_lesskey(buf, len, sysvar) - char *buf; - int len; - int sysvar; + char *buf; + int len; + int sysvar; { - char *p; - char *end; - int c; - int n; + char *p; + char *end; + int c; + int n; - /* - * New-style lesskey file. - * Extract the pieces. - */ - if (buf[len-3] != C0_END_LESSKEY_MAGIC || - buf[len-2] != C1_END_LESSKEY_MAGIC || - buf[len-1] != C2_END_LESSKEY_MAGIC) - return (-1); - p = buf + 4; - end = buf + len; - for (;;) - { - c = *p++; - switch (c) - { - case CMD_SECTION: - n = gint(&p); - if (n < 0 || p+n >= end) - return (-1); - add_fcmd_table(p, n); - p += n; - break; - case EDIT_SECTION: - n = gint(&p); - if (n < 0 || p+n >= end) - return (-1); - add_ecmd_table(p, n); - p += n; - break; - case VAR_SECTION: - n = gint(&p); - if (n < 0 || p+n >= end) - return (-1); - add_var_table((sysvar) ? - &list_sysvar_tables : &list_var_tables, p, n); - p += n; - break; - case END_SECTION: - return (0); - default: - /* - * Unrecognized section type. - */ - return (-1); - } - } + /* + * New-style lesskey file. + * Extract the pieces. + */ + if (buf[len-3] != C0_END_LESSKEY_MAGIC || + buf[len-2] != C1_END_LESSKEY_MAGIC || + buf[len-1] != C2_END_LESSKEY_MAGIC) + return (-1); + p = buf + 4; + end = buf + len; + for (;;) + { + c = *p++; + switch (c) + { + case CMD_SECTION: + n = gint(&p); + if (n < 0 || p+n >= end) + return (-1); + add_fcmd_table(p, n); + p += n; + break; + case EDIT_SECTION: + n = gint(&p); + if (n < 0 || p+n >= end) + return (-1); + add_ecmd_table(p, n); + p += n; + break; + case VAR_SECTION: + n = gint(&p); + if (n < 0 || p+n >= end) + return (-1); + add_var_table((sysvar) ? + &list_sysvar_tables : &list_var_tables, p, n); + p += n; + break; + case END_SECTION: + return (0); + default: + /* + * Unrecognized section type. + */ + return (-1); + } + } } /* * Set up a user command table, based on a "lesskey" file. */ - public int + public int lesskey(filename, sysvar) - char *filename; - int sysvar; + char *filename; + int sysvar; { - char *buf; - POSITION len; - long n; - int f; + char *buf; + POSITION len; + long n; + int f; - if (secure) - return (1); - /* - * Try to open the lesskey file. - */ - f = open(filename, OPEN_READ); - if (f < 0) - return (1); + if (secure) + return (1); + /* + * Try to open the lesskey file. + */ + f = open(filename, OPEN_READ); + if (f < 0) + return (1); - /* - * Read the file into a buffer. - * We first figure out the size of the file and allocate space for it. - * {{ Minimal error checking is done here. - * A garbage .less file will produce strange results. - * To avoid a large amount of error checking code here, we - * rely on the lesskey program to generate a good .less file. }} - */ - len = filesize(f); - if (len == NULL_POSITION || len < 3) - { - /* - * Bad file (valid file must have at least 3 chars). - */ - close(f); - return (-1); - } - if ((buf = (char *) calloc((int)len, sizeof(char))) == NULL) - { - close(f); - return (-1); - } - if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK) - { - free(buf); - close(f); - return (-1); - } - n = read(f, buf, (unsigned int) len); - close(f); - if (n != len) - { - free(buf); - return (-1); - } + /* + * Read the file into a buffer. + * We first figure out the size of the file and allocate space for it. + * {{ Minimal error checking is done here. + * A garbage .less file will produce strange results. + * To avoid a large amount of error checking code here, we + * rely on the lesskey program to generate a good .less file. }} + */ + len = filesize(f); + if (len == NULL_POSITION || len < 3) + { + /* + * Bad file (valid file must have at least 3 chars). + */ + close(f); + return (-1); + } + if ((buf = (char *) calloc((int)len, sizeof(char))) == NULL) + { + close(f); + return (-1); + } + if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK) + { + free(buf); + close(f); + return (-1); + } + n = read(f, buf, (unsigned int) len); + close(f); + if (n != len) + { + free(buf); + return (-1); + } - /* - * Figure out if this is an old-style (before version 241) - * or new-style lesskey file format. - */ - if (len < 4 || - buf[0] != C0_LESSKEY_MAGIC || buf[1] != C1_LESSKEY_MAGIC || - buf[2] != C2_LESSKEY_MAGIC || buf[3] != C3_LESSKEY_MAGIC) - return (old_lesskey(buf, (int)len)); - return (new_lesskey(buf, (int)len, sysvar)); + /* + * Figure out if this is an old-style (before version 241) + * or new-style lesskey file format. + */ + if (len < 4 || + buf[0] != C0_LESSKEY_MAGIC || buf[1] != C1_LESSKEY_MAGIC || + buf[2] != C2_LESSKEY_MAGIC || buf[3] != C3_LESSKEY_MAGIC) + return (old_lesskey(buf, (int)len)); + return (new_lesskey(buf, (int)len, sysvar)); } -#if HAVE_LESSKEYSRC - public int +#if HAVE_LESSKEYSRC + public int lesskey_src(filename, sysvar) - char *filename; - int sysvar; + char *filename; + int sysvar; { - static struct lesskey_tables tables; - int r = parse_lesskey(filename, &tables); - if (r != 0) - return (r); - add_fcmd_table(tables.cmdtable.buf.data, tables.cmdtable.buf.end); - add_ecmd_table(tables.edittable.buf.data, tables.edittable.buf.end); - add_var_table(sysvar ? &list_sysvar_tables : &list_var_tables, - tables.vartable.buf.data, tables.vartable.buf.end); - return (0); + static struct lesskey_tables tables; + int r = parse_lesskey(filename, &tables); + if (r != 0) + return (r); + add_fcmd_table(tables.cmdtable.buf.data, tables.cmdtable.buf.end); + add_ecmd_table(tables.edittable.buf.data, tables.edittable.buf.end); + add_var_table(sysvar ? &list_sysvar_tables : &list_var_tables, + tables.vartable.buf.data, tables.vartable.buf.end); + return (0); } - void + void lesskey_parse_error(s) - char *s; + char *s; { - PARG parg; - parg.p_string = s; - error("%s", &parg); + PARG parg; + parg.p_string = s; + error("%s", &parg); } #endif /* HAVE_LESSKEYSRC */ /* * Add a lesskey file. */ - public int + public int add_hometable(call_lesskey, envname, def_filename, sysvar) - int (*call_lesskey)(char *, int); - char *envname; - char *def_filename; - int sysvar; + int (*call_lesskey)(char *, int); + char *envname; + char *def_filename; + int sysvar; { - char *filename; - int r; + char *filename; + int r; - if (envname != NULL && (filename = lgetenv(envname)) != NULL) - filename = save(filename); - else if (sysvar) /* def_filename is full path */ - filename = save(def_filename); - else /* def_filename is just basename */ - { - /* Remove first char (normally a dot) unless stored in $HOME. */ - char *xdg = lgetenv("XDG_CONFIG_HOME"); - if (!isnullenv(xdg)) - filename = dirfile(xdg, &def_filename[1], 1); - if (filename == NULL) - { - char *home = lgetenv("HOME"); - if (!isnullenv(home)) - { - char *cfg_dir = dirfile(home, ".config", 0); - filename = dirfile(cfg_dir, &def_filename[1], 1); - free(cfg_dir); - } - } - if (filename == NULL) - filename = homefile(def_filename); - } - if (filename == NULL) - return -1; - r = (*call_lesskey)(filename, sysvar); - free(filename); - return (r); + if (envname != NULL && (filename = lgetenv(envname)) != NULL) + filename = save(filename); + else if (sysvar) /* def_filename is full path */ + filename = save(def_filename); + else /* def_filename is just basename */ + { + /* Remove first char (normally a dot) unless stored in $HOME. */ + char *xdg = lgetenv("XDG_CONFIG_HOME"); + if (!isnullenv(xdg)) + filename = dirfile(xdg, &def_filename[1], 1); + if (filename == NULL) + { + char *home = lgetenv("HOME"); + if (!isnullenv(home)) + { + char *cfg_dir = dirfile(home, ".config", 0); + filename = dirfile(cfg_dir, &def_filename[1], 1); + free(cfg_dir); + } + } + if (filename == NULL) + filename = homefile(def_filename); + } + if (filename == NULL) + return -1; + r = (*call_lesskey)(filename, sysvar); + free(filename); + return (r); } #endif /* * See if a char is a special line-editing command. */ - public int + public int editchar(c, flags) - int c; - int flags; + int c; + int flags; { - int action; - int nch; - char *s; - char usercmd[MAX_CMDLEN+1]; - - /* - * An editing character could actually be a sequence of characters; - * for example, an escape sequence sent by pressing the uparrow key. - * To match the editing string, we use the command decoder - * but give it the edit-commands command table - * This table is constructed to match the user's keyboard. - */ - if (c == erase_char || c == erase2_char) - return (EC_BACKSPACE); - if (c == kill_char) - { + int action; + int nch; + char *s; + char usercmd[MAX_CMDLEN+1]; + + /* + * An editing character could actually be a sequence of characters; + * for example, an escape sequence sent by pressing the uparrow key. + * To match the editing string, we use the command decoder + * but give it the edit-commands command table + * This table is constructed to match the user's keyboard. + */ + if (c == erase_char || c == erase2_char) + return (EC_BACKSPACE); + if (c == kill_char) + { #if MSDOS_COMPILER==WIN32C - if (!win32_kbhit()) + if (!win32_kbhit()) #endif - return (EC_LINEKILL); - } - - /* - * Collect characters in a buffer. - * Start with the one we have, and get more if we need them. - */ - nch = 0; - do { - if (nch > 0) - c = getcc(); - usercmd[nch] = c; - usercmd[nch+1] = '\0'; - nch++; - action = ecmd_decode(usercmd, &s); - } while (action == A_PREFIX && nch < MAX_CMDLEN); + return (EC_LINEKILL); + } - if (action == EC_X11MOUSE) - return (x11mouse_action(1)); - if (action == EC_X116MOUSE) - return (x116mouse_action(1)); + /* + * Collect characters in a buffer. + * Start with the one we have, and get more if we need them. + */ + nch = 0; + do { + if (nch > 0) + c = getcc(); + usercmd[nch] = c; + usercmd[nch+1] = '\0'; + nch++; + action = ecmd_decode(usercmd, &s); + } while (action == A_PREFIX && nch < MAX_CMDLEN); - if (flags & ECF_NORIGHTLEFT) - { - switch (action) - { - case EC_RIGHT: - case EC_LEFT: - action = A_INVALID; - break; - } - } + if (action == EC_X11MOUSE) + return (x11mouse_action(1)); + if (action == EC_X116MOUSE) + return (x116mouse_action(1)); + + if (flags & ECF_NORIGHTLEFT) + { + switch (action) + { + case EC_RIGHT: + case EC_LEFT: + action = A_INVALID; + break; + } + } #if CMD_HISTORY - if (flags & ECF_NOHISTORY) - { - /* - * The caller says there is no history list. - * Reject any history-manipulation action. - */ - switch (action) - { - case EC_UP: - case EC_DOWN: - action = A_INVALID; - break; - } - } + if (flags & ECF_NOHISTORY) + { + /* + * The caller says there is no history list. + * Reject any history-manipulation action. + */ + switch (action) + { + case EC_UP: + case EC_DOWN: + action = A_INVALID; + break; + } + } #endif #if TAB_COMPLETE_FILENAME - if (flags & ECF_NOCOMPLETE) - { - /* - * The caller says we don't want any filename completion cmds. - * Reject them. - */ - switch (action) - { - case EC_F_COMPLETE: - case EC_B_COMPLETE: - case EC_EXPAND: - action = A_INVALID; - break; - } - } + if (flags & ECF_NOCOMPLETE) + { + /* + * The caller says we don't want any filename completion cmds. + * Reject them. + */ + switch (action) + { + case EC_F_COMPLETE: + case EC_B_COMPLETE: + case EC_EXPAND: + action = A_INVALID; + break; + } + } #endif - if ((flags & ECF_PEEK) || action == A_INVALID) - { - /* - * We're just peeking, or we didn't understand the command. - * Unget all the characters we read in the loop above. - * This does NOT include the original character that was - * passed in as a parameter. - */ - while (nch > 1) - { - ungetcc(usercmd[--nch]); - } - } else - { - if (s != NULL) - ungetsc(s); - } - return action; + if ((flags & ECF_PEEK) || action == A_INVALID) + { + /* + * We're just peeking, or we didn't understand the command. + * Unget all the characters we read in the loop above. + * This does NOT include the original character that was + * passed in as a parameter. + */ + while (nch > 1) + { + ungetcc(usercmd[--nch]); + } + } else + { + if (s != NULL) + ungetsc(s); + } + return action; } - diff --git a/defines.ds b/defines.ds index d358fec..6af934a 100644 --- a/defines.ds +++ b/defines.ds @@ -12,64 +12,64 @@ /* * This file has 2 sections: * User preferences. - * Settings always true for MS-DOS systems. + * Settings always true for MS-DOS systems. */ - + /* User preferences. */ /* * SECURE is 1 if you wish to disable a bunch of features in order to * be safe to run by unprivileged users. */ -#define SECURE 0 +#define SECURE 0 /* * SHELL_ESCAPE is 1 if you wish to allow shell escapes. * (This is possible only if your system supplies the system() function.) */ -#define SHELL_ESCAPE (!SECURE) +#define SHELL_ESCAPE (!SECURE) /* * EXAMINE is 1 if you wish to allow examining files by name from within less. */ -#define EXAMINE (!SECURE) +#define EXAMINE (!SECURE) /* * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key * to complete filenames at prompts. */ -#define TAB_COMPLETE_FILENAME (!SECURE) +#define TAB_COMPLETE_FILENAME (!SECURE) /* * CMD_HISTORY is 1 if you wish to allow keys to cycle through * previous commands at prompts. */ -#define CMD_HISTORY 1 +#define CMD_HISTORY 1 /* - * HILITE_SEARCH is 1 if you wish to have search targets to be + * HILITE_SEARCH is 1 if you wish to have search targets to be * displayed in standout mode. */ -#define HILITE_SEARCH 1 +#define HILITE_SEARCH 1 /* * EDITOR is 1 if you wish to allow editor invocation (the "v" command). * (This is possible only if your system supplies the system() function.) * EDIT_PGM is the name of the (default) editor to be invoked. */ -#define EDITOR (!SECURE) -#define EDIT_PGM "vi" +#define EDITOR (!SECURE) +#define EDIT_PGM "vi" /* * TAGS is 1 if you wish to support tag files. */ -#define TAGS (!SECURE) +#define TAGS (!SECURE) /* - * USERFILE is 1 if you wish to allow a .less file to specify + * USERFILE is 1 if you wish to allow a .less file to specify * user-defined key bindings. */ -#define USERFILE (!SECURE) +#define USERFILE (!SECURE) /* * GLOB is 1 if you wish to have shell metacharacters expanded in filenames. @@ -77,9 +77,9 @@ * and the "echo" shell command. */ #ifdef __DJGPP__ -#define GLOB (!SECURE) +#define GLOB (!SECURE) #else -#define GLOB 0 +#define GLOB 0 #endif /* @@ -87,106 +87,106 @@ * which allows the user to pipe data into a shell command. */ #ifdef __DJGPP__ -#define PIPEC (!SECURE) +#define PIPEC (!SECURE) #else -#define PIPEC 0 +#define PIPEC 0 #endif /* * LOGFILE is 1 if you wish to allow the -o option (to create log files). */ -#define LOGFILE (!SECURE) +#define LOGFILE (!SECURE) /* * GNU_OPTIONS is 1 if you wish to support the GNU-style command * line options --help and --version. */ -#define GNU_OPTIONS 1 +#define GNU_OPTIONS 1 /* * ONLY_RETURN is 1 if you want RETURN to be the only input which * will continue past an error message. * Otherwise, any key will continue past an error message. */ -#define ONLY_RETURN 0 +#define ONLY_RETURN 0 /* - * LESSKEYFILE is the filename of the default lesskey output file + * LESSKEYFILE is the filename of the default lesskey output file * (in the HOME directory). * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file. - * DEF_LESSKEYINFILE is the filename of the default lesskey input + * DEF_LESSKEYINFILE is the filename of the default lesskey input * (in the HOME directory). * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ -#define LESSKEYFILE "_less" -#define LESSKEYFILE_SYS "c:\\_sysless" -#define DEF_LESSKEYINFILE "_lesskey" -#define LESSKEYINFILE_SYS "c:\\_syslesskey" -#define LESSHISTFILE "_lesshst" +#define LESSKEYFILE "_less" +#define LESSKEYFILE_SYS "c:\\_sysless" +#define DEF_LESSKEYINFILE "_lesskey" +#define LESSKEYINFILE_SYS "c:\\_syslesskey" +#define LESSHISTFILE "_lesshst" + - /* Settings always true for MS-DOS systems. */ /* * Define MSDOS_COMPILER if compiling for MS-DOS. */ #ifdef __DJGPP__ -#define MSDOS_COMPILER DJGPPC +#define MSDOS_COMPILER DJGPPC #else #ifdef __BORLANDC__ -#define MSDOS_COMPILER BORLANDC +#define MSDOS_COMPILER BORLANDC #else -#define MSDOS_COMPILER MSOFTC +#define MSDOS_COMPILER MSOFTC #endif #endif /* * Pathname separator character. */ -#define PATHNAME_SEP "\\" +#define PATHNAME_SEP "\\" /* - * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. + * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. */ -#define HAVE_ANSI_PROTOS 1 +#define HAVE_ANSI_PROTOS 1 /* * HAVE_SYS_TYPES_H is 1 if your system has . */ -#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TYPES_H 1 /* * Define if you have the header file. */ -#define HAVE_SGSTAT_H 0 +#define HAVE_SGSTAT_H 0 /* * HAVE_PERROR is 1 if your system has the perror() call. * (Actually, if it has sys_errlist, sys_nerr and errno.) */ -#define HAVE_PERROR 1 +#define HAVE_PERROR 1 /* * HAVE_TIME is 1 if your system has the time() call. */ -#define HAVE_TIME 1 +#define HAVE_TIME 1 /* * HAVE_SHELL is 1 if your system supports a SHELL command interpreter. */ -#define HAVE_SHELL 0 +#define HAVE_SHELL 0 /* * Default shell metacharacters and meta-escape character. */ -#define DEF_METACHARS "; *?\t\n'\"()<>|&" -#define DEF_METAESCAPE "" +#define DEF_METACHARS "; *?\t\n'\"()<>|&" +#define DEF_METAESCAPE "" -/* +/* * HAVE_DUP is 1 if your system has the dup() call. */ -#define HAVE_DUP 1 +#define HAVE_DUP 1 /* Define to 1 to support reading lesskey source files (not just binary). */ #define HAVE_LESSKEYSRC 1 @@ -195,30 +195,30 @@ * 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 */ -#define OUTBUF_SIZE 1024 /* Output buffer */ -#define PROMPT_SIZE 200 /* 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 512 /* Max size of line in tags file */ -#define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#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 */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 200 /* 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 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 */ +#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 doesn't define. */ #if MSDOS_COMPILER==BORLANDC -#define off_t long +#define off_t long #endif /* Define if you need to in order for stat and other things to work. */ @@ -242,7 +242,7 @@ /* #undef HAVE_REGCMP */ /* #undef HAVE_V8_REGCOMP */ #if MSDOS_COMPILER==DJGPPC -#define HAVE_POSIX_REGCOMP 1 +#define HAVE_POSIX_REGCOMP 1 #else #define NO_REGEX 1 #endif @@ -293,9 +293,9 @@ /* Define if you have the _setjmp function. */ #if MSDOS_COMPILER==MSOFTC || MSDOS_COMPILER==DJGPPC -#define HAVE__SETJMP 0 +#define HAVE__SETJMP 0 #else -#define HAVE__SETJMP 1 +#define HAVE__SETJMP 1 #endif /* Define if you have the memcpy function. */ @@ -303,20 +303,20 @@ /* Define if you have the popen function. */ #if MSDOS_COMPILER==DJGPPC -#define HAVE_POPEN 1 +#define HAVE_POPEN 1 #else -#define HAVE_POPEN 0 +#define HAVE_POPEN 0 #endif /* Define if you have the sigsetmask function. */ -#define HAVE_SIGSETMASK 0 +#define HAVE_SIGSETMASK 0 /* Define if you have the sigprocmask function. */ -#define HAVE_SIGPROCMASK 0 +#define HAVE_SIGPROCMASK 0 /* Define if you have the sigset_t type and sigemptyset macro */ -#define HAVE_SIGSET_T 0 -#define HAVE_SIGEMPTYSET 0 +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 /* Define if you have the stat function. */ #define HAVE_STAT 1 @@ -325,10 +325,10 @@ #define HAVE_STRCHR 1 /* Define if you have the system function. */ -#define HAVE_SYSTEM 1 +#define HAVE_SYSTEM 1 /* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 0 +#define HAVE_SNPRINTF 0 /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 @@ -361,16 +361,16 @@ #define HAVE_SYS_IOCTL_H 0 /* Define if you have the header file. */ -#define HAVE_SYS_PTEM_H 0 +#define HAVE_SYS_PTEM_H 0 /* Define if you have the header file. */ -#define HAVE_SYS_STREAM_H 0 +#define HAVE_SYS_STREAM_H 0 /* Define if you have the header file. */ -#define HAVE_TERMCAP_H 0 +#define HAVE_TERMCAP_H 0 /* Define if you have the header file. */ -#define HAVE_TERMIO_H 0 +#define HAVE_TERMIO_H 0 /* Define if you have the header file. */ #define HAVE_TERMIOS_H 0 @@ -396,28 +396,28 @@ /* * The names of these things changed in Microsoft C version 7.0. */ -#define videoconfig _videoconfig -#define rccoord _rccoord -#define O_RDONLY _O_RDONLY -#define O_WRONLY _O_WRONLY -#define O_APPEND _O_APPEND -#define O_BINARY _O_BINARY -#define O_TEXT _O_TEXT -#define find_t _find_t -#define stat _stat -#define S_IFMT _S_IFMT -#define S_IFDIR _S_IFDIR -#define S_IFREG _S_IFREG -#define dup _dup -#define open _open -#define lseek _lseek -#define write _write -#define creat _creat -#define fstat _fstat -#define isatty _isatty -#define close _close -#define read _read -#define ungetch _ungetch -#define kbhit _kbhit -#define getch _getch +#define videoconfig _videoconfig +#define rccoord _rccoord +#define O_RDONLY _O_RDONLY +#define O_WRONLY _O_WRONLY +#define O_APPEND _O_APPEND +#define O_BINARY _O_BINARY +#define O_TEXT _O_TEXT +#define find_t _find_t +#define stat _stat +#define S_IFMT _S_IFMT +#define S_IFDIR _S_IFDIR +#define S_IFREG _S_IFREG +#define dup _dup +#define open _open +#define lseek _lseek +#define write _write +#define creat _creat +#define fstat _fstat +#define isatty _isatty +#define close _close +#define read _read +#define ungetch _ungetch +#define kbhit _kbhit +#define getch _getch #endif diff --git a/defines.h.in b/defines.h.in index e5559d1..489eb07 100644 --- a/defines.h.in +++ b/defines.h.in @@ -20,100 +20,100 @@ * be safe to run by unprivileged users. * SECURE_COMPILE is set by the --with-secure configure option. */ -#define SECURE SECURE_COMPILE +#define SECURE SECURE_COMPILE /* * SHELL_ESCAPE is 1 if you wish to allow shell escapes. * (This is possible only if your system supplies the system() function.) */ -#define SHELL_ESCAPE (!SECURE) +#define SHELL_ESCAPE (!SECURE) /* * EXAMINE is 1 if you wish to allow examining files by name from within less. */ -#define EXAMINE (!SECURE) +#define EXAMINE (!SECURE) /* * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key * to complete filenames at prompts. */ -#define TAB_COMPLETE_FILENAME (!SECURE) +#define TAB_COMPLETE_FILENAME (!SECURE) /* * CMD_HISTORY is 1 if you wish to allow keys to cycle through * previous commands at prompts. */ -#define CMD_HISTORY 1 +#define CMD_HISTORY 1 /* - * HILITE_SEARCH is 1 if you wish to have search targets to be + * HILITE_SEARCH is 1 if you wish to have search targets to be * displayed in standout mode. */ -#define HILITE_SEARCH 1 +#define HILITE_SEARCH 1 /* * EDITOR is 1 if you wish to allow editor invocation (the "v" command). * (This is possible only if your system supplies the system() function.) * EDIT_PGM is the name of the (default) editor to be invoked. */ -#define EDITOR (!SECURE) +#define EDITOR (!SECURE) /* * TAGS is 1 if you wish to support tag files. */ -#define TAGS (!SECURE) +#define TAGS (!SECURE) /* - * USERFILE is 1 if you wish to allow a .less file to specify + * USERFILE is 1 if you wish to allow a .less file to specify * user-defined key bindings. */ -#define USERFILE (!SECURE) +#define USERFILE (!SECURE) /* * GLOB is 1 if you wish to have shell metacharacters expanded in filenames. * This will generally work if your system provides the "popen" function * and the "echo" shell command. */ -#define GLOB (!SECURE) +#define GLOB (!SECURE) /* * PIPEC is 1 if you wish to have the "|" command * which allows the user to pipe data into a shell command. */ -#define PIPEC (!SECURE && HAVE_POPEN) +#define PIPEC (!SECURE && HAVE_POPEN) /* * LOGFILE is 1 if you wish to allow the -o option (to create log files). */ -#define LOGFILE (!SECURE) +#define LOGFILE (!SECURE) /* * GNU_OPTIONS is 1 if you wish to support the GNU-style command * line options --help and --version. */ -#define GNU_OPTIONS 1 +#define GNU_OPTIONS 1 /* * ONLY_RETURN is 1 if you want RETURN to be the only input which * will continue past an error message. * Otherwise, any key will continue past an error message. */ -#define ONLY_RETURN 0 +#define ONLY_RETURN 0 /* - * LESSKEYFILE is the filename of the default lesskey output file + * LESSKEYFILE is the filename of the default lesskey output file * (in the HOME directory). * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file. - * DEF_LESSKEYINFILE is the filename of the default lesskey input + * DEF_LESSKEYINFILE is the filename of the default lesskey input * (in the HOME directory). * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ -#define LESSKEYFILE ".less" -#define LESSKEYFILE_SYS SYSDIR "/sysless" -#define DEF_LESSKEYINFILE ".lesskey" -#define LESSKEYINFILE_SYS SYSDIR "/syslesskey" -#define LESSHISTFILE ".lesshst" +#define LESSKEYFILE ".less" +#define LESSKEYFILE_SYS SYSDIR "/sysless" +#define DEF_LESSKEYINFILE ".lesskey" +#define LESSKEYINFILE_SYS SYSDIR "/syslesskey" +#define LESSHISTFILE ".lesshst" /* Settings always true on Unix. */ @@ -121,12 +121,12 @@ /* * Define MSDOS_COMPILER if compiling under Microsoft C. */ -#define MSDOS_COMPILER 0 +#define MSDOS_COMPILER 0 /* * Pathname separator character. */ -#define PATHNAME_SEP "/" +#define PATHNAME_SEP "/" /* * The value returned from tgetent on success. @@ -135,14 +135,14 @@ #define TGETENT_OK 1 /* - * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. + * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. */ -#define HAVE_ANSI_PROTOS 1 +#define HAVE_ANSI_PROTOS 1 /* * HAVE_SYS_TYPES_H is 1 if your system has . */ -#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TYPES_H 1 /* * Define if you have the header file. @@ -153,28 +153,28 @@ * HAVE_PERROR is 1 if your system has the perror() call. * (Actually, if it has sys_errlist, sys_nerr and errno.) */ -#define HAVE_PERROR 1 +#define HAVE_PERROR 1 /* * HAVE_TIME is 1 if your system has the time() call. */ -#define HAVE_TIME 1 +#define HAVE_TIME 1 /* * HAVE_SHELL is 1 if your system supports a SHELL command interpreter. */ -#define HAVE_SHELL 1 +#define HAVE_SHELL 1 /* * Default shell metacharacters and meta-escape character. */ -#define DEF_METACHARS "; *?\t\n'\"()<>[]|&^`#\\$%=~{}," -#define DEF_METAESCAPE "\\" +#define DEF_METACHARS "; *?\t\n'\"()<>[]|&^`#\\$%=~{}," +#define DEF_METAESCAPE "\\" -/* +/* * HAVE_DUP is 1 if your system has the dup() call. */ -#define HAVE_DUP 1 +#define HAVE_DUP 1 /* Define to 1 if you have the memcpy() function. */ #define HAVE_MEMCPY 1 @@ -192,25 +192,25 @@ * 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 */ -#define OUTBUF_SIZE 1024 /* Output buffer */ -#define PROMPT_SIZE 200 /* 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 512 /* Max size of line in tags file */ -#define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#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 */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 200 /* 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 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 */ +#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. */ diff --git a/defines.o2 b/defines.o2 index 9438bb2..19a1776 100644 --- a/defines.o2 +++ b/defines.o2 @@ -12,162 +12,162 @@ /* * This file has 2 sections: * User preferences. - * Settings always true for the emx compiler for OS/2 systems. + * Settings always true for the emx compiler for OS/2 systems. */ - + /* User preferences. */ /* * SECURE is 1 if you wish to disable a bunch of features in order to * be safe to run by unprivileged users. */ -#define SECURE 0 +#define SECURE 0 /* * SHELL_ESCAPE is 1 if you wish to allow shell escapes. * (This is possible only if your system supplies the system() function.) */ -#define SHELL_ESCAPE (!SECURE) +#define SHELL_ESCAPE (!SECURE) /* * EXAMINE is 1 if you wish to allow examining files by name from within less. */ -#define EXAMINE (!SECURE) +#define EXAMINE (!SECURE) /* * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key * to complete filenames at prompts. */ -#define TAB_COMPLETE_FILENAME (!SECURE) +#define TAB_COMPLETE_FILENAME (!SECURE) /* * CMD_HISTORY is 1 if you wish to allow keys to cycle through * previous commands at prompts. */ -#define CMD_HISTORY 1 +#define CMD_HISTORY 1 /* - * HILITE_SEARCH is 1 if you wish to have search targets to be + * HILITE_SEARCH is 1 if you wish to have search targets to be * displayed in standout mode. */ -#define HILITE_SEARCH 1 +#define HILITE_SEARCH 1 /* * EDITOR is 1 if you wish to allow editor invocation (the "v" command). * (This is possible only if your system supplies the system() function.) * EDIT_PGM is the name of the (default) editor to be invoked. */ -#define EDITOR (!SECURE) -#define EDIT_PGM "vi" +#define EDITOR (!SECURE) +#define EDIT_PGM "vi" /* * TAGS is 1 if you wish to support tag files. */ -#define TAGS (!SECURE) +#define TAGS (!SECURE) /* - * USERFILE is 1 if you wish to allow a .less file to specify + * USERFILE is 1 if you wish to allow a .less file to specify * user-defined key bindings. */ -#define USERFILE (!SECURE) +#define USERFILE (!SECURE) /* * GLOB is 1 if you wish to have shell metacharacters expanded in filenames. * This will generally work if your system provides the "popen" function * and the "echo" shell command. */ -#define GLOB (!SECURE) +#define GLOB (!SECURE) /* * PIPEC is 1 if you wish to have the "|" command * which allows the user to pipe data into a shell command. */ -#define PIPEC (!SECURE) +#define PIPEC (!SECURE) /* * LOGFILE is 1 if you wish to allow the -o option (to create log files). */ -#define LOGFILE (!SECURE) +#define LOGFILE (!SECURE) /* * GNU_OPTIONS is 1 if you wish to support the GNU-style command * line options --help and --version. */ -#define GNU_OPTIONS 1 +#define GNU_OPTIONS 1 /* * ONLY_RETURN is 1 if you want RETURN to be the only input which * will continue past an error message. * Otherwise, any key will continue past an error message. */ -#define ONLY_RETURN 0 +#define ONLY_RETURN 0 /* - * LESSKEYFILE is the filename of the default lesskey output file + * LESSKEYFILE is the filename of the default lesskey output file * (in the HOME directory). * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file. - * DEF_LESSKEYINFILE is the filename of the default lesskey input + * DEF_LESSKEYINFILE is the filename of the default lesskey input * (in the HOME directory). * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ -#define LESSKEYFILE "less.ini" -#define LESSKEYFILE_SYS "C:\\sysless.ini" -#define DEF_LESSKEYINFILE "lesskey.ini" -#define LESSKEYINFILE_SYS "C:\\syslesskey.ini" -#define LESSHISTFILE "lesshst.ini" +#define LESSKEYFILE "less.ini" +#define LESSKEYFILE_SYS "C:\\sysless.ini" +#define DEF_LESSKEYINFILE "lesskey.ini" +#define LESSKEYINFILE_SYS "C:\\syslesskey.ini" +#define LESSHISTFILE "lesshst.ini" + - /* Settings always true for the emx compiler for OS/2 systems. */ #define OS2 1 /* * Pathname separator character. */ -#define PATHNAME_SEP "\\" +#define PATHNAME_SEP "\\" /* - * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. + * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. */ -#define HAVE_ANSI_PROTOS 1 +#define HAVE_ANSI_PROTOS 1 /* * HAVE_SYS_TYPES_H is 1 if your system has . */ -#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TYPES_H 1 /* * Define if you have the header file. */ -#define HAVE_SGSTAT_H 0 +#define HAVE_SGSTAT_H 0 /* * HAVE_PERROR is 1 if your system has the perror() call. * (Actually, if it has sys_errlist, sys_nerr and errno.) */ -#define HAVE_PERROR 1 +#define HAVE_PERROR 1 /* * HAVE_TIME is 1 if your system has the time() call. */ -#define HAVE_TIME 1 +#define HAVE_TIME 1 /* * HAVE_SHELL is 1 if your system supports a SHELL command interpreter. */ -#define HAVE_SHELL 0 +#define HAVE_SHELL 0 /* * Default shell metacharacters and meta-escape character. */ -#define DEF_METACHARS "; *?\t\n'\"()<>|&" -#define DEF_METAESCAPE "" +#define DEF_METACHARS "; *?\t\n'\"()<>|&" +#define DEF_METAESCAPE "" -/* +/* * HAVE_DUP is 1 if your system has the dup() call. */ -#define HAVE_DUP 1 +#define HAVE_DUP 1 /* Define to 1 to support reading lesskey source files (not just binary). */ #define HAVE_LESSKEYSRC 1 @@ -176,29 +176,29 @@ * 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 */ -#define OUTBUF_SIZE 1024 /* Output buffer */ -#define PROMPT_SIZE 200 /* 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 512 /* Max size of line in tags file */ -#define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#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 */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 200 /* 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 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 */ +#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 doesn't define. */ -/* #define off_t long */ +/* #define off_t long */ /* Define if you need to in order for stat and other things to work. */ /* #undef _POSIX_SOURCE */ @@ -239,7 +239,7 @@ #define HAVE_FILENO 1 /* Define HAVE_ERRNO if you have the errno variable */ -/* Define MUST_DEFINE_ERRNO if you have errno but it is not define +/* Define MUST_DEFINE_ERRNO if you have errno but it is not define * in errno.h */ #define HAVE_ERRNO 1 /* #undef MUST_DEFINE_ERRNO */ @@ -263,7 +263,7 @@ #define HAVE_UPPER_LOWER 1 /* Define if you have the _setjmp function. */ -#define HAVE__SETJMP 0 +#define HAVE__SETJMP 0 /* Define if you have the memcpy function. */ #define HAVE_MEMCPY 1 @@ -272,14 +272,14 @@ #define HAVE_POPEN 1 /* Define if you have the sigsetmask function. */ -#define HAVE_SIGSETMASK 0 +#define HAVE_SIGSETMASK 0 /* Define if you have the sigprocmask function. */ -#define HAVE_SIGPROCMASK 1 +#define HAVE_SIGPROCMASK 1 /* Define if you have the sigset_t type and sigemptyset macro */ -#define HAVE_SIGSET_T 1 -#define HAVE_SIGEMPTYSET 1 +#define HAVE_SIGSET_T 1 +#define HAVE_SIGEMPTYSET 1 /* Define if you have the stat function. */ #define HAVE_STAT 1 @@ -288,13 +288,13 @@ #define HAVE_STRCHR 1 /* Define if you have the strstr function. */ -#define HAVE_STRSTR 1 +#define HAVE_STRSTR 1 /* Define if you have the system function. */ -#define HAVE_SYSTEM 1 +#define HAVE_SYSTEM 1 /* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 0 +#define HAVE_SNPRINTF 0 /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 @@ -324,16 +324,16 @@ #define HAVE_SYS_IOCTL_H 1 /* Define if you have the header file. */ -#define HAVE_SYS_PTEM_H 0 +#define HAVE_SYS_PTEM_H 0 /* Define if you have the header file. */ -#define HAVE_SYS_STREAM_H 0 +#define HAVE_SYS_STREAM_H 0 /* Define if you have the header file. */ #define HAVE_TERMCAP_H 1 /* Define if you have the header file. */ -#define HAVE_TERMIO_H 1 +#define HAVE_TERMIO_H 1 /* Define if you have the header file. */ #define HAVE_TERMIOS_H 1 diff --git a/defines.o9 b/defines.o9 index 28a93d6..f72846b 100644 --- a/defines.o9 +++ b/defines.o9 @@ -12,128 +12,128 @@ /* * This file has 2 sections: * User preferences. - * Settings always true for OS-9 systems. + * Settings always true for OS-9 systems. */ - + /* User preferences. */ /* * SECURE is 1 if you wish to disable a bunch of features in order to * be safe to run by unprivileged users. */ -#define SECURE 0 +#define SECURE 0 /* * SHELL_ESCAPE is 1 if you wish to allow shell escapes. * (This is possible only if your system supplies the system() function.) */ -#define SHELL_ESCAPE (!SECURE) +#define SHELL_ESCAPE (!SECURE) /* * EXAMINE is 1 if you wish to allow examining files by name from within less. */ -#define EXAMINE (!SECURE) +#define EXAMINE (!SECURE) /* * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key * to complete filenames at prompts. */ -#define TAB_COMPLETE_FILENAME 1 +#define TAB_COMPLETE_FILENAME 1 /* * CMD_HISTORY is 1 if you wish to allow keys to cycle through * previous commands at prompts. */ -#define CMD_HISTORY 1 +#define CMD_HISTORY 1 /* - * HILITE_SEARCH is 1 if you wish to have search targets to be + * HILITE_SEARCH is 1 if you wish to have search targets to be * displayed in standout mode. */ -#define HILITE_SEARCH 1 +#define HILITE_SEARCH 1 /* * EDITOR is 1 if you wish to allow editor invocation (the "v" command). * (This is possible only if your system supplies the system() function.) * EDIT_PGM is the name of the (default) editor to be invoked. */ -#define EDITOR (!SECURE) -#define EDIT_PGM "umacs" +#define EDITOR (!SECURE) +#define EDIT_PGM "umacs" /* * TAGS is 1 if you wish to support tag files. */ -#define TAGS (!SECURE) +#define TAGS (!SECURE) /* - * USERFILE is 1 if you wish to allow a .less file to specify + * USERFILE is 1 if you wish to allow a .less file to specify * user-defined key bindings. */ -#define USERFILE (!SECURE) +#define USERFILE (!SECURE) /* * GLOB is 1 if you wish to have shell metacharacters expanded in filenames. * This will generally work if your system provides the "popen" function * and the "echo" shell command. */ -#define GLOB (!SECURE) +#define GLOB (!SECURE) /* * PIPEC is 1 if you wish to have the "|" command * which allows the user to pipe data into a shell command. */ -#define PIPEC (!SECURE) +#define PIPEC (!SECURE) /* * LOGFILE is 1 if you wish to allow the -o option (to create log files). */ -#define LOGFILE (!SECURE) +#define LOGFILE (!SECURE) /* * GNU_OPTIONS is 1 if you wish to support the GNU-style command * line options --help and --version. */ -#define GNU_OPTIONS 1 +#define GNU_OPTIONS 1 /* * ONLY_RETURN is 1 if you want RETURN to be the only input which * will continue past an error message. * Otherwise, any key will continue past an error message. */ -#define ONLY_RETURN 0 +#define ONLY_RETURN 0 /* - * LESSKEYFILE is the filename of the default lesskey output file + * LESSKEYFILE is the filename of the default lesskey output file * (in the HOME directory). * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file. - * DEF_LESSKEYINFILE is the filename of the default lesskey input + * DEF_LESSKEYINFILE is the filename of the default lesskey input * (in the HOME directory). * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ -#define LESSKEYFILE ".less" -#define LESSKEYFILE_SYS "/.sysless" -#define DEF_LESSKEYINFILE ".lesskey" -#define LESSKEYINFILE_SYS "/.syslesskey" -#define LESSHISTFILE ".lesshst" +#define LESSKEYFILE ".less" +#define LESSKEYFILE_SYS "/.sysless" +#define DEF_LESSKEYINFILE ".lesskey" +#define LESSKEYINFILE_SYS "/.syslesskey" +#define LESSHISTFILE ".lesshst" + - /* Settings always true for OS-9. */ /* This is not needed; it is defined by the compiler. */ /* #define _OSK 1 */ -#define OS2 0 -#define MSDOS_COMPILER 0 +#define OS2 0 +#define MSDOS_COMPILER 0 /* * Pathname separator character. */ -#define PATHNAME_SEP "/" +#define PATHNAME_SEP "/" /* - * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. + * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. */ -#define HAVE_ANSI_PROTOS 1 +#define HAVE_ANSI_PROTOS 1 /* * HAVE_SYS_TYPES_H is 1 if your system has . @@ -143,27 +143,27 @@ /* * Define if you have the header file. */ -#define HAVE_SGSTAT_H 1 +#define HAVE_SGSTAT_H 1 /* * HAVE_PERROR is 1 if your system has the perror() call. * (Actually, if it has sys_errlist, sys_nerr and errno.) */ #if _OSK_MWC32 -#define HAVE_PERROR 0 +#define HAVE_PERROR 0 #else -#define HAVE_PERROR 1 +#define HAVE_PERROR 1 #endif /* * HAVE_TIME is 1 if your system has the time() call. */ -#define HAVE_TIME 1 +#define HAVE_TIME 1 /* * HAVE_SHELL is 1 if your system supports a SHELL command interpreter. */ -#define HAVE_SHELL 0 +#define HAVE_SHELL 0 /* * Default shell metacharacters and meta-escape character. @@ -171,10 +171,10 @@ #define DEF_METACHARS "; \t\n'\"()<>|&^`#\\" #define DEF_METAESCAPE "\\" -/* +/* * HAVE_DUP is 1 if your system has the dup() call. */ -#define HAVE_DUP 0 +#define HAVE_DUP 0 /* Define to 1 to support reading lesskey source files (not just binary). */ #define HAVE_LESSKEYSRC 1 @@ -183,25 +183,25 @@ * 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 */ -#define OUTBUF_SIZE 1024 /* Output buffer */ -#define PROMPT_SIZE 200 /* 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 512 /* Max size of line in tags file */ -#define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#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 */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 200 /* 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 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 */ +#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 doesn't define. */ @@ -250,7 +250,7 @@ #define HAVE_FILENO 1 /* Define HAVE_ERRNO if you have the errno variable */ -/* Define MUST_DEFINE_ERRNO if you have errno but it is not define +/* Define MUST_DEFINE_ERRNO if you have errno but it is not define * in errno.h */ #define HAVE_ERRNO 1 #define MUST_DEFINE_ERRNO 0 @@ -286,11 +286,11 @@ #define HAVE_SIGSETMASK 0 /* Define if you have the sigprocmask function. */ -#define HAVE_SIGPROCMASK 0 +#define HAVE_SIGPROCMASK 0 /* Define if you have the sigset_t type and sigemptyset macro */ -#define HAVE_SIGSET_T 0 -#define HAVE_SIGEMPTYSET 0 +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 /* Define if you have the stat function. */ #define HAVE_STAT 0 @@ -302,7 +302,7 @@ #define HAVE_SYSTEM 1 /* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 0 +#define HAVE_SNPRINTF 0 /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 diff --git a/defines.wn b/defines.wn index 30592ca..4223a63 100644 --- a/defines.wn +++ b/defines.wn @@ -12,163 +12,163 @@ /* * This file has 2 sections: * User preferences. - * Settings always true for Windows systems. + * Settings always true for Windows systems. */ - + /* User preferences. */ /* * SECURE is 1 if you wish to disable a bunch of features in order to * be safe to run by unprivileged users. */ -#define SECURE 0 +#define SECURE 0 /* * SHELL_ESCAPE is 1 if you wish to allow shell escapes. * (This is possible only if your system supplies the system() function.) */ -#define SHELL_ESCAPE (!SECURE) +#define SHELL_ESCAPE (!SECURE) /* * EXAMINE is 1 if you wish to allow examining files by name from within less. */ -#define EXAMINE (!SECURE) +#define EXAMINE (!SECURE) /* * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key * to complete filenames at prompts. */ -#define TAB_COMPLETE_FILENAME (!SECURE) +#define TAB_COMPLETE_FILENAME (!SECURE) /* * CMD_HISTORY is 1 if you wish to allow keys to cycle through * previous commands at prompts. */ -#define CMD_HISTORY 1 +#define CMD_HISTORY 1 /* - * HILITE_SEARCH is 1 if you wish to have search targets to be + * HILITE_SEARCH is 1 if you wish to have search targets to be * displayed in standout mode. */ -#define HILITE_SEARCH 1 +#define HILITE_SEARCH 1 /* * EDITOR is 1 if you wish to allow editor invocation (the "v" command). * (This is possible only if your system supplies the system() function.) * EDIT_PGM is the name of the (default) editor to be invoked. */ -#define EDITOR (!SECURE) -#define EDIT_PGM "edit" +#define EDITOR (!SECURE) +#define EDIT_PGM "edit" /* * TAGS is 1 if you wish to support tag files. */ -#define TAGS (!SECURE) +#define TAGS (!SECURE) /* - * USERFILE is 1 if you wish to allow a .less file to specify + * USERFILE is 1 if you wish to allow a .less file to specify * user-defined key bindings. */ -#define USERFILE (!SECURE) +#define USERFILE (!SECURE) /* * GLOB is 1 if you wish to have shell metacharacters expanded in filenames. * This will generally work if your system provides the "popen" function * and the "echo" shell command. */ -#define GLOB 0 +#define GLOB 0 /* * PIPEC is 1 if you wish to have the "|" command * which allows the user to pipe data into a shell command. */ -#define PIPEC 1 +#define PIPEC 1 /* * LOGFILE is 1 if you wish to allow the -o option (to create log files). */ -#define LOGFILE (!SECURE) +#define LOGFILE (!SECURE) /* * GNU_OPTIONS is 1 if you wish to support the GNU-style command * line options --help and --version. */ -#define GNU_OPTIONS 1 +#define GNU_OPTIONS 1 /* * ONLY_RETURN is 1 if you want RETURN to be the only input which * will continue past an error message. * Otherwise, any key will continue past an error message. */ -#define ONLY_RETURN 0 +#define ONLY_RETURN 0 /* - * LESSKEYFILE is the filename of the default lesskey output file + * LESSKEYFILE is the filename of the default lesskey output file * (in the HOME directory). * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file. - * DEF_LESSKEYINFILE is the filename of the default lesskey input + * DEF_LESSKEYINFILE is the filename of the default lesskey input * (in the HOME directory). * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ -#define LESSKEYFILE "_less" -#define LESSKEYFILE_SYS "c:\\_sysless" -#define DEF_LESSKEYINFILE "_lesskey" -#define LESSKEYINFILE_SYS "c:\\_syslesskey" -#define LESSHISTFILE "_lesshst" +#define LESSKEYFILE "_less" +#define LESSKEYFILE_SYS "c:\\_sysless" +#define DEF_LESSKEYINFILE "_lesskey" +#define LESSKEYINFILE_SYS "c:\\_syslesskey" +#define LESSHISTFILE "_lesshst" + - /* Settings always true for Windows systems. */ -#define MSDOS_COMPILER WIN32C +#define MSDOS_COMPILER WIN32C /* * Pathname separator character. */ -#define PATHNAME_SEP "\\" +#define PATHNAME_SEP "\\" /* - * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. + * HAVE_ANSI_PROTOS is 1 if your compiler supports ANSI function prototypes. */ -#define HAVE_ANSI_PROTOS 1 +#define HAVE_ANSI_PROTOS 1 /* * HAVE_SYS_TYPES_H is 1 if your system has . */ -#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TYPES_H 1 /* * Define if you have the header file. */ -#define HAVE_SGSTAT_H 0 +#define HAVE_SGSTAT_H 0 /* * HAVE_PERROR is 1 if your system has the perror() call. * (Actually, if it has sys_errlist, sys_nerr and errno.) */ -#define HAVE_PERROR 1 +#define HAVE_PERROR 1 /* * HAVE_TIME is 1 if your system has the time() call. */ -#define HAVE_TIME 1 +#define HAVE_TIME 1 /* * HAVE_SHELL is 1 if your system supports a SHELL command interpreter. */ -#define HAVE_SHELL 0 +#define HAVE_SHELL 0 /* * Default shell metacharacters and meta-escape character. */ -#define DEF_METACHARS "; *?\t\n'\"()<>|&" -#define DEF_METAESCAPE "" +#define DEF_METACHARS "; *?\t\n'\"()<>|&" +#define DEF_METAESCAPE "" -/* +/* * HAVE_DUP is 1 if your system has the dup() call. */ -#define HAVE_DUP 1 +#define HAVE_DUP 1 /* Define to 1 to support reading lesskey source files (not just binary). */ #define HAVE_LESSKEYSRC 1 @@ -177,29 +177,29 @@ * 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 */ -#define OUTBUF_SIZE 1024 /* Output buffer */ -#define PROMPT_SIZE 200 /* 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 512 /* Max size of line in tags file */ -#define TABSTOP_MAX 32 /* Max number of custom tab stops */ +#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 */ +#define OUTBUF_SIZE 1024 /* Output buffer */ +#define PROMPT_SIZE 200 /* 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 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 */ +#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 doesn't define. */ -/* #define off_t long */ +/* #define off_t long */ /* Define if you need to in order for stat and other things to work. */ /* #undef _POSIX_SOURCE */ @@ -222,18 +222,18 @@ /* #undef HAVE_REGCMP */ #ifdef MINGW #ifdef USE_POSIX_REGCOMP - #define HAVE_POSIX_REGCOMP 1 + #define HAVE_POSIX_REGCOMP 1 #else - #ifdef USE_GNU_REGEX - #define HAVE_GNU_REGEX 1 + #ifdef USE_GNU_REGEX + #define HAVE_GNU_REGEX 1 #else #ifdef USE_REGEXP_C - #define HAVE_V8_REGCOMP 1 - #define HAVE_REGEXEC2 1 + #define HAVE_V8_REGCOMP 1 + #define HAVE_REGEXEC2 1 #else #define NO_REGEX 1 - #endif - #endif + #endif + #endif #endif #else #define HAVE_V8_REGCOMP 1 @@ -257,7 +257,7 @@ #define HAVE_FILENO 1 /* Define HAVE_ERRNO if you have the errno variable */ -/* Define MUST_DEFINE_ERRNO if you have errno but it is not define +/* Define MUST_DEFINE_ERRNO if you have errno but it is not define * in errno.h */ #define HAVE_ERRNO 1 #ifdef MINGW @@ -285,7 +285,7 @@ #define HAVE_UPPER_LOWER 1 /* Define if you have the _setjmp function. */ -#define HAVE__SETJMP 1 +#define HAVE__SETJMP 1 /* Define if you have the memcpy function. */ #define HAVE_MEMCPY 1 @@ -294,14 +294,14 @@ #define HAVE_POPEN 1 /* Define if you have the sigsetmask function. */ -#define HAVE_SIGSETMASK 0 +#define HAVE_SIGSETMASK 0 /* Define if you have the sigprocmask function. */ -#define HAVE_SIGPROCMASK 0 +#define HAVE_SIGPROCMASK 0 /* Define if you have the sigset_t type and sigemptyset macro */ -#define HAVE_SIGSET_T 0 -#define HAVE_SIGEMPTYSET 0 +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 /* Define if you have the stat function. */ #define HAVE_STAT 1 @@ -310,10 +310,10 @@ #define HAVE_STRCHR 1 /* Define if you have the system function. */ -#define HAVE_SYSTEM 1 +#define HAVE_SYSTEM 1 /* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 1 +#define HAVE_SNPRINTF 1 /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 @@ -346,16 +346,16 @@ #define HAVE_SYS_IOCTL_H 0 /* Define if you have the header file. */ -#define HAVE_SYS_PTEM_H 0 +#define HAVE_SYS_PTEM_H 0 /* Define if you have the header file. */ -#define HAVE_SYS_STREAM_H 0 +#define HAVE_SYS_STREAM_H 0 /* Define if you have the header file. */ -#define HAVE_TERMCAP_H 0 +#define HAVE_TERMCAP_H 0 /* Define if you have the header file. */ -#define HAVE_TERMIO_H 0 +#define HAVE_TERMIO_H 0 /* Define if you have the header file. */ #define HAVE_TERMIOS_H 0 @@ -381,9 +381,9 @@ #endif #endif -#define popen _popen -#if !defined(_MSC_VER) || (_MSC_VER < 1900) -#define snprintf _snprintf +#define popen _popen +#if !defined(_MSC_VER) || (_MSC_VER < 1900) +#define snprintf _snprintf #endif #ifndef MINGW diff --git a/edit.c b/edit.c index 151ac74..b8cc3bf 100644 --- a/edit.c +++ b/edit.c @@ -55,166 +55,166 @@ public ino_t curr_ino; * words, returning each one as a standard null-terminated string. * back_textlist does the same, but runs thru the list backwards. */ - public void + public void init_textlist(tlist, str) - struct textlist *tlist; - char *str; + struct textlist *tlist; + char *str; { - char *s; + char *s; #if SPACES_IN_FILENAMES - int meta_quoted = 0; - int delim_quoted = 0; - char *esc = get_meta_escape(); - int esclen = (int) strlen(esc); + int meta_quoted = 0; + int delim_quoted = 0; + char *esc = get_meta_escape(); + int esclen = (int) strlen(esc); #endif - - tlist->string = skipsp(str); - tlist->endstring = tlist->string + strlen(tlist->string); - for (s = str; s < tlist->endstring; s++) - { + + tlist->string = skipsp(str); + tlist->endstring = tlist->string + strlen(tlist->string); + for (s = str; s < tlist->endstring; s++) + { #if SPACES_IN_FILENAMES - if (meta_quoted) - { - meta_quoted = 0; - } else if (esclen > 0 && s + esclen < tlist->endstring && - strncmp(s, esc, esclen) == 0) - { - meta_quoted = 1; - s += esclen - 1; - } else if (delim_quoted) - { - if (*s == closequote) - delim_quoted = 0; - } else /* (!delim_quoted) */ - { - if (*s == openquote) - delim_quoted = 1; - else if (*s == ' ') - *s = '\0'; - } + if (meta_quoted) + { + meta_quoted = 0; + } else if (esclen > 0 && s + esclen < tlist->endstring && + strncmp(s, esc, esclen) == 0) + { + meta_quoted = 1; + s += esclen - 1; + } else if (delim_quoted) + { + if (*s == closequote) + delim_quoted = 0; + } else /* (!delim_quoted) */ + { + if (*s == openquote) + delim_quoted = 1; + else if (*s == ' ') + *s = '\0'; + } #else - if (*s == ' ') - *s = '\0'; + if (*s == ' ') + *s = '\0'; #endif - } + } } - public char * + public char * forw_textlist(tlist, prev) - struct textlist *tlist; - char *prev; + struct textlist *tlist; + char *prev; { - char *s; - - /* - * prev == NULL means return the first word in the list. - * Otherwise, return the word after "prev". - */ - if (prev == NULL) - s = tlist->string; - else - s = prev + strlen(prev); - if (s >= tlist->endstring) - return (NULL); - while (*s == '\0') - s++; - if (s >= tlist->endstring) - return (NULL); - return (s); + char *s; + + /* + * prev == NULL means return the first word in the list. + * Otherwise, return the word after "prev". + */ + if (prev == NULL) + s = tlist->string; + else + s = prev + strlen(prev); + if (s >= tlist->endstring) + return (NULL); + while (*s == '\0') + s++; + if (s >= tlist->endstring) + return (NULL); + return (s); } - public char * + public char * back_textlist(tlist, prev) - struct textlist *tlist; - char *prev; + struct textlist *tlist; + char *prev; { - char *s; - - /* - * prev == NULL means return the last word in the list. - * Otherwise, return the word before "prev". - */ - if (prev == NULL) - s = tlist->endstring; - else if (prev <= tlist->string) - return (NULL); - else - s = prev - 1; - while (*s == '\0') - s--; - if (s <= tlist->string) - return (NULL); - while (s[-1] != '\0' && s > tlist->string) - s--; - return (s); + char *s; + + /* + * prev == NULL means return the last word in the list. + * Otherwise, return the word before "prev". + */ + if (prev == NULL) + s = tlist->endstring; + else if (prev <= tlist->string) + return (NULL); + else + s = prev - 1; + while (*s == '\0') + s--; + if (s <= tlist->string) + return (NULL); + while (s[-1] != '\0' && s > tlist->string) + s--; + return (s); } /* * Close a pipe opened via popen. */ - static void + static void close_pipe(FILE *pipefd) { - if (pipefd == NULL) - return; + if (pipefd == NULL) + return; #if OS2 - /* - * The pclose function of OS/2 emx sometimes fails. - * Send SIGINT to the piped process before closing it. - */ - kill(pipefd->_pid, SIGINT); + /* + * The pclose function of OS/2 emx sometimes fails. + * Send SIGINT to the piped process before closing it. + */ + kill(pipefd->_pid, SIGINT); #endif - pclose(pipefd); + pclose(pipefd); } /* * Close the current input file. */ - static void + static void close_file(VOID_PARAM) { - struct scrpos scrpos; - int chflags; - FILE *altpipe; - char *altfilename; - - if (curr_ifile == NULL_IFILE) - return; - - /* - * Save the current position so that we can return to - * the same position if we edit this file again. - */ - get_scrpos(&scrpos, TOP); - if (scrpos.pos != NULL_POSITION) - { - store_pos(curr_ifile, &scrpos); - lastmark(); - } - /* - * Close the file descriptor, unless it is a pipe. - */ - chflags = ch_getflags(); - ch_close(); - /* - * If we opened a file using an alternate name, - * do special stuff to close it. - */ - altfilename = get_altfilename(curr_ifile); - if (altfilename != NULL) - { - altpipe = get_altpipe(curr_ifile); - if (altpipe != NULL && !(chflags & CH_KEEPOPEN)) - { - close_pipe(altpipe); - set_altpipe(curr_ifile, NULL); - } - close_altfile(altfilename, get_filename(curr_ifile)); - set_altfilename(curr_ifile, NULL); - } - curr_ifile = NULL_IFILE; + struct scrpos scrpos; + int chflags; + FILE *altpipe; + char *altfilename; + + if (curr_ifile == NULL_IFILE) + return; + + /* + * Save the current position so that we can return to + * the same position if we edit this file again. + */ + get_scrpos(&scrpos, TOP); + if (scrpos.pos != NULL_POSITION) + { + store_pos(curr_ifile, &scrpos); + lastmark(); + } + /* + * Close the file descriptor, unless it is a pipe. + */ + chflags = ch_getflags(); + ch_close(); + /* + * If we opened a file using an alternate name, + * do special stuff to close it. + */ + altfilename = get_altfilename(curr_ifile); + if (altfilename != NULL) + { + altpipe = get_altpipe(curr_ifile); + if (altpipe != NULL && !(chflags & CH_KEEPOPEN)) + { + close_pipe(altpipe); + set_altpipe(curr_ifile, NULL); + } + close_altfile(altfilename, get_filename(curr_ifile)); + set_altfilename(curr_ifile, NULL); + } + curr_ifile = NULL_IFILE; #if HAVE_STAT_INO - curr_ino = curr_dev = 0; + curr_ino = curr_dev = 0; #endif } @@ -223,278 +223,278 @@ close_file(VOID_PARAM) * Filename == "-" means standard input. * Filename == NULL means just close the current file. */ - public int + public int edit(filename) - char *filename; + char *filename; { - if (filename == NULL) - return (edit_ifile(NULL_IFILE)); - return (edit_ifile(get_ifile(filename, curr_ifile))); + if (filename == NULL) + return (edit_ifile(NULL_IFILE)); + return (edit_ifile(get_ifile(filename, curr_ifile))); } - + /* * Edit a new file (given its IFILE). * ifile == NULL means just close the current file. */ - public int + public int edit_ifile(ifile) - IFILE ifile; + IFILE ifile; { - int f; - int answer; - int chflags; - char *filename; - char *open_filename; - char *alt_filename; - void *altpipe; - IFILE was_curr_ifile; - PARG parg; - - if (ifile == curr_ifile) - { - /* - * Already have the correct file open. - */ - return (0); - } - - /* - * We must close the currently open file now. - * This is necessary to make the open_altfile/close_altfile pairs - * nest properly (or rather to avoid nesting at all). - * {{ Some stupid implementations of popen() mess up if you do: - * fA = popen("A"); fB = popen("B"); pclose(fA); pclose(fB); }} - */ + int f; + int answer; + int chflags; + char *filename; + char *open_filename; + char *alt_filename; + void *altpipe; + IFILE was_curr_ifile; + PARG parg; + + if (ifile == curr_ifile) + { + /* + * Already have the correct file open. + */ + return (0); + } + + /* + * We must close the currently open file now. + * This is necessary to make the open_altfile/close_altfile pairs + * nest properly (or rather to avoid nesting at all). + * {{ Some stupid implementations of popen() mess up if you do: + * fA = popen("A"); fB = popen("B"); pclose(fA); pclose(fB); }} + */ #if LOGFILE - end_logfile(); + end_logfile(); #endif - was_curr_ifile = save_curr_ifile(); - if (curr_ifile != NULL_IFILE) - { - chflags = ch_getflags(); - close_file(); - if ((chflags & CH_HELPFILE) && held_ifile(was_curr_ifile) <= 1) - { - /* - * Don't keep the help file in the ifile list. - */ - del_ifile(was_curr_ifile); - was_curr_ifile = old_ifile; - } - } - - if (ifile == NULL_IFILE) - { - /* - * No new file to open. - * (Don't set old_ifile, because if you call edit_ifile(NULL), - * you're supposed to have saved curr_ifile yourself, - * and you'll restore it if necessary.) - */ - unsave_ifile(was_curr_ifile); - return (0); - } - - filename = save(get_filename(ifile)); - - /* - * See if LESSOPEN specifies an "alternate" file to open. - */ - altpipe = get_altpipe(ifile); - if (altpipe != NULL) - { - /* - * File is already open. - * chflags and f are not used by ch_init if ifile has - * filestate which should be the case if we're here. - * Set them here to avoid uninitialized variable warnings. - */ - chflags = 0; - f = -1; - alt_filename = get_altfilename(ifile); - open_filename = (alt_filename != NULL) ? alt_filename : filename; - } else - { - if (strcmp(filename, FAKE_HELPFILE) == 0 || - strcmp(filename, FAKE_EMPTYFILE) == 0) - alt_filename = NULL; - else - alt_filename = open_altfile(filename, &f, &altpipe); - - open_filename = (alt_filename != NULL) ? alt_filename : filename; - - chflags = 0; - if (altpipe != NULL) - { - /* - * The alternate "file" is actually a pipe. - * f has already been set to the file descriptor of the pipe - * in the call to open_altfile above. - * Keep the file descriptor open because it was opened - * via popen(), and pclose() wants to close it. - */ - chflags |= CH_POPENED; - if (strcmp(filename, "-") == 0) - chflags |= CH_KEEPOPEN; - } else if (strcmp(filename, "-") == 0) - { - /* - * Use standard input. - * Keep the file descriptor open because we can't reopen it. - */ - f = fd0; - chflags |= CH_KEEPOPEN; - /* - * Must switch stdin to BINARY mode. - */ - SET_BINARY(f); + was_curr_ifile = save_curr_ifile(); + if (curr_ifile != NULL_IFILE) + { + chflags = ch_getflags(); + close_file(); + if ((chflags & CH_HELPFILE) && held_ifile(was_curr_ifile) <= 1) + { + /* + * Don't keep the help file in the ifile list. + */ + del_ifile(was_curr_ifile); + was_curr_ifile = old_ifile; + } + } + + if (ifile == NULL_IFILE) + { + /* + * No new file to open. + * (Don't set old_ifile, because if you call edit_ifile(NULL), + * you're supposed to have saved curr_ifile yourself, + * and you'll restore it if necessary.) + */ + unsave_ifile(was_curr_ifile); + return (0); + } + + filename = save(get_filename(ifile)); + + /* + * See if LESSOPEN specifies an "alternate" file to open. + */ + altpipe = get_altpipe(ifile); + if (altpipe != NULL) + { + /* + * File is already open. + * chflags and f are not used by ch_init if ifile has + * filestate which should be the case if we're here. + * Set them here to avoid uninitialized variable warnings. + */ + chflags = 0; + f = -1; + alt_filename = get_altfilename(ifile); + open_filename = (alt_filename != NULL) ? alt_filename : filename; + } else + { + if (strcmp(filename, FAKE_HELPFILE) == 0 || + strcmp(filename, FAKE_EMPTYFILE) == 0) + alt_filename = NULL; + else + alt_filename = open_altfile(filename, &f, &altpipe); + + open_filename = (alt_filename != NULL) ? alt_filename : filename; + + chflags = 0; + if (altpipe != NULL) + { + /* + * The alternate "file" is actually a pipe. + * f has already been set to the file descriptor of the pipe + * in the call to open_altfile above. + * Keep the file descriptor open because it was opened + * via popen(), and pclose() wants to close it. + */ + chflags |= CH_POPENED; + if (strcmp(filename, "-") == 0) + chflags |= CH_KEEPOPEN; + } else if (strcmp(filename, "-") == 0) + { + /* + * Use standard input. + * Keep the file descriptor open because we can't reopen it. + */ + f = fd0; + chflags |= CH_KEEPOPEN; + /* + * Must switch stdin to BINARY mode. + */ + SET_BINARY(f); #if MSDOS_COMPILER==DJGPPC - /* - * Setting stdin to binary by default causes - * Ctrl-C to not raise SIGINT. We must undo - * that side-effect. - */ - __djgpp_set_ctrl_c(1); + /* + * Setting stdin to binary by default causes + * Ctrl-C to not raise SIGINT. We must undo + * that side-effect. + */ + __djgpp_set_ctrl_c(1); #endif - } else if (strcmp(open_filename, FAKE_EMPTYFILE) == 0) - { - f = -1; - chflags |= CH_NODATA; - } else if (strcmp(open_filename, FAKE_HELPFILE) == 0) - { - f = -1; - chflags |= CH_HELPFILE; - } else if ((parg.p_string = bad_file(open_filename)) != NULL) - { - /* - * It looks like a bad file. Don't try to open it. - */ - error("%s", &parg); - free(parg.p_string); - err1: - if (alt_filename != NULL) - { - close_pipe(altpipe); - close_altfile(alt_filename, filename); - free(alt_filename); - } - del_ifile(ifile); - free(filename); - /* - * Re-open the current file. - */ - if (was_curr_ifile == ifile) - { - /* - * Whoops. The "current" ifile is the one we just deleted. - * Just give up. - */ - quit(QUIT_ERROR); - } - reedit_ifile(was_curr_ifile); - return (1); - } else if ((f = open(open_filename, OPEN_READ)) < 0) - { - /* - * Got an error trying to open it. - */ - parg.p_string = errno_message(filename); - error("%s", &parg); - free(parg.p_string); - goto err1; - } else - { - chflags |= CH_CANSEEK; - if (!force_open && !opened(ifile) && bin_file(f)) - { - /* - * Looks like a binary file. - * Ask user if we should proceed. - */ - parg.p_string = filename; - answer = query("\"%s\" may be a binary file. See it anyway? ", - &parg); - if (answer != 'y' && answer != 'Y') - { - close(f); - goto err1; - } - } - } - } - - /* - * Get the new ifile. - * Get the saved position for the file. - */ - if (was_curr_ifile != NULL_IFILE) - { - old_ifile = was_curr_ifile; - unsave_ifile(was_curr_ifile); - } - curr_ifile = ifile; - set_altfilename(curr_ifile, alt_filename); - set_altpipe(curr_ifile, altpipe); - set_open(curr_ifile); /* File has been opened */ - get_pos(curr_ifile, &initial_scrpos); - new_file = TRUE; - ch_init(f, chflags); - consecutive_nulls = 0; - - if (!(chflags & CH_HELPFILE)) - { + } else if (strcmp(open_filename, FAKE_EMPTYFILE) == 0) + { + f = -1; + chflags |= CH_NODATA; + } else if (strcmp(open_filename, FAKE_HELPFILE) == 0) + { + f = -1; + chflags |= CH_HELPFILE; + } else if ((parg.p_string = bad_file(open_filename)) != NULL) + { + /* + * It looks like a bad file. Don't try to open it. + */ + error("%s", &parg); + free(parg.p_string); + err1: + if (alt_filename != NULL) + { + close_pipe(altpipe); + close_altfile(alt_filename, filename); + free(alt_filename); + } + del_ifile(ifile); + free(filename); + /* + * Re-open the current file. + */ + if (was_curr_ifile == ifile) + { + /* + * Whoops. The "current" ifile is the one we just deleted. + * Just give up. + */ + quit(QUIT_ERROR); + } + reedit_ifile(was_curr_ifile); + return (1); + } else if ((f = open(open_filename, OPEN_READ)) < 0) + { + /* + * Got an error trying to open it. + */ + parg.p_string = errno_message(filename); + error("%s", &parg); + free(parg.p_string); + goto err1; + } else + { + chflags |= CH_CANSEEK; + if (!force_open && !opened(ifile) && bin_file(f)) + { + /* + * Looks like a binary file. + * Ask user if we should proceed. + */ + parg.p_string = filename; + answer = query("\"%s\" may be a binary file. See it anyway? ", + &parg); + if (answer != 'y' && answer != 'Y') + { + close(f); + goto err1; + } + } + } + } + + /* + * Get the new ifile. + * Get the saved position for the file. + */ + if (was_curr_ifile != NULL_IFILE) + { + old_ifile = was_curr_ifile; + unsave_ifile(was_curr_ifile); + } + curr_ifile = ifile; + set_altfilename(curr_ifile, alt_filename); + set_altpipe(curr_ifile, altpipe); + set_open(curr_ifile); /* File has been opened */ + get_pos(curr_ifile, &initial_scrpos); + new_file = TRUE; + ch_init(f, chflags); + consecutive_nulls = 0; + + if (!(chflags & CH_HELPFILE)) + { #if LOGFILE - if (namelogfile != NULL && is_tty) - use_logfile(namelogfile); + if (namelogfile != NULL && is_tty) + use_logfile(namelogfile); #endif #if HAVE_STAT_INO - /* Remember the i-number and device of the opened file. */ - if (strcmp(open_filename, "-") != 0) - { - struct stat statbuf; - int r = stat(open_filename, &statbuf); - if (r == 0) - { - curr_ino = statbuf.st_ino; - curr_dev = statbuf.st_dev; - } - } + /* Remember the i-number and device of the opened file. */ + if (strcmp(open_filename, "-") != 0) + { + struct stat statbuf; + int r = stat(open_filename, &statbuf); + if (r == 0) + { + curr_ino = statbuf.st_ino; + curr_dev = statbuf.st_dev; + } + } #endif - if (every_first_cmd != NULL) - { - ungetsc(every_first_cmd); - ungetcc_back(CHAR_END_COMMAND); - } - } - - flush(); - - if (is_tty) - { - /* - * Output is to a real tty. - */ - - /* - * Indicate there is nothing displayed yet. - */ - pos_clear(); - clr_linenum(); + if (every_first_cmd != NULL) + { + ungetsc(every_first_cmd); + ungetcc_back(CHAR_END_COMMAND); + } + } + + flush(); + + if (is_tty) + { + /* + * Output is to a real tty. + */ + + /* + * Indicate there is nothing displayed yet. + */ + pos_clear(); + clr_linenum(); #if HILITE_SEARCH - clr_hilite(); + clr_hilite(); #endif - hshift = 0; - if (strcmp(filename, FAKE_HELPFILE) && strcmp(filename, FAKE_EMPTYFILE)) - { - char *qfilename = shell_quote(filename); - cmd_addhist(ml_examine, qfilename, 1); - free(qfilename); - } - if (want_filesize) - scan_eof(); - } - free(filename); - return (0); + hshift = 0; + if (strcmp(filename, FAKE_HELPFILE) && strcmp(filename, FAKE_EMPTYFILE)) + { + char *qfilename = shell_quote(filename); + cmd_addhist(ml_examine, qfilename, 1); + free(qfilename); + } + if (want_filesize) + scan_eof(); + } + free(filename); + return (0); } /* @@ -502,273 +502,273 @@ edit_ifile(ifile) * For each filename in the list, enter it into the ifile list. * Then edit the first one. */ - public int + public int edit_list(filelist) - char *filelist; + char *filelist; { - IFILE save_ifile; - char *good_filename; - char *filename; - char *gfilelist; - char *gfilename; - char *qfilename; - struct textlist tl_files; - struct textlist tl_gfiles; - - save_ifile = save_curr_ifile(); - good_filename = NULL; - - /* - * Run thru each filename in the list. - * Try to glob the filename. - * If it doesn't expand, just try to open the filename. - * If it does expand, try to open each name in that list. - */ - init_textlist(&tl_files, filelist); - filename = NULL; - while ((filename = forw_textlist(&tl_files, filename)) != NULL) - { - gfilelist = lglob(filename); - init_textlist(&tl_gfiles, gfilelist); - gfilename = NULL; - while ((gfilename = forw_textlist(&tl_gfiles, gfilename)) != NULL) - { - qfilename = shell_unquote(gfilename); - if (edit(qfilename) == 0 && good_filename == NULL) - good_filename = get_filename(curr_ifile); - free(qfilename); - } - free(gfilelist); - } - /* - * Edit the first valid filename in the list. - */ - if (good_filename == NULL) - { - unsave_ifile(save_ifile); - return (1); - } - if (get_ifile(good_filename, curr_ifile) == curr_ifile) - { - /* - * Trying to edit the current file; don't reopen it. - */ - unsave_ifile(save_ifile); - return (0); - } - reedit_ifile(save_ifile); - return (edit(good_filename)); + IFILE save_ifile; + char *good_filename; + char *filename; + char *gfilelist; + char *gfilename; + char *qfilename; + struct textlist tl_files; + struct textlist tl_gfiles; + + save_ifile = save_curr_ifile(); + good_filename = NULL; + + /* + * Run thru each filename in the list. + * Try to glob the filename. + * If it doesn't expand, just try to open the filename. + * If it does expand, try to open each name in that list. + */ + init_textlist(&tl_files, filelist); + filename = NULL; + while ((filename = forw_textlist(&tl_files, filename)) != NULL) + { + gfilelist = lglob(filename); + init_textlist(&tl_gfiles, gfilelist); + gfilename = NULL; + while ((gfilename = forw_textlist(&tl_gfiles, gfilename)) != NULL) + { + qfilename = shell_unquote(gfilename); + if (edit(qfilename) == 0 && good_filename == NULL) + good_filename = get_filename(curr_ifile); + free(qfilename); + } + free(gfilelist); + } + /* + * Edit the first valid filename in the list. + */ + if (good_filename == NULL) + { + unsave_ifile(save_ifile); + return (1); + } + if (get_ifile(good_filename, curr_ifile) == curr_ifile) + { + /* + * Trying to edit the current file; don't reopen it. + */ + unsave_ifile(save_ifile); + return (0); + } + reedit_ifile(save_ifile); + return (edit(good_filename)); } /* * Edit the first file in the command line (ifile) list. */ - public int + public int edit_first(VOID_PARAM) { - if (nifile() == 0) - return (edit_stdin()); - curr_ifile = NULL_IFILE; - return (edit_next(1)); + if (nifile() == 0) + return (edit_stdin()); + curr_ifile = NULL_IFILE; + return (edit_next(1)); } /* * Edit the last file in the command line (ifile) list. */ - public int + public int edit_last(VOID_PARAM) { - curr_ifile = NULL_IFILE; - return (edit_prev(1)); + curr_ifile = NULL_IFILE; + return (edit_prev(1)); } /* * Edit the n-th next or previous file in the command line (ifile) list. */ - static int + static int edit_istep(h, n, dir) - IFILE h; - int n; - int dir; + IFILE h; + int n; + int dir; { - IFILE next; - - /* - * Skip n filenames, then try to edit each filename. - */ - for (;;) - { - next = (dir > 0) ? next_ifile(h) : prev_ifile(h); - if (--n < 0) - { - if (edit_ifile(h) == 0) - break; - } - if (next == NULL_IFILE) - { - /* - * Reached end of the ifile list. - */ - return (1); - } - if (ABORT_SIGS()) - { - /* - * Interrupt breaks out, if we're in a long - * list of files that can't be opened. - */ - return (1); - } - h = next; - } - /* - * Found a file that we can edit. - */ - return (0); + IFILE next; + + /* + * Skip n filenames, then try to edit each filename. + */ + for (;;) + { + next = (dir > 0) ? next_ifile(h) : prev_ifile(h); + if (--n < 0) + { + if (edit_ifile(h) == 0) + break; + } + if (next == NULL_IFILE) + { + /* + * Reached end of the ifile list. + */ + return (1); + } + if (ABORT_SIGS()) + { + /* + * Interrupt breaks out, if we're in a long + * list of files that can't be opened. + */ + return (1); + } + h = next; + } + /* + * Found a file that we can edit. + */ + return (0); } - static int + static int edit_inext(h, n) - IFILE h; - int n; + IFILE h; + int n; { - return (edit_istep(h, n, +1)); + return (edit_istep(h, n, +1)); } - public int + public int edit_next(n) - int n; + int n; { - return edit_istep(curr_ifile, n, +1); + return edit_istep(curr_ifile, n, +1); } - static int + static int edit_iprev(h, n) - IFILE h; - int n; + IFILE h; + int n; { - return (edit_istep(h, n, -1)); + return (edit_istep(h, n, -1)); } - public int + public int edit_prev(n) - int n; + int n; { - return edit_istep(curr_ifile, n, -1); + return edit_istep(curr_ifile, n, -1); } /* * Edit a specific file in the command line (ifile) list. */ - public int + public int edit_index(n) - int n; + int n; { - IFILE h; - - h = NULL_IFILE; - do - { - if ((h = next_ifile(h)) == NULL_IFILE) - { - /* - * Reached end of the list without finding it. - */ - return (1); - } - } while (get_index(h) != n); - - return (edit_ifile(h)); + IFILE h; + + h = NULL_IFILE; + do + { + if ((h = next_ifile(h)) == NULL_IFILE) + { + /* + * Reached end of the list without finding it. + */ + return (1); + } + } while (get_index(h) != n); + + return (edit_ifile(h)); } - public IFILE + public IFILE save_curr_ifile(VOID_PARAM) { - if (curr_ifile != NULL_IFILE) - hold_ifile(curr_ifile, 1); - return (curr_ifile); + if (curr_ifile != NULL_IFILE) + hold_ifile(curr_ifile, 1); + return (curr_ifile); } - public void + public void unsave_ifile(save_ifile) - IFILE save_ifile; + IFILE save_ifile; { - if (save_ifile != NULL_IFILE) - hold_ifile(save_ifile, -1); + if (save_ifile != NULL_IFILE) + hold_ifile(save_ifile, -1); } /* * Reedit the ifile which was previously open. */ - public void + public void reedit_ifile(save_ifile) - IFILE save_ifile; + IFILE save_ifile; { - IFILE next; - IFILE prev; - - /* - * Try to reopen the ifile. - * Note that opening it may fail (maybe the file was removed), - * in which case the ifile will be deleted from the list. - * So save the next and prev ifiles first. - */ - unsave_ifile(save_ifile); - next = next_ifile(save_ifile); - prev = prev_ifile(save_ifile); - if (edit_ifile(save_ifile) == 0) - return; - /* - * If can't reopen it, open the next input file in the list. - */ - if (next != NULL_IFILE && edit_inext(next, 0) == 0) - return; - /* - * If can't open THAT one, open the previous input file in the list. - */ - if (prev != NULL_IFILE && edit_iprev(prev, 0) == 0) - return; - /* - * If can't even open that, we're stuck. Just quit. - */ - quit(QUIT_ERROR); + IFILE next; + IFILE prev; + + /* + * Try to reopen the ifile. + * Note that opening it may fail (maybe the file was removed), + * in which case the ifile will be deleted from the list. + * So save the next and prev ifiles first. + */ + unsave_ifile(save_ifile); + next = next_ifile(save_ifile); + prev = prev_ifile(save_ifile); + if (edit_ifile(save_ifile) == 0) + return; + /* + * If can't reopen it, open the next input file in the list. + */ + if (next != NULL_IFILE && edit_inext(next, 0) == 0) + return; + /* + * If can't open THAT one, open the previous input file in the list. + */ + if (prev != NULL_IFILE && edit_iprev(prev, 0) == 0) + return; + /* + * If can't even open that, we're stuck. Just quit. + */ + quit(QUIT_ERROR); } - public void + public void reopen_curr_ifile(VOID_PARAM) { - IFILE save_ifile = save_curr_ifile(); - close_file(); - reedit_ifile(save_ifile); + IFILE save_ifile = save_curr_ifile(); + close_file(); + reedit_ifile(save_ifile); } /* * Edit standard input. */ - public int + public int edit_stdin(VOID_PARAM) { - if (isatty(fd0)) - { - error("Missing filename (\"less --help\" for help)", NULL_PARG); - quit(QUIT_OK); - } - return (edit("-")); + if (isatty(fd0)) + { + error("Missing filename (\"less --help\" for help)", NULL_PARG); + quit(QUIT_OK); + } + return (edit("-")); } /* * Copy a file directly to standard output. * Used if standard output is not a tty. */ - public void + public void cat_file(VOID_PARAM) { - int c; + int c; - while ((c = ch_forw_get()) != EOI) - putchr(c); - flush(); + while ((c = ch_forw_get()) != EOI) + putchr(c); + flush(); } #if LOGFILE @@ -777,94 +777,94 @@ cat_file(VOID_PARAM) /* * If the user asked for a log file and our input file - * is standard input, create the log file. + * is standard input, create the log file. * We take care not to blindly overwrite an existing file. */ - public void + public void use_logfile(filename) - char *filename; + char *filename; { - int exists; - int answer; - PARG parg; - - if (ch_getflags() & CH_CANSEEK) - /* - * Can't currently use a log file on a file that can seek. - */ - return; - - /* - * {{ We could use access() here. }} - */ - exists = open(filename, OPEN_READ); - if (exists >= 0) - close(exists); - exists = (exists >= 0); - - /* - * Decide whether to overwrite the log file or append to it. - * If it doesn't exist we "overwrite" it. - */ - if (!exists || force_logfile) - { - /* - * Overwrite (or create) the log file. - */ - answer = 'O'; - } else - { - /* - * Ask user what to do. - */ - parg.p_string = filename; - answer = query("Warning: \"%s\" exists; "OVERWRITE_OPTIONS" ", &parg); - } + int exists; + int answer; + PARG parg; + + if (ch_getflags() & CH_CANSEEK) + /* + * Can't currently use a log file on a file that can seek. + */ + return; + + /* + * {{ We could use access() here. }} + */ + exists = open(filename, OPEN_READ); + if (exists >= 0) + close(exists); + exists = (exists >= 0); + + /* + * Decide whether to overwrite the log file or append to it. + * If it doesn't exist we "overwrite" it. + */ + if (!exists || force_logfile) + { + /* + * Overwrite (or create) the log file. + */ + answer = 'O'; + } else + { + /* + * Ask user what to do. + */ + parg.p_string = filename; + answer = query("Warning: \"%s\" exists; "OVERWRITE_OPTIONS" ", &parg); + } loop: - switch (answer) - { - case 'O': case 'o': - /* - * Overwrite: create the file. - */ - logfile = creat(filename, 0644); - break; - case 'A': case 'a': - /* - * Append: open the file and seek to the end. - */ - logfile = open(filename, OPEN_APPEND); - if (lseek(logfile, (off_t)0, SEEK_END) == BAD_LSEEK) - { - close(logfile); - logfile = -1; - } - break; - case 'D': case 'd': - /* - * Don't do anything. - */ - return; - default: - /* - * Eh? - */ - - answer = query(OVERWRITE_OPTIONS" (Type \"O\", \"A\", \"D\" or \"Q\") ", NULL_PARG); - goto loop; - } - - if (logfile < 0) - { - /* - * Error in opening logfile. - */ - parg.p_string = filename; - error("Cannot write to \"%s\"", &parg); - return; - } - SET_BINARY(logfile); + switch (answer) + { + case 'O': case 'o': + /* + * Overwrite: create the file. + */ + logfile = creat(filename, 0644); + break; + case 'A': case 'a': + /* + * Append: open the file and seek to the end. + */ + logfile = open(filename, OPEN_APPEND); + if (lseek(logfile, (off_t)0, SEEK_END) == BAD_LSEEK) + { + close(logfile); + logfile = -1; + } + break; + case 'D': case 'd': + /* + * Don't do anything. + */ + return; + default: + /* + * Eh? + */ + + answer = query(OVERWRITE_OPTIONS" (Type \"O\", \"A\", \"D\" or \"Q\") ", NULL_PARG); + goto loop; + } + + if (logfile < 0) + { + /* + * Error in opening logfile. + */ + parg.p_string = filename; + error("Cannot write to \"%s\"", &parg); + return; + } + SET_BINARY(logfile); } #endif diff --git a/filename.c b/filename.c index 6d29753..9e890f2 100644 --- a/filename.c +++ b/filename.c @@ -58,240 +58,240 @@ extern char closequote; /* * Remove quotes around a filename. */ - public char * + public char * shell_unquote(str) - char *str; + char *str; { - char *name; - char *p; - - name = p = (char *) ecalloc(strlen(str)+1, sizeof(char)); - if (*str == openquote) - { - str++; - while (*str != '\0') - { - if (*str == closequote) - { - if (str[1] != closequote) - break; - str++; - } - *p++ = *str++; - } - } else - { - char *esc = get_meta_escape(); - int esclen = (int) strlen(esc); - while (*str != '\0') - { - if (esclen > 0 && strncmp(str, esc, esclen) == 0) - str += esclen; - *p++ = *str++; - } - } - *p = '\0'; - return (name); + char *name; + char *p; + + name = p = (char *) ecalloc(strlen(str)+1, sizeof(char)); + if (*str == openquote) + { + str++; + while (*str != '\0') + { + if (*str == closequote) + { + if (str[1] != closequote) + break; + str++; + } + *p++ = *str++; + } + } else + { + char *esc = get_meta_escape(); + int esclen = (int) strlen(esc); + while (*str != '\0') + { + if (esclen > 0 && strncmp(str, esc, esclen) == 0) + str += esclen; + *p++ = *str++; + } + } + *p = '\0'; + return (name); } /* * Get the shell's escape character. */ - public char * + public char * get_meta_escape(VOID_PARAM) { - char *s; + char *s; - s = lgetenv("LESSMETAESCAPE"); - if (s == NULL) - s = DEF_METAESCAPE; - return (s); + s = lgetenv("LESSMETAESCAPE"); + if (s == NULL) + s = DEF_METAESCAPE; + return (s); } /* * Get the characters which the shell considers to be "metacharacters". */ - static char * + static char * metachars(VOID_PARAM) { - static char *mchars = NULL; - - if (mchars == NULL) - { - mchars = lgetenv("LESSMETACHARS"); - if (mchars == NULL) - mchars = DEF_METACHARS; - } - return (mchars); + static char *mchars = NULL; + + if (mchars == NULL) + { + mchars = lgetenv("LESSMETACHARS"); + if (mchars == NULL) + mchars = DEF_METACHARS; + } + return (mchars); } /* * Is this a shell metacharacter? */ - static int + static int metachar(c) - char c; + char c; { - return (strchr(metachars(), c) != NULL); + return (strchr(metachars(), c) != NULL); } /* * Insert a backslash before each metacharacter in a string. */ - public char * + public char * shell_quote(s) - char *s; + char *s; { - char *p; - char *newstr; - int len; - char *esc = get_meta_escape(); - int esclen = (int) strlen(esc); - int use_quotes = 0; - int have_quotes = 0; - - /* - * Determine how big a string we need to allocate. - */ - len = 1; /* Trailing null byte */ - for (p = s; *p != '\0'; p++) - { - len++; - if (*p == openquote || *p == closequote) - have_quotes = 1; - if (metachar(*p)) - { - if (esclen == 0) - { - /* - * We've got a metachar, but this shell - * doesn't support escape chars. Use quotes. - */ - use_quotes = 1; - } else - { - /* - * Allow space for the escape char. - */ - len += esclen; - } - } - } - if (use_quotes) - { - if (have_quotes) - /* - * We can't quote a string that contains quotes. - */ - return (NULL); - len = (int) strlen(s) + 3; - } - /* - * Allocate and construct the new string. - */ - newstr = p = (char *) ecalloc(len, sizeof(char)); - if (use_quotes) - { - SNPRINTF3(newstr, len, "%c%s%c", openquote, s, closequote); - } else - { - while (*s != '\0') - { - if (metachar(*s)) - { - /* - * Add the escape char. - */ - strcpy(p, esc); - p += esclen; - } - *p++ = *s++; - } - *p = '\0'; - } - return (newstr); + char *p; + char *newstr; + int len; + char *esc = get_meta_escape(); + int esclen = (int) strlen(esc); + int use_quotes = 0; + int have_quotes = 0; + + /* + * Determine how big a string we need to allocate. + */ + len = 1; /* Trailing null byte */ + for (p = s; *p != '\0'; p++) + { + len++; + if (*p == openquote || *p == closequote) + have_quotes = 1; + if (metachar(*p)) + { + if (esclen == 0) + { + /* + * We've got a metachar, but this shell + * doesn't support escape chars. Use quotes. + */ + use_quotes = 1; + } else + { + /* + * Allow space for the escape char. + */ + len += esclen; + } + } + } + if (use_quotes) + { + if (have_quotes) + /* + * We can't quote a string that contains quotes. + */ + return (NULL); + len = (int) strlen(s) + 3; + } + /* + * Allocate and construct the new string. + */ + newstr = p = (char *) ecalloc(len, sizeof(char)); + if (use_quotes) + { + SNPRINTF3(newstr, len, "%c%s%c", openquote, s, closequote); + } else + { + while (*s != '\0') + { + if (metachar(*s)) + { + /* + * Add the escape char. + */ + strcpy(p, esc); + p += esclen; + } + *p++ = *s++; + } + *p = '\0'; + } + return (newstr); } /* * Return a pathname that points to a specified file in a specified directory. * Return NULL if the file does not exist in the directory. */ - public char * + public char * dirfile(dirname, filename, must_exist) - char *dirname; - char *filename; - int must_exist; + char *dirname; + char *filename; + int must_exist; { - char *pathname; - int len; - int f; - - if (dirname == NULL || *dirname == '\0') - return (NULL); - /* - * Construct the full pathname. - */ - len = (int) (strlen(dirname) + strlen(filename) + 2); - pathname = (char *) calloc(len, sizeof(char)); - if (pathname == NULL) - return (NULL); - SNPRINTF3(pathname, len, "%s%s%s", dirname, PATHNAME_SEP, filename); - if (must_exist) - { - /* - * Make sure the file exists. - */ - f = open(pathname, OPEN_READ); - if (f < 0) - { - free(pathname); - pathname = NULL; - } else - { - close(f); - } - } - return (pathname); + char *pathname; + int len; + int f; + + if (dirname == NULL || *dirname == '\0') + return (NULL); + /* + * Construct the full pathname. + */ + len = (int) (strlen(dirname) + strlen(filename) + 2); + pathname = (char *) calloc(len, sizeof(char)); + if (pathname == NULL) + return (NULL); + SNPRINTF3(pathname, len, "%s%s%s", dirname, PATHNAME_SEP, filename); + if (must_exist) + { + /* + * Make sure the file exists. + */ + f = open(pathname, OPEN_READ); + if (f < 0) + { + free(pathname); + pathname = NULL; + } else + { + close(f); + } + } + return (pathname); } /* * Return the full pathname of the given file in the "home directory". */ - public char * + public char * homefile(filename) - char *filename; + char *filename; { - char *pathname; + char *pathname; - /* Try $HOME/filename. */ - pathname = dirfile(lgetenv("HOME"), filename, 1); - if (pathname != NULL) - return (pathname); + /* Try $HOME/filename. */ + pathname = dirfile(lgetenv("HOME"), filename, 1); + if (pathname != NULL) + return (pathname); #if OS2 - /* Try $INIT/filename. */ - pathname = dirfile(lgetenv("INIT"), filename, 1); - if (pathname != NULL) - return (pathname); + /* Try $INIT/filename. */ + pathname = dirfile(lgetenv("INIT"), filename, 1); + if (pathname != NULL) + return (pathname); #endif #if MSDOS_COMPILER || OS2 - /* Look for the file anywhere on search path. */ - pathname = (char *) ecalloc(_MAX_PATH, sizeof(char)); + /* Look for the file anywhere on search path. */ + pathname = (char *) ecalloc(_MAX_PATH, sizeof(char)); #if MSDOS_COMPILER==DJGPPC - { - char *res = searchpath(filename); - if (res == 0) - *pathname = '\0'; - else - strcpy(pathname, res); - } + { + char *res = searchpath(filename); + if (res == 0) + *pathname = '\0'; + else + strcpy(pathname, res); + } #else - _searchenv(filename, "PATH", pathname); + _searchenv(filename, "PATH", pathname); #endif - if (*pathname != '\0') - return (pathname); - free(pathname); + if (*pathname != '\0') + return (pathname); + free(pathname); #endif - return (NULL); + return (NULL); } /* @@ -301,93 +301,93 @@ homefile(filename) * Likewise for a string of N "#"s. * {{ This is a lot of work just to support % and #. }} */ - public char * + public char * fexpand(s) - char *s; + char *s; { - char *fr, *to; - int n; - char *e; - IFILE ifile; + char *fr, *to; + int n; + char *e; + IFILE ifile; #define fchar_ifile(c) \ - ((c) == '%' ? curr_ifile : \ - (c) == '#' ? old_ifile : NULL_IFILE) - - /* - * Make one pass to see how big a buffer we - * need to allocate for the expanded string. - */ - n = 0; - for (fr = s; *fr != '\0'; fr++) - { - switch (*fr) - { - case '%': - case '#': - if (fr > s && fr[-1] == *fr) - { - /* - * Second (or later) char in a string - * of identical chars. Treat as normal. - */ - n++; - } else if (fr[1] != *fr) - { - /* - * Single char (not repeated). Treat specially. - */ - ifile = fchar_ifile(*fr); - if (ifile == NULL_IFILE) - n++; - else - n += (int) strlen(get_filename(ifile)); - } - /* - * Else it is the first char in a string of - * identical chars. Just discard it. - */ - break; - default: - n++; - break; - } - } - - e = (char *) ecalloc(n+1, sizeof(char)); - - /* - * Now copy the string, expanding any "%" or "#". - */ - to = e; - for (fr = s; *fr != '\0'; fr++) - { - switch (*fr) - { - case '%': - case '#': - if (fr > s && fr[-1] == *fr) - { - *to++ = *fr; - } else if (fr[1] != *fr) - { - ifile = fchar_ifile(*fr); - if (ifile == NULL_IFILE) - *to++ = *fr; - else - { - strcpy(to, get_filename(ifile)); - to += strlen(to); - } - } - break; - default: - *to++ = *fr; - break; - } - } - *to = '\0'; - return (e); + ((c) == '%' ? curr_ifile : \ + (c) == '#' ? old_ifile : NULL_IFILE) + + /* + * Make one pass to see how big a buffer we + * need to allocate for the expanded string. + */ + n = 0; + for (fr = s; *fr != '\0'; fr++) + { + switch (*fr) + { + case '%': + case '#': + if (fr > s && fr[-1] == *fr) + { + /* + * Second (or later) char in a string + * of identical chars. Treat as normal. + */ + n++; + } else if (fr[1] != *fr) + { + /* + * Single char (not repeated). Treat specially. + */ + ifile = fchar_ifile(*fr); + if (ifile == NULL_IFILE) + n++; + else + n += (int) strlen(get_filename(ifile)); + } + /* + * Else it is the first char in a string of + * identical chars. Just discard it. + */ + break; + default: + n++; + break; + } + } + + e = (char *) ecalloc(n+1, sizeof(char)); + + /* + * Now copy the string, expanding any "%" or "#". + */ + to = e; + for (fr = s; *fr != '\0'; fr++) + { + switch (*fr) + { + case '%': + case '#': + if (fr > s && fr[-1] == *fr) + { + *to++ = *fr; + } else if (fr[1] != *fr) + { + ifile = fchar_ifile(*fr); + if (ifile == NULL_IFILE) + *to++ = *fr; + else + { + strcpy(to, get_filename(ifile)); + to += strlen(to); + } + } + break; + default: + *to++ = *fr; + break; + } + } + *to = '\0'; + return (e); } @@ -397,59 +397,59 @@ fexpand(s) * Return a blank-separated list of filenames which "complete" * the given string. */ - public char * + public char * fcomplete(s) - char *s; + char *s; { - char *fpat; - char *qs; - - if (secure) - return (NULL); - /* - * Complete the filename "s" by globbing "s*". - */ + char *fpat; + char *qs; + + if (secure) + return (NULL); + /* + * Complete the filename "s" by globbing "s*". + */ #if MSDOS_COMPILER && (MSDOS_COMPILER == MSOFTC || MSDOS_COMPILER == BORLANDC) - /* - * But in DOS, we have to glob "s*.*". - * But if the final component of the filename already has - * a dot in it, just do "s*". - * (Thus, "FILE" is globbed as "FILE*.*", - * but "FILE.A" is globbed as "FILE.A*"). - */ - { - char *slash; - int len; - for (slash = s+strlen(s)-1; slash > s; slash--) - if (*slash == *PATHNAME_SEP || *slash == '/') - break; - len = (int) strlen(s) + 4; - fpat = (char *) ecalloc(len, sizeof(char)); - if (strchr(slash, '.') == NULL) - SNPRINTF1(fpat, len, "%s*.*", s); - else - SNPRINTF1(fpat, len, "%s*", s); - } + /* + * But in DOS, we have to glob "s*.*". + * But if the final component of the filename already has + * a dot in it, just do "s*". + * (Thus, "FILE" is globbed as "FILE*.*", + * but "FILE.A" is globbed as "FILE.A*"). + */ + { + char *slash; + int len; + for (slash = s+strlen(s)-1; slash > s; slash--) + if (*slash == *PATHNAME_SEP || *slash == '/') + break; + len = (int) strlen(s) + 4; + fpat = (char *) ecalloc(len, sizeof(char)); + if (strchr(slash, '.') == NULL) + SNPRINTF1(fpat, len, "%s*.*", s); + else + SNPRINTF1(fpat, len, "%s*", s); + } #else - { - int len = (int) strlen(s) + 2; - fpat = (char *) ecalloc(len, sizeof(char)); - SNPRINTF1(fpat, len, "%s*", s); - } + { + int len = (int) strlen(s) + 2; + fpat = (char *) ecalloc(len, sizeof(char)); + SNPRINTF1(fpat, len, "%s*", s); + } #endif - qs = lglob(fpat); - s = shell_unquote(qs); - if (strcmp(s,fpat) == 0) - { - /* - * The filename didn't expand. - */ - free(qs); - qs = NULL; - } - free(s); - free(fpat); - return (qs); + qs = lglob(fpat); + s = shell_unquote(qs); + if (strcmp(s,fpat) == 0) + { + /* + * The filename didn't expand. + */ + free(qs); + qs = NULL; + } + free(s); + free(fpat); + return (qs); } #endif @@ -457,62 +457,62 @@ fcomplete(s) * Try to determine if a file is "binary". * This is just a guess, and we need not try too hard to make it accurate. */ - public int + public int bin_file(f) - int f; + int f; { - int n; - int bin_count = 0; - char data[256]; - char* p; - char* edata; - - if (!seekable(f)) - return (0); - if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK) - return (0); - n = read(f, data, sizeof(data)); - if (n <= 0) - return (0); - edata = &data[n]; - for (p = data; p < edata; ) - { - if (utf_mode && !is_utf8_well_formed(p, edata-p)) - { - bin_count++; - utf_skip_to_lead(&p, edata); - } else - { - LWCHAR c = step_char(&p, +1, edata); - struct ansi_state *pansi; - if (ctldisp == OPT_ONPLUS && (pansi = ansi_start(c)) != NULL) - { - skip_ansi(pansi, &p, edata); - ansi_done(pansi); - } else if (binary_char(c)) - bin_count++; - } - } - /* - * Call it a binary file if there are more than 5 binary characters - * in the first 256 bytes of the file. - */ - return (bin_count > 5); + int n; + int bin_count = 0; + char data[256]; + char* p; + char* edata; + + if (!seekable(f)) + return (0); + if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK) + return (0); + n = read(f, data, sizeof(data)); + if (n <= 0) + return (0); + edata = &data[n]; + for (p = data; p < edata; ) + { + if (utf_mode && !is_utf8_well_formed(p, edata-p)) + { + bin_count++; + utf_skip_to_lead(&p, edata); + } else + { + LWCHAR c = step_char(&p, +1, edata); + struct ansi_state *pansi; + if (ctldisp == OPT_ONPLUS && (pansi = ansi_start(c)) != NULL) + { + skip_ansi(pansi, &p, edata); + ansi_done(pansi); + } else if (binary_char(c)) + bin_count++; + } + } + /* + * Call it a binary file if there are more than 5 binary characters + * in the first 256 bytes of the file. + */ + return (bin_count > 5); } /* * Try to determine the size of a file by seeking to the end. */ - static POSITION + static POSITION seek_filesize(f) - int f; + int f; { - off_t spos; + off_t spos; - spos = lseek(f, (off_t)0, SEEK_END); - if (spos == BAD_LSEEK) - return (NULL_POSITION); - return ((POSITION) spos); + spos = lseek(f, (off_t)0, SEEK_END); + if (spos == BAD_LSEEK) + return (NULL_POSITION); + return ((POSITION) spos); } #if HAVE_POPEN @@ -520,92 +520,92 @@ seek_filesize(f) * Read a string from a file. * Return a pointer to the string in memory. */ - static char * + static char * readfd(fd) - FILE *fd; + FILE *fd; { - int len; - int ch; - char *buf; - char *p; - - /* - * Make a guess about how many chars in the string - * and allocate a buffer to hold it. - */ - len = 100; - buf = (char *) ecalloc(len, sizeof(char)); - for (p = buf; ; p++) - { - if ((ch = getc(fd)) == '\n' || ch == EOF) - break; - if (p - buf >= len-1) - { - /* - * The string is too big to fit in the buffer we have. - * Allocate a new buffer, twice as big. - */ - len *= 2; - *p = '\0'; - p = (char *) ecalloc(len, sizeof(char)); - strcpy(p, buf); - free(buf); - buf = p; - p = buf + strlen(buf); - } - *p = ch; - } - *p = '\0'; - return (buf); + int len; + int ch; + char *buf; + char *p; + + /* + * Make a guess about how many chars in the string + * and allocate a buffer to hold it. + */ + len = 100; + buf = (char *) ecalloc(len, sizeof(char)); + for (p = buf; ; p++) + { + if ((ch = getc(fd)) == '\n' || ch == EOF) + break; + if (p - buf >= len-1) + { + /* + * The string is too big to fit in the buffer we have. + * Allocate a new buffer, twice as big. + */ + len *= 2; + *p = '\0'; + p = (char *) ecalloc(len, sizeof(char)); + strcpy(p, buf); + free(buf); + buf = p; + p = buf + strlen(buf); + } + *p = ch; + } + *p = '\0'; + return (buf); } /* * Execute a shell command. * Return a pointer to a pipe connected to the shell command's standard output. */ - static FILE * + static FILE * shellcmd(cmd) - char *cmd; + char *cmd; { - FILE *fd; + FILE *fd; #if HAVE_SHELL - char *shell; - - shell = lgetenv("SHELL"); - if (!isnullenv(shell)) - { - char *scmd; - char *esccmd; - - /* - * Read the output of <$SHELL -c cmd>. - * Escape any metacharacters in the command. - */ - esccmd = shell_quote(cmd); - if (esccmd == NULL) - { - fd = popen(cmd, "r"); - } else - { - int len = (int) (strlen(shell) + strlen(esccmd) + 5); - scmd = (char *) ecalloc(len, sizeof(char)); - SNPRINTF3(scmd, len, "%s %s %s", shell, shell_coption(), esccmd); - free(esccmd); - fd = popen(scmd, "r"); - free(scmd); - } - } else + char *shell; + + shell = lgetenv("SHELL"); + if (!isnullenv(shell)) + { + char *scmd; + char *esccmd; + + /* + * Read the output of <$SHELL -c cmd>. + * Escape any metacharacters in the command. + */ + esccmd = shell_quote(cmd); + if (esccmd == NULL) + { + fd = popen(cmd, "r"); + } else + { + int len = (int) (strlen(shell) + strlen(esccmd) + 5); + scmd = (char *) ecalloc(len, sizeof(char)); + SNPRINTF3(scmd, len, "%s %s %s", shell, shell_coption(), esccmd); + free(esccmd); + fd = popen(scmd, "r"); + free(scmd); + } + } else #endif - { - fd = popen(cmd, "r"); - } - /* - * Redirection in `popen' might have messed with the - * standard devices. Restore binary input mode. - */ - SET_BINARY(0); - return (fd); + { + fd = popen(cmd, "r"); + } + /* + * Redirection in `popen' might have messed with the + * standard devices. Restore binary input mode. + */ + SET_BINARY(0); + return (fd); } #endif /* HAVE_POPEN */ @@ -614,198 +614,198 @@ shellcmd(cmd) /* * Expand a filename, doing any system-specific metacharacter substitutions. */ - public char * + public char * lglob(filename) - char *filename; + char *filename; { - char *gfilename; + char *gfilename; - filename = fexpand(filename); - if (secure) - return (filename); + filename = fexpand(filename); + if (secure) + return (filename); #ifdef DECL_GLOB_LIST { - /* - * The globbing function returns a list of names. - */ - int length; - char *p; - char *qfilename; - DECL_GLOB_LIST(list) - - GLOB_LIST(filename, list); - if (GLOB_LIST_FAILED(list)) - { - return (filename); - } - length = 1; /* Room for trailing null byte */ - for (SCAN_GLOB_LIST(list, p)) - { - INIT_GLOB_LIST(list, p); - qfilename = shell_quote(p); - if (qfilename != NULL) - { - length += strlen(qfilename) + 1; - free(qfilename); - } - } - gfilename = (char *) ecalloc(length, sizeof(char)); - for (SCAN_GLOB_LIST(list, p)) - { - INIT_GLOB_LIST(list, p); - qfilename = shell_quote(p); - if (qfilename != NULL) - { - sprintf(gfilename + strlen(gfilename), "%s ", qfilename); - free(qfilename); - } - } - /* - * Overwrite the final trailing space with a null terminator. - */ - *--p = '\0'; - GLOB_LIST_DONE(list); + /* + * The globbing function returns a list of names. + */ + int length; + char *p; + char *qfilename; + DECL_GLOB_LIST(list) + + GLOB_LIST(filename, list); + if (GLOB_LIST_FAILED(list)) + { + return (filename); + } + length = 1; /* Room for trailing null byte */ + for (SCAN_GLOB_LIST(list, p)) + { + INIT_GLOB_LIST(list, p); + qfilename = shell_quote(p); + if (qfilename != NULL) + { + length += strlen(qfilename) + 1; + free(qfilename); + } + } + gfilename = (char *) ecalloc(length, sizeof(char)); + for (SCAN_GLOB_LIST(list, p)) + { + INIT_GLOB_LIST(list, p); + qfilename = shell_quote(p); + if (qfilename != NULL) + { + sprintf(gfilename + strlen(gfilename), "%s ", qfilename); + free(qfilename); + } + } + /* + * Overwrite the final trailing space with a null terminator. + */ + *--p = '\0'; + GLOB_LIST_DONE(list); } #else #ifdef DECL_GLOB_NAME { - /* - * The globbing function returns a single name, and - * is called multiple times to walk thru all names. - */ - char *p; - int len; - int n; - char *pfilename; - char *qfilename; - DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle) - - GLOB_FIRST_NAME(filename, &fnd, handle); - if (GLOB_FIRST_FAILED(handle)) - { - return (filename); - } - - _splitpath(filename, drive, dir, fname, ext); - len = 100; - gfilename = (char *) ecalloc(len, sizeof(char)); - p = gfilename; - do { - n = (int) (strlen(drive) + strlen(dir) + strlen(fnd.GLOB_NAME) + 1); - pfilename = (char *) ecalloc(n, sizeof(char)); - SNPRINTF3(pfilename, n, "%s%s%s", drive, dir, fnd.GLOB_NAME); - qfilename = shell_quote(pfilename); - free(pfilename); - if (qfilename != NULL) - { - n = (int) strlen(qfilename); - while (p - gfilename + n + 2 >= len) - { - /* - * No room in current buffer. - * Allocate a bigger one. - */ - len *= 2; - *p = '\0'; - p = (char *) ecalloc(len, sizeof(char)); - strcpy(p, gfilename); - free(gfilename); - gfilename = p; - p = gfilename + strlen(gfilename); - } - strcpy(p, qfilename); - free(qfilename); - p += n; - *p++ = ' '; - } - } while (GLOB_NEXT_NAME(handle, &fnd) == 0); - - /* - * Overwrite the final trailing space with a null terminator. - */ - *--p = '\0'; - GLOB_NAME_DONE(handle); + /* + * The globbing function returns a single name, and + * is called multiple times to walk thru all names. + */ + char *p; + int len; + int n; + char *pfilename; + char *qfilename; + DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle) + + GLOB_FIRST_NAME(filename, &fnd, handle); + if (GLOB_FIRST_FAILED(handle)) + { + return (filename); + } + + _splitpath(filename, drive, dir, fname, ext); + len = 100; + gfilename = (char *) ecalloc(len, sizeof(char)); + p = gfilename; + do { + n = (int) (strlen(drive) + strlen(dir) + strlen(fnd.GLOB_NAME) + 1); + pfilename = (char *) ecalloc(n, sizeof(char)); + SNPRINTF3(pfilename, n, "%s%s%s", drive, dir, fnd.GLOB_NAME); + qfilename = shell_quote(pfilename); + free(pfilename); + if (qfilename != NULL) + { + n = (int) strlen(qfilename); + while (p - gfilename + n + 2 >= len) + { + /* + * No room in current buffer. + * Allocate a bigger one. + */ + len *= 2; + *p = '\0'; + p = (char *) ecalloc(len, sizeof(char)); + strcpy(p, gfilename); + free(gfilename); + gfilename = p; + p = gfilename + strlen(gfilename); + } + strcpy(p, qfilename); + free(qfilename); + p += n; + *p++ = ' '; + } + } while (GLOB_NEXT_NAME(handle, &fnd) == 0); + + /* + * Overwrite the final trailing space with a null terminator. + */ + *--p = '\0'; + GLOB_NAME_DONE(handle); } #else #if HAVE_POPEN { - /* - * We get the shell to glob the filename for us by passing - * an "echo" command to the shell and reading its output. - */ - FILE *fd; - char *s; - char *lessecho; - char *cmd; - char *esc; - int len; - - esc = get_meta_escape(); - if (strlen(esc) == 0) - esc = "-"; - esc = shell_quote(esc); - if (esc == NULL) - { - return (filename); - } - lessecho = lgetenv("LESSECHO"); - if (isnullenv(lessecho)) - lessecho = "lessecho"; - /* - * Invoke lessecho, and read its output (a globbed list of filenames). - */ - len = (int) (strlen(lessecho) + strlen(filename) + (7*strlen(metachars())) + 24); - cmd = (char *) ecalloc(len, sizeof(char)); - SNPRINTF4(cmd, len, "%s -p0x%x -d0x%x -e%s ", lessecho, - (unsigned char) openquote, (unsigned char) closequote, esc); - free(esc); - for (s = metachars(); *s != '\0'; s++) - sprintf(cmd + strlen(cmd), "-n0x%x ", (unsigned char) *s); - sprintf(cmd + strlen(cmd), "-- %s", filename); - fd = shellcmd(cmd); - free(cmd); - if (fd == NULL) - { - /* - * Cannot create the pipe. - * Just return the original (fexpanded) filename. - */ - return (filename); - } - gfilename = readfd(fd); - pclose(fd); - if (*gfilename == '\0') - { - free(gfilename); - return (filename); - } + /* + * We get the shell to glob the filename for us by passing + * an "echo" command to the shell and reading its output. + */ + FILE *fd; + char *s; + char *lessecho; + char *cmd; + char *esc; + int len; + + esc = get_meta_escape(); + if (strlen(esc) == 0) + esc = "-"; + esc = shell_quote(esc); + if (esc == NULL) + { + return (filename); + } + lessecho = lgetenv("LESSECHO"); + if (isnullenv(lessecho)) + lessecho = "lessecho"; + /* + * Invoke lessecho, and read its output (a globbed list of filenames). + */ + len = (int) (strlen(lessecho) + strlen(filename) + (7*strlen(metachars())) + 24); + cmd = (char *) ecalloc(len, sizeof(char)); + SNPRINTF4(cmd, len, "%s -p0x%x -d0x%x -e%s ", lessecho, + (unsigned char) openquote, (unsigned char) closequote, esc); + free(esc); + for (s = metachars(); *s != '\0'; s++) + sprintf(cmd + strlen(cmd), "-n0x%x ", (unsigned char) *s); + sprintf(cmd + strlen(cmd), "-- %s", filename); + fd = shellcmd(cmd); + free(cmd); + if (fd == NULL) + { + /* + * Cannot create the pipe. + * Just return the original (fexpanded) filename. + */ + return (filename); + } + gfilename = readfd(fd); + pclose(fd); + if (*gfilename == '\0') + { + free(gfilename); + return (filename); + } } #else - /* - * No globbing functions at all. Just use the fexpanded filename. - */ - gfilename = save(filename); + /* + * No globbing functions at all. Just use the fexpanded filename. + */ + gfilename = save(filename); #endif #endif #endif - free(filename); - return (gfilename); + free(filename); + return (gfilename); } /* * Return canonical pathname. */ - public char * + public char * lrealpath(path) - char *path; + char *path; { #if HAVE_REALPATH - char rpath[PATH_MAX]; - if (realpath(path, rpath) != NULL) - return (save(rpath)); + char rpath[PATH_MAX]; + if (realpath(path, rpath) != NULL) + return (save(rpath)); #endif - return (save(path)); + return (save(path)); } #if HAVE_POPEN @@ -813,225 +813,225 @@ lrealpath(path) * Return number of %s escapes in a string. * Return a large number if there are any other % escapes besides %s. */ - static int + static int num_pct_s(lessopen) - char *lessopen; + char *lessopen; { - int num = 0; - - while (*lessopen != '\0') - { - if (*lessopen == '%') - { - if (lessopen[1] == '%') - ++lessopen; - else if (lessopen[1] == 's') - ++num; - else - return (999); - } - ++lessopen; - } - return (num); + int num = 0; + + while (*lessopen != '\0') + { + if (*lessopen == '%') + { + if (lessopen[1] == '%') + ++lessopen; + else if (lessopen[1] == 's') + ++num; + else + return (999); + } + ++lessopen; + } + return (num); } #endif /* - * See if we should open a "replacement file" + * See if we should open a "replacement file" * instead of the file we're about to open. */ - public char * + public char * open_altfile(filename, pf, pfd) - char *filename; - int *pf; - void **pfd; + char *filename; + int *pf; + void **pfd; { #if !HAVE_POPEN - return (NULL); + return (NULL); #else - char *lessopen; - char *qfilename; - char *cmd; - int len; - FILE *fd; + char *lessopen; + char *qfilename; + char *cmd; + int len; + FILE *fd; #if HAVE_FILENO - int returnfd = 0; + int returnfd = 0; #endif - - if (!use_lessopen || secure) - return (NULL); - ch_ungetchar(-1); - if ((lessopen = lgetenv("LESSOPEN")) == NULL) - return (NULL); - while (*lessopen == '|') - { - /* - * If LESSOPEN starts with a |, it indicates - * a "pipe preprocessor". - */ + + if (!use_lessopen || secure) + return (NULL); + ch_ungetchar(-1); + if ((lessopen = lgetenv("LESSOPEN")) == NULL) + return (NULL); + while (*lessopen == '|') + { + /* + * If LESSOPEN starts with a |, it indicates + * a "pipe preprocessor". + */ #if !HAVE_FILENO - error("LESSOPEN pipe is not supported", NULL_PARG); - return (NULL); + error("LESSOPEN pipe is not supported", NULL_PARG); + return (NULL); #else - lessopen++; - returnfd++; + lessopen++; + returnfd++; #endif - } - if (*lessopen == '-') - { - /* - * Lessopen preprocessor will accept "-" as a filename. - */ - lessopen++; - } else - { - if (strcmp(filename, "-") == 0) - return (NULL); - } - if (num_pct_s(lessopen) != 1) - { - error("LESSOPEN ignored: must contain exactly one %%s", NULL_PARG); - return (NULL); - } - - qfilename = shell_quote(filename); - len = (int) (strlen(lessopen) + strlen(qfilename) + 2); - cmd = (char *) ecalloc(len, sizeof(char)); - SNPRINTF1(cmd, len, lessopen, qfilename); - free(qfilename); - fd = shellcmd(cmd); - free(cmd); - if (fd == NULL) - { - /* - * Cannot create the pipe. - */ - return (NULL); - } + } + if (*lessopen == '-') + { + /* + * Lessopen preprocessor will accept "-" as a filename. + */ + lessopen++; + } else + { + if (strcmp(filename, "-") == 0) + return (NULL); + } + if (num_pct_s(lessopen) != 1) + { + error("LESSOPEN ignored: must contain exactly one %%s", NULL_PARG); + return (NULL); + } + + qfilename = shell_quote(filename); + len = (int) (strlen(lessopen) + strlen(qfilename) + 2); + cmd = (char *) ecalloc(len, sizeof(char)); + SNPRINTF1(cmd, len, lessopen, qfilename); + free(qfilename); + fd = shellcmd(cmd); + free(cmd); + if (fd == NULL) + { + /* + * Cannot create the pipe. + */ + return (NULL); + } #if HAVE_FILENO - if (returnfd) - { - char c; - int f; - - /* - * The alt file is a pipe. Read one char - * to see if the pipe will produce any data. - * If it does, push the char back on the pipe. - */ - f = fileno(fd); - SET_BINARY(f); - if (read(f, &c, 1) != 1) - { - /* - * Pipe is empty. - * If more than 1 pipe char was specified, - * the exit status tells whether the file itself - * is empty, or if there is no alt file. - * If only one pipe char, just assume no alt file. - */ - int status = pclose(fd); - if (returnfd > 1 && status == 0) { - /* File is empty. */ - *pfd = NULL; - *pf = -1; - return (save(FAKE_EMPTYFILE)); - } - /* No alt file. */ - return (NULL); - } - /* Alt pipe contains data, so use it. */ - ch_ungetchar(c); - *pfd = (void *) fd; - *pf = f; - return (save("-")); - } + if (returnfd) + { + char c; + int f; + + /* + * The alt file is a pipe. Read one char + * to see if the pipe will produce any data. + * If it does, push the char back on the pipe. + */ + f = fileno(fd); + SET_BINARY(f); + if (read(f, &c, 1) != 1) + { + /* + * Pipe is empty. + * If more than 1 pipe char was specified, + * the exit status tells whether the file itself + * is empty, or if there is no alt file. + * If only one pipe char, just assume no alt file. + */ + int status = pclose(fd); + if (returnfd > 1 && status == 0) { + /* File is empty. */ + *pfd = NULL; + *pf = -1; + return (save(FAKE_EMPTYFILE)); + } + /* No alt file. */ + return (NULL); + } + /* Alt pipe contains data, so use it. */ + ch_ungetchar(c); + *pfd = (void *) fd; + *pf = f; + return (save("-")); + } #endif - /* The alt file is a regular file. Read its name from LESSOPEN. */ - cmd = readfd(fd); - pclose(fd); - if (*cmd == '\0') - { - /* - * Pipe is empty. This means there is no alt file. - */ - free(cmd); - return (NULL); - } - return (cmd); + /* The alt file is a regular file. Read its name from LESSOPEN. */ + cmd = readfd(fd); + pclose(fd); + if (*cmd == '\0') + { + /* + * Pipe is empty. This means there is no alt file. + */ + free(cmd); + return (NULL); + } + return (cmd); #endif /* HAVE_POPEN */ } /* * Close a replacement file. */ - public void + public void close_altfile(altfilename, filename) - char *altfilename; - char *filename; + char *altfilename; + char *filename; { #if HAVE_POPEN - char *lessclose; - char *qfilename; - char *qaltfilename; - FILE *fd; - char *cmd; - int len; - - if (secure) - return; - ch_ungetchar(-1); - if ((lessclose = lgetenv("LESSCLOSE")) == NULL) - return; - if (num_pct_s(lessclose) > 2) - { - error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG); - return; - } - qfilename = shell_quote(filename); - qaltfilename = shell_quote(altfilename); - len = (int) (strlen(lessclose) + strlen(qfilename) + strlen(qaltfilename) + 2); - cmd = (char *) ecalloc(len, sizeof(char)); - SNPRINTF2(cmd, len, lessclose, qfilename, qaltfilename); - free(qaltfilename); - free(qfilename); - fd = shellcmd(cmd); - free(cmd); - if (fd != NULL) - pclose(fd); + char *lessclose; + char *qfilename; + char *qaltfilename; + FILE *fd; + char *cmd; + int len; + + if (secure) + return; + ch_ungetchar(-1); + if ((lessclose = lgetenv("LESSCLOSE")) == NULL) + return; + if (num_pct_s(lessclose) > 2) + { + error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG); + return; + } + qfilename = shell_quote(filename); + qaltfilename = shell_quote(altfilename); + len = (int) (strlen(lessclose) + strlen(qfilename) + strlen(qaltfilename) + 2); + cmd = (char *) ecalloc(len, sizeof(char)); + SNPRINTF2(cmd, len, lessclose, qfilename, qaltfilename); + free(qaltfilename); + free(qfilename); + fd = shellcmd(cmd); + free(cmd); + if (fd != NULL) + pclose(fd); #endif } - + /* * Is the specified file a directory? */ - public int + public int is_dir(filename) - char *filename; + char *filename; { - int isdir = 0; + int isdir = 0; #if HAVE_STAT { - int r; - struct stat statbuf; + int r; + struct stat statbuf; - r = stat(filename, &statbuf); - isdir = (r >= 0 && S_ISDIR(statbuf.st_mode)); + r = stat(filename, &statbuf); + isdir = (r >= 0 && S_ISDIR(statbuf.st_mode)); } #else #ifdef _OSK { - int f; + int f; - f = open(filename, S_IREAD | S_IFDIR); - if (f >= 0) - close(f); - isdir = (f >= 0); + f = open(filename, S_IREAD | S_IFDIR); + if (f >= 0) + close(f); + isdir = (f >= 0); } #endif #endif - return (isdir); + return (isdir); } /* @@ -1039,93 +1039,93 @@ is_dir(filename) * is an ordinary file, otherwise an error message * (if it cannot be opened or is a directory, etc.) */ - public char * + public char * bad_file(filename) - char *filename; + char *filename; { - char *m = NULL; - - if (!force_open && is_dir(filename)) - { - static char is_a_dir[] = " is a directory"; - - m = (char *) ecalloc(strlen(filename) + sizeof(is_a_dir), - sizeof(char)); - strcpy(m, filename); - strcat(m, is_a_dir); - } else - { + char *m = NULL; + + if (!force_open && is_dir(filename)) + { + static char is_a_dir[] = " is a directory"; + + m = (char *) ecalloc(strlen(filename) + sizeof(is_a_dir), + sizeof(char)); + strcpy(m, filename); + strcat(m, is_a_dir); + } else + { #if HAVE_STAT - int r; - struct stat statbuf; - - r = stat(filename, &statbuf); - if (r < 0) - { - m = errno_message(filename); - } else if (force_open) - { - m = NULL; - } else if (!S_ISREG(statbuf.st_mode)) - { - static char not_reg[] = " is not a regular file (use -f to see it)"; - m = (char *) ecalloc(strlen(filename) + sizeof(not_reg), - sizeof(char)); - strcpy(m, filename); - strcat(m, not_reg); - } + int r; + struct stat statbuf; + + r = stat(filename, &statbuf); + if (r < 0) + { + m = errno_message(filename); + } else if (force_open) + { + m = NULL; + } else if (!S_ISREG(statbuf.st_mode)) + { + static char not_reg[] = " is not a regular file (use -f to see it)"; + m = (char *) ecalloc(strlen(filename) + sizeof(not_reg), + sizeof(char)); + strcpy(m, filename); + strcat(m, not_reg); + } #endif - } - return (m); + } + return (m); } /* * Return the size of a file, as cheaply as possible. * In Unix, we can stat the file. */ - public POSITION + public POSITION filesize(f) - int f; + int f; { #if HAVE_STAT - struct stat statbuf; + struct stat statbuf; - if (fstat(f, &statbuf) >= 0) - return ((POSITION) statbuf.st_size); + if (fstat(f, &statbuf) >= 0) + return ((POSITION) statbuf.st_size); #else #ifdef _OSK - long size; + long size; - if ((size = (long) _gs_size(f)) >= 0) - return ((POSITION) size); + if ((size = (long) _gs_size(f)) >= 0) + return ((POSITION) size); #endif #endif - return (seek_filesize(f)); + return (seek_filesize(f)); } /* - * + * */ - public char * + public char * shell_coption(VOID_PARAM) { - return ("-c"); + return ("-c"); } /* * Return last component of a pathname. */ - public char * + public char * last_component(name) - char *name; + char *name; { - char *slash; - - for (slash = name + strlen(name); slash > name; ) - { - --slash; - if (*slash == *PATHNAME_SEP || *slash == '/') - return (slash + 1); - } - return (name); + char *slash; + + for (slash = name + strlen(name); slash > name; ) + { + --slash; + if (*slash == *PATHNAME_SEP || *slash == '/') + return (slash + 1); + } + return (name); } diff --git a/fmt.uni b/fmt.uni index c482294..bb36fb0 100644 --- a/fmt.uni +++ b/fmt.uni @@ -1,22 +1,22 @@ /* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Tue Jul 19 12:45:17 PDT 2022 */ - { 0x00ad, 0x00ad }, /* Cf */ - { 0x0600, 0x0605 }, /* Cf */ - { 0x061c, 0x061c }, /* Cf */ - { 0x06dd, 0x06dd }, /* Cf */ - { 0x070f, 0x070f }, /* Cf */ - { 0x0890, 0x0891 }, /* Cf */ - { 0x08e2, 0x08e2 }, /* Cf */ - { 0x180e, 0x180e }, /* Cf */ - { 0x200b, 0x200f }, /* Cf */ - { 0x202a, 0x202e }, /* Cf */ - { 0x2060, 0x2064 }, /* Cf */ - { 0x2066, 0x206f }, /* Cf */ - { 0xfeff, 0xfeff }, /* Cf */ - { 0xfff9, 0xfffb }, /* Cf */ - { 0x110bd, 0x110bd }, /* Cf */ - { 0x110cd, 0x110cd }, /* Cf */ - { 0x13430, 0x13438 }, /* Cf */ - { 0x1bca0, 0x1bca3 }, /* Cf */ - { 0x1d173, 0x1d17a }, /* Cf */ - { 0xe0001, 0xe0001 }, /* Cf */ - { 0xe0020, 0xe007f }, /* Cf */ + { 0x00ad, 0x00ad }, /* Cf */ + { 0x0600, 0x0605 }, /* Cf */ + { 0x061c, 0x061c }, /* Cf */ + { 0x06dd, 0x06dd }, /* Cf */ + { 0x070f, 0x070f }, /* Cf */ + { 0x0890, 0x0891 }, /* Cf */ + { 0x08e2, 0x08e2 }, /* Cf */ + { 0x180e, 0x180e }, /* Cf */ + { 0x200b, 0x200f }, /* Cf */ + { 0x202a, 0x202e }, /* Cf */ + { 0x2060, 0x2064 }, /* Cf */ + { 0x2066, 0x206f }, /* Cf */ + { 0xfeff, 0xfeff }, /* Cf */ + { 0xfff9, 0xfffb }, /* Cf */ + { 0x110bd, 0x110bd }, /* Cf */ + { 0x110cd, 0x110cd }, /* Cf */ + { 0x13430, 0x13438 }, /* Cf */ + { 0x1bca0, 0x1bca3 }, /* Cf */ + { 0x1d173, 0x1d17a }, /* Cf */ + { 0xe0001, 0xe0001 }, /* Cf */ + { 0xe0020, 0xe007f }, /* Cf */ diff --git a/forwback.c b/forwback.c index 6f0b118..fd70ddc 100644 --- a/forwback.c +++ b/forwback.c @@ -48,64 +48,64 @@ extern char *tagoption; /* * Sound the bell to indicate user is trying to move past end of file. */ - static void + static void eof_bell(VOID_PARAM) { #if HAVE_TIME - static time_type last_eof_bell = 0; - time_type now = get_time(); - if (now == last_eof_bell) /* max once per second */ - return; - last_eof_bell = now; + static time_type last_eof_bell = 0; + time_type now = get_time(); + if (now == last_eof_bell) /* max once per second */ + return; + last_eof_bell = now; #endif - if (quiet == NOT_QUIET) - bell(); - else - vbell(); + if (quiet == NOT_QUIET) + bell(); + else + vbell(); } /* * Check to see if the end of file is currently displayed. */ - public int + public int eof_displayed(VOID_PARAM) { - POSITION pos; - - if (ignore_eoi) - return (0); - - if (ch_length() == NULL_POSITION) - /* - * If the file length is not known, - * we can't possibly be displaying EOF. - */ - return (0); - - /* - * If the bottom line is empty, we are at EOF. - * If the bottom line ends at the file length, - * we must be just at EOF. - */ - pos = position(BOTTOM_PLUS_ONE); - return (pos == NULL_POSITION || pos == ch_length()); + POSITION pos; + + if (ignore_eoi) + return (0); + + if (ch_length() == NULL_POSITION) + /* + * If the file length is not known, + * we can't possibly be displaying EOF. + */ + return (0); + + /* + * If the bottom line is empty, we are at EOF. + * If the bottom line ends at the file length, + * we must be just at EOF. + */ + pos = position(BOTTOM_PLUS_ONE); + return (pos == NULL_POSITION || pos == ch_length()); } /* * Check to see if the entire file is currently displayed. */ - public int + public int entire_file_displayed(VOID_PARAM) { - POSITION pos; + POSITION pos; - /* Make sure last line of file is displayed. */ - if (!eof_displayed()) - return (0); + /* Make sure last line of file is displayed. */ + if (!eof_displayed()) + return (0); - /* Make sure first line of file is displayed. */ - pos = position(0); - return (pos == NULL_POSITION || pos == 0); + /* Make sure first line of file is displayed. */ + pos = position(0); + return (pos == NULL_POSITION || pos == 0); } /* @@ -114,37 +114,37 @@ entire_file_displayed(VOID_PARAM) * of the screen; this can happen when we display a short file * for the first time. */ - public void + public void squish_check(VOID_PARAM) { - if (!squished) - return; - squished = 0; - repaint(); + if (!squished) + return; + squished = 0; + repaint(); } /* * Read the first pfx columns of the next line. * If skipeol==0 stop there, otherwise read and discard chars to end of line. */ - static POSITION + static POSITION forw_line_pfx(pos, pfx, skipeol) - POSITION pos; - int pfx; - int skipeol; + POSITION pos; + int pfx; + int skipeol; { - int save_sc_width = sc_width; - int save_auto_wrap = auto_wrap; - int save_hshift = hshift; - /* Set fake sc_width to force only pfx chars to be read. */ - sc_width = pfx + line_pfx_width(); - auto_wrap = 0; - hshift = 0; - pos = forw_line_seg(pos, skipeol, FALSE, FALSE); - sc_width = save_sc_width; - auto_wrap = save_auto_wrap; - hshift = save_hshift; - return pos; + int save_sc_width = sc_width; + int save_auto_wrap = auto_wrap; + int save_hshift = hshift; + /* Set fake sc_width to force only pfx chars to be read. */ + sc_width = pfx + line_pfx_width(); + auto_wrap = 0; + hshift = 0; + pos = forw_line_seg(pos, skipeol, FALSE, FALSE); + sc_width = save_sc_width; + auto_wrap = save_auto_wrap; + hshift = save_hshift; + return pos; } /* @@ -152,67 +152,67 @@ forw_line_pfx(pos, pfx, skipeol) * Underline last line of headers, but not at beginning of file * (where there is no gap between the last header line and the next line). */ - static void + static void set_attr_header(ln) - int ln; + int ln; { - set_attr_line(AT_COLOR_HEADER); - if (ln+1 == header_lines && position(0) != ch_zero()) - set_attr_line(AT_UNDERLINE); + set_attr_line(AT_COLOR_HEADER); + if (ln+1 == header_lines && position(0) != ch_zero()) + set_attr_line(AT_UNDERLINE); } /* * Display file headers, overlaying text already drawn * at top and left of screen. */ - public int + public int overlay_header(VOID_PARAM) { - POSITION pos = ch_zero(); /* header lines are at beginning of file */ - int ln; - int moved = FALSE; - - if (header_lines > 0) - { - /* Draw header_lines lines from start of file at top of screen. */ - home(); - for (ln = 0; ln < header_lines; ++ln) - { - pos = forw_line(pos); - set_attr_header(ln); - clear_eol(); - put_line(); - } - moved = TRUE; - } - if (header_cols > 0) - { - /* Draw header_cols columns at left of each line. */ - home(); - pos = ch_zero(); - for (ln = 0; ln < sc_height-1; ++ln) - { - if (ln >= header_lines) /* switch from header lines to normal lines */ - pos = position(ln); - if (pos == NULL_POSITION) - putchr('\n'); - else - { - /* Need skipeol for all header lines except the last one. */ - pos = forw_line_pfx(pos, header_cols, ln+1 < header_lines); - set_attr_header(ln); - put_line(); - } - } - moved = TRUE; - } - if (moved) - lower_left(); - return moved; + POSITION pos = ch_zero(); /* header lines are at beginning of file */ + int ln; + int moved = FALSE; + + if (header_lines > 0) + { + /* Draw header_lines lines from start of file at top of screen. */ + home(); + for (ln = 0; ln < header_lines; ++ln) + { + pos = forw_line(pos); + set_attr_header(ln); + clear_eol(); + put_line(); + } + moved = TRUE; + } + if (header_cols > 0) + { + /* Draw header_cols columns at left of each line. */ + home(); + pos = ch_zero(); + for (ln = 0; ln < sc_height-1; ++ln) + { + if (ln >= header_lines) /* switch from header lines to normal lines */ + pos = position(ln); + if (pos == NULL_POSITION) + putchr('\n'); + else + { + /* Need skipeol for all header lines except the last one. */ + pos = forw_line_pfx(pos, header_cols, ln+1 < header_lines); + set_attr_header(ln); + put_line(); + } + } + moved = TRUE; + } + if (moved) + lower_left(); + return moved; } /* - * Display n lines, scrolling forward, + * Display n lines, scrolling forward, * starting at position pos in the input file. * "force" means display the n lines even if we hit end of file. * "only_last" means display only the last screenful if n > screen size. @@ -220,327 +220,327 @@ overlay_header(VOID_PARAM) * real line. If nblank > 0, the pos must be NULL_POSITION. * The first real line after the blanks will start at ch_zero(). */ - public void + public void forw(n, pos, force, only_last, nblank) - int n; - POSITION pos; - int force; - int only_last; - int nblank; + int n; + POSITION pos; + int force; + int only_last; + int nblank; { - int nlines = 0; - int do_repaint; - - squish_check(); - - /* - * do_repaint tells us not to display anything till the end, - * then just repaint the entire screen. - * We repaint if we are supposed to display only the last - * screenful and the request is for more than a screenful. - * Also if the request exceeds the forward scroll limit - * (but not if the request is for exactly a screenful, since - * repainting itself involves scrolling forward a screenful). - */ - do_repaint = (only_last && n > sc_height-1) || - (forw_scroll >= 0 && n > forw_scroll && n != sc_height-1); + int nlines = 0; + int do_repaint; + + squish_check(); + + /* + * do_repaint tells us not to display anything till the end, + * then just repaint the entire screen. + * We repaint if we are supposed to display only the last + * screenful and the request is for more than a screenful. + * Also if the request exceeds the forward scroll limit + * (but not if the request is for exactly a screenful, since + * repainting itself involves scrolling forward a screenful). + */ + do_repaint = (only_last && n > sc_height-1) || + (forw_scroll >= 0 && n > forw_scroll && n != sc_height-1); #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) { - prep_hilite(pos, pos + 4*size_linebuf, ignore_eoi ? 1 : -1); - pos = next_unfiltered(pos); - } + if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) { + prep_hilite(pos, pos + 4*size_linebuf, ignore_eoi ? 1 : -1); + pos = next_unfiltered(pos); + } #endif - if (!do_repaint) - { - if (top_scroll && n >= sc_height - 1 && pos != ch_length()) - { - /* - * Start a new screen. - * {{ This is not really desirable if we happen - * to hit eof in the middle of this screen, - * but we don't yet know if that will happen. }} - */ - pos_clear(); - add_forw_pos(pos); - force = 1; - clear(); - home(); - } - - if (pos != position(BOTTOM_PLUS_ONE) || empty_screen()) - { - /* - * This is not contiguous with what is - * currently displayed. Clear the screen image - * (position table) and start a new screen. - */ - pos_clear(); - add_forw_pos(pos); - force = 1; - if (top_scroll) - { - clear(); - home(); - } else if (!first_time && !is_filtering()) - { - putstr("...skipping...\n"); - } - } - } - - while (--n >= 0) - { - /* - * Read the next line of input. - */ - if (nblank > 0) - { - /* - * Still drawing blanks; don't get a line - * from the file yet. - * If this is the last blank line, get ready to - * read a line starting at ch_zero() next time. - */ - if (--nblank == 0) - pos = ch_zero(); - } else - { - /* - * Get the next line from the file. - */ - pos = forw_line(pos); + if (!do_repaint) + { + if (top_scroll && n >= sc_height - 1 && pos != ch_length()) + { + /* + * Start a new screen. + * {{ This is not really desirable if we happen + * to hit eof in the middle of this screen, + * but we don't yet know if that will happen. }} + */ + pos_clear(); + add_forw_pos(pos); + force = 1; + clear(); + home(); + } + + if (pos != position(BOTTOM_PLUS_ONE) || empty_screen()) + { + /* + * This is not contiguous with what is + * currently displayed. Clear the screen image + * (position table) and start a new screen. + */ + pos_clear(); + add_forw_pos(pos); + force = 1; + if (top_scroll) + { + clear(); + home(); + } else if (!first_time && !is_filtering()) + { + putstr("...skipping...\n"); + } + } + } + + while (--n >= 0) + { + /* + * Read the next line of input. + */ + if (nblank > 0) + { + /* + * Still drawing blanks; don't get a line + * from the file yet. + * If this is the last blank line, get ready to + * read a line starting at ch_zero() next time. + */ + if (--nblank == 0) + pos = ch_zero(); + } else + { + /* + * Get the next line from the file. + */ + pos = forw_line(pos); #if HILITE_SEARCH - pos = next_unfiltered(pos); + pos = next_unfiltered(pos); #endif - if (pos == NULL_POSITION) - { - /* - * End of file: stop here unless the top line - * is still empty, or "force" is true. - * Even if force is true, stop when the last - * line in the file reaches the top of screen. - */ - if (!force && position(TOP) != NULL_POSITION) - break; - if (!empty_lines(0, 0) && - !empty_lines(1, 1) && - empty_lines(2, sc_height-1)) - break; - } - } - /* - * Add the position of the next line to the position table. - * Display the current line on the screen. - */ - add_forw_pos(pos); - nlines++; - if (do_repaint) - continue; - /* - * If this is the first screen displayed and - * we hit an early EOF (i.e. before the requested - * number of lines), we "squish" the display down - * at the bottom of the screen. - * But don't do this if a + option or a -t option - * was given. These options can cause us to - * start the display after the beginning of the file, - * and it is not appropriate to squish in that case. - */ - if (first_time && pos == NULL_POSITION && !top_scroll && + if (pos == NULL_POSITION) + { + /* + * End of file: stop here unless the top line + * is still empty, or "force" is true. + * Even if force is true, stop when the last + * line in the file reaches the top of screen. + */ + if (!force && position(TOP) != NULL_POSITION) + break; + if (!empty_lines(0, 0) && + !empty_lines(1, 1) && + empty_lines(2, sc_height-1)) + break; + } + } + /* + * Add the position of the next line to the position table. + * Display the current line on the screen. + */ + add_forw_pos(pos); + nlines++; + if (do_repaint) + continue; + /* + * If this is the first screen displayed and + * we hit an early EOF (i.e. before the requested + * number of lines), we "squish" the display down + * at the bottom of the screen. + * But don't do this if a + option or a -t option + * was given. These options can cause us to + * start the display after the beginning of the file, + * and it is not appropriate to squish in that case. + */ + if (first_time && pos == NULL_POSITION && !top_scroll && #if TAGS - tagoption == NULL && + tagoption == NULL && #endif - !plusoption) - { - squished = 1; - continue; - } - put_line(); + !plusoption) + { + squished = 1; + continue; + } + put_line(); #if 0 - /* {{ - * Can't call clear_eol here. The cursor might be at end of line - * on an ignaw terminal, so clear_eol would clear the last char - * of the current line instead of all of the next line. - * If we really need to do this on clear_bg terminals, we need - * to find a better way. - * }} - */ - if (clear_bg && apply_at_specials(final_attr) != AT_NORMAL) - { - /* - * Writing the last character on the last line - * of the display may have scrolled the screen. - * If we were in standout mode, clear_bg terminals - * will fill the new line with the standout color. - * Now we're in normal mode again, so clear the line. - */ - clear_eol(); - } + /* {{ + * Can't call clear_eol here. The cursor might be at end of line + * on an ignaw terminal, so clear_eol would clear the last char + * of the current line instead of all of the next line. + * If we really need to do this on clear_bg terminals, we need + * to find a better way. + * }} + */ + if (clear_bg && apply_at_specials(final_attr) != AT_NORMAL) + { + /* + * Writing the last character on the last line + * of the display may have scrolled the screen. + * If we were in standout mode, clear_bg terminals + * will fill the new line with the standout color. + * Now we're in normal mode again, so clear the line. + */ + clear_eol(); + } #endif - forw_prompt = 1; - } - - if (header_lines > 0) - { - /* - * Don't allow ch_zero to appear on screen except at top of screen. - * Otherwise duplicate header lines may be displayed. - */ - if (onscreen(ch_zero()) > 0) - { - jump_loc(ch_zero(), 0); /* {{ yuck }} */ - return; - } - } - if (nlines == 0 && !ignore_eoi) - eof_bell(); - else if (do_repaint) - repaint(); - else - { - overlay_header(); - /* lower_left(); {{ considered harmful? }} */ - } - first_time = 0; - (void) currline(BOTTOM); + forw_prompt = 1; + } + + if (header_lines > 0) + { + /* + * Don't allow ch_zero to appear on screen except at top of screen. + * Otherwise duplicate header lines may be displayed. + */ + if (onscreen(ch_zero()) > 0) + { + jump_loc(ch_zero(), 0); /* {{ yuck }} */ + return; + } + } + if (nlines == 0 && !ignore_eoi) + eof_bell(); + else if (do_repaint) + repaint(); + else + { + overlay_header(); + /* lower_left(); {{ considered harmful? }} */ + } + first_time = 0; + (void) currline(BOTTOM); } /* * Display n lines, scrolling backward. */ - public void + public void back(n, pos, force, only_last) - int n; - POSITION pos; - int force; - int only_last; + int n; + POSITION pos; + int force; + int only_last; { - int nlines = 0; - int do_repaint; + int nlines = 0; + int do_repaint; - squish_check(); - do_repaint = (n > get_back_scroll() || (only_last && n > sc_height-1) || header_lines > 0); + squish_check(); + do_repaint = (n > get_back_scroll() || (only_last && n > sc_height-1) || header_lines > 0); #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) { - prep_hilite((pos < 3*size_linebuf) ? 0 : pos - 3*size_linebuf, pos, -1); - } + if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) { + prep_hilite((pos < 3*size_linebuf) ? 0 : pos - 3*size_linebuf, pos, -1); + } #endif - while (--n >= 0) - { - /* - * Get the previous line of input. - */ + while (--n >= 0) + { + /* + * Get the previous line of input. + */ #if HILITE_SEARCH - pos = prev_unfiltered(pos); + pos = prev_unfiltered(pos); #endif - pos = back_line(pos); - if (pos == NULL_POSITION) - { - /* - * Beginning of file: stop here unless "force" is true. - */ - if (!force) - break; - } - /* - * Add the position of the previous line to the position table. - * Display the line on the screen. - */ - add_back_pos(pos); - nlines++; - if (!do_repaint) - { - home(); - add_line(); - put_line(); - } - } - if (nlines == 0) - eof_bell(); - else if (do_repaint) - repaint(); - else - { - overlay_header(); - lower_left(); - } - (void) currline(BOTTOM); + pos = back_line(pos); + if (pos == NULL_POSITION) + { + /* + * Beginning of file: stop here unless "force" is true. + */ + if (!force) + break; + } + /* + * Add the position of the previous line to the position table. + * Display the line on the screen. + */ + add_back_pos(pos); + nlines++; + if (!do_repaint) + { + home(); + add_line(); + put_line(); + } + } + if (nlines == 0) + eof_bell(); + else if (do_repaint) + repaint(); + else + { + overlay_header(); + lower_left(); + } + (void) currline(BOTTOM); } /* * Display n more lines, forward. * Start just after the line currently displayed at the bottom of the screen. */ - public void + public void forward(n, force, only_last) - int n; - int force; - int only_last; + int n; + int force; + int only_last; { - POSITION pos; - - if (get_quit_at_eof() && eof_displayed() && !(ch_getflags() & CH_HELPFILE)) - { - /* - * If the -e flag is set and we're trying to go - * forward from end-of-file, go on to the next file. - */ - if (edit_next(1)) - quit(QUIT_OK); - return; - } - - pos = position(BOTTOM_PLUS_ONE); - if (pos == NULL_POSITION && (!force || empty_lines(2, sc_height-1))) - { - if (ignore_eoi) - { - /* - * ignore_eoi is to support A_F_FOREVER. - * Back up until there is a line at the bottom - * of the screen. - */ - if (empty_screen()) - pos = ch_zero(); - else - { - do - { - back(1, position(TOP), 1, 0); - pos = position(BOTTOM_PLUS_ONE); - } while (pos == NULL_POSITION); - } - } else - { - eof_bell(); - return; - } - } - forw(n, pos, force, only_last, 0); + POSITION pos; + + if (get_quit_at_eof() && eof_displayed() && !(ch_getflags() & CH_HELPFILE)) + { + /* + * If the -e flag is set and we're trying to go + * forward from end-of-file, go on to the next file. + */ + if (edit_next(1)) + quit(QUIT_OK); + return; + } + + pos = position(BOTTOM_PLUS_ONE); + if (pos == NULL_POSITION && (!force || empty_lines(2, sc_height-1))) + { + if (ignore_eoi) + { + /* + * ignore_eoi is to support A_F_FOREVER. + * Back up until there is a line at the bottom + * of the screen. + */ + if (empty_screen()) + pos = ch_zero(); + else + { + do + { + back(1, position(TOP), 1, 0); + pos = position(BOTTOM_PLUS_ONE); + } while (pos == NULL_POSITION); + } + } else + { + eof_bell(); + return; + } + } + forw(n, pos, force, only_last, 0); } /* * Display n more lines, backward. * Start just before the line currently displayed at the top of the screen. */ - public void + public void backward(n, force, only_last) - int n; - int force; - int only_last; + int n; + int force; + int only_last; { - POSITION pos; - - pos = position(TOP); - if (pos == NULL_POSITION && (!force || position(BOTTOM) == 0)) - { - eof_bell(); - return; - } - back(n, pos, force, only_last); + POSITION pos; + + pos = position(TOP); + if (pos == NULL_POSITION && (!force || position(BOTTOM) == 0)) + { + eof_bell(); + return; + } + back(n, pos, force, only_last); } /* @@ -549,31 +549,31 @@ backward(n, force, only_last) * back_scroll, because the default case depends on sc_height and * top_scroll, as well as back_scroll. */ - public int + public int get_back_scroll(VOID_PARAM) { - if (no_back_scroll) - return (0); - if (back_scroll >= 0) - return (back_scroll); - if (top_scroll) - return (sc_height - 2); - return (10000); /* infinity */ + if (no_back_scroll) + return (0); + if (back_scroll >= 0) + return (back_scroll); + if (top_scroll) + return (sc_height - 2); + return (10000); /* infinity */ } /* * Will the entire file fit on one screen? */ - public int + public int get_one_screen(VOID_PARAM) { - int nlines; - POSITION pos = ch_zero(); - - for (nlines = 0; nlines < sc_height; nlines++) - { - pos = forw_line(pos); - if (pos == NULL_POSITION) break; - } - return (nlines < sc_height); + int nlines; + POSITION pos = ch_zero(); + + for (nlines = 0; nlines < sc_height; nlines++) + { + pos = forw_line(pos); + if (pos == NULL_POSITION) break; + } + return (nlines < sc_height); } diff --git a/ifile.c b/ifile.c index 6b3d1ce..860b04c 100644 --- a/ifile.c +++ b/ifile.c @@ -13,7 +13,7 @@ * * It is actually a pointer to an ifile structure, * but is opaque outside this module. - * Ifile structures are kept in a linked list in the order they + * Ifile structures are kept in a linked list in the order they * appear on the command line. * Any new file which does not already appear in the list is * inserted after the current file. @@ -24,17 +24,17 @@ extern IFILE curr_ifile; struct ifile { - struct ifile *h_next; /* Links for command line list */ - struct ifile *h_prev; - char *h_filename; /* Name of the file */ - char *h_rfilename; /* Canonical name of the file */ - void *h_filestate; /* File state (used in ch.c) */ - int h_index; /* Index within command line list */ - int h_hold; /* Hold count */ - char h_opened; /* Has this ifile been opened? */ - struct scrpos h_scrpos; /* Saved position within the file */ - void *h_altpipe; /* Alt pipe */ - char *h_altfilename; /* Alt filename */ + struct ifile *h_next; /* Links for command line list */ + struct ifile *h_prev; + char *h_filename; /* Name of the file */ + char *h_rfilename; /* Canonical name of the file */ + void *h_filestate; /* File state (used in ch.c) */ + int h_index; /* Index within command line list */ + int h_hold; /* Hold count */ + char h_opened; /* Has this ifile been opened? */ + struct scrpos h_scrpos; /* Saved position within the file */ + void *h_altpipe; /* Alt pipe */ + char *h_altfilename; /* Alt filename */ }; /* @@ -48,55 +48,55 @@ struct ifile { * Anchor for linked list. */ static struct ifile anchor = { &anchor, &anchor, NULL, NULL, NULL, 0, 0, '\0', - { NULL_POSITION, 0 } }; + { NULL_POSITION, 0 } }; static int ifiles = 0; - static void + static void incr_index(p, incr) - struct ifile *p; - int incr; + struct ifile *p; + int incr; { - for (; p != &anchor; p = p->h_next) - p->h_index += incr; + for (; p != &anchor; p = p->h_next) + p->h_index += incr; } /* * Link an ifile into the ifile list. */ - static void + static void link_ifile(p, prev) - struct ifile *p; - struct ifile *prev; + struct ifile *p; + struct ifile *prev; { - /* - * Link into list. - */ - if (prev == NULL) - prev = &anchor; - p->h_next = prev->h_next; - p->h_prev = prev; - prev->h_next->h_prev = p; - prev->h_next = p; - /* - * Calculate index for the new one, - * and adjust the indexes for subsequent ifiles in the list. - */ - p->h_index = prev->h_index + 1; - incr_index(p->h_next, 1); - ifiles++; + /* + * Link into list. + */ + if (prev == NULL) + prev = &anchor; + p->h_next = prev->h_next; + p->h_prev = prev; + prev->h_next->h_prev = p; + prev->h_next = p; + /* + * Calculate index for the new one, + * and adjust the indexes for subsequent ifiles in the list. + */ + p->h_index = prev->h_index + 1; + incr_index(p->h_next, 1); + ifiles++; } - + /* * Unlink an ifile from the ifile list. */ - static void + static void unlink_ifile(p) - struct ifile *p; + struct ifile *p; { - p->h_next->h_prev = p->h_prev; - p->h_prev->h_next = p->h_next; - incr_index(p->h_next, -1); - ifiles--; + p->h_next->h_prev = p->h_prev; + p->h_prev->h_next = p->h_next; + incr_index(p->h_next, -1); + ifiles--; } /* @@ -105,145 +105,145 @@ unlink_ifile(p) * (or at the beginning of the list if "prev" is NULL). * Return a pointer to the new ifile structure. */ - static struct ifile * + static struct ifile * new_ifile(filename, prev) - char *filename; - struct ifile *prev; + char *filename; + struct ifile *prev; { - struct ifile *p; - - /* - * Allocate and initialize structure. - */ - p = (struct ifile *) ecalloc(1, sizeof(struct ifile)); - p->h_filename = save(filename); - p->h_rfilename = lrealpath(filename); - p->h_scrpos.pos = NULL_POSITION; - p->h_opened = 0; - p->h_hold = 0; - p->h_filestate = NULL; - p->h_altfilename = NULL; - p->h_altpipe = NULL; - link_ifile(p, prev); - /* - * {{ It's dodgy to call mark.c functions from here; - * there is potentially dangerous recursion. - * Probably need to revisit this design. }} - */ - mark_check_ifile(ext_ifile(p)); - return (p); + struct ifile *p; + + /* + * Allocate and initialize structure. + */ + p = (struct ifile *) ecalloc(1, sizeof(struct ifile)); + p->h_filename = save(filename); + p->h_rfilename = lrealpath(filename); + p->h_scrpos.pos = NULL_POSITION; + p->h_opened = 0; + p->h_hold = 0; + p->h_filestate = NULL; + p->h_altfilename = NULL; + p->h_altpipe = NULL; + link_ifile(p, prev); + /* + * {{ It's dodgy to call mark.c functions from here; + * there is potentially dangerous recursion. + * Probably need to revisit this design. }} + */ + mark_check_ifile(ext_ifile(p)); + return (p); } /* * Delete an existing ifile structure. */ - public void + public void del_ifile(h) - IFILE h; + IFILE h; { - struct ifile *p; - - if (h == NULL_IFILE) - return; - /* - * If the ifile we're deleting is the currently open ifile, - * move off it. - */ - unmark(h); - if (h == curr_ifile) - curr_ifile = getoff_ifile(curr_ifile); - p = int_ifile(h); - unlink_ifile(p); - free(p->h_rfilename); - free(p->h_filename); - free(p); + struct ifile *p; + + if (h == NULL_IFILE) + return; + /* + * If the ifile we're deleting is the currently open ifile, + * move off it. + */ + unmark(h); + if (h == curr_ifile) + curr_ifile = getoff_ifile(curr_ifile); + p = int_ifile(h); + unlink_ifile(p); + free(p->h_rfilename); + free(p->h_filename); + free(p); } /* * Get the ifile after a given one in the list. */ - public IFILE + public IFILE next_ifile(h) - IFILE h; + IFILE h; { - struct ifile *p; + struct ifile *p; - p = (h == NULL_IFILE) ? &anchor : int_ifile(h); - if (p->h_next == &anchor) - return (NULL_IFILE); - return (ext_ifile(p->h_next)); + p = (h == NULL_IFILE) ? &anchor : int_ifile(h); + if (p->h_next == &anchor) + return (NULL_IFILE); + return (ext_ifile(p->h_next)); } /* * Get the ifile before a given one in the list. */ - public IFILE + public IFILE prev_ifile(h) - IFILE h; + IFILE h; { - struct ifile *p; + struct ifile *p; - p = (h == NULL_IFILE) ? &anchor : int_ifile(h); - if (p->h_prev == &anchor) - return (NULL_IFILE); - return (ext_ifile(p->h_prev)); + p = (h == NULL_IFILE) ? &anchor : int_ifile(h); + if (p->h_prev == &anchor) + return (NULL_IFILE); + return (ext_ifile(p->h_prev)); } /* * Return a different ifile from the given one. */ - public IFILE + public IFILE getoff_ifile(ifile) - IFILE ifile; + IFILE ifile; { - IFILE newifile; - - if ((newifile = prev_ifile(ifile)) != NULL_IFILE) - return (newifile); - if ((newifile = next_ifile(ifile)) != NULL_IFILE) - return (newifile); - return (NULL_IFILE); + IFILE newifile; + + if ((newifile = prev_ifile(ifile)) != NULL_IFILE) + return (newifile); + if ((newifile = next_ifile(ifile)) != NULL_IFILE) + return (newifile); + return (NULL_IFILE); } /* * Return the number of ifiles. */ - public int + public int nifile(VOID_PARAM) { - return (ifiles); + return (ifiles); } /* * Find an ifile structure, given a filename. */ - static struct ifile * + static struct ifile * find_ifile(filename) - char *filename; + char *filename; { - struct ifile *p; - char *rfilename = lrealpath(filename); - - for (p = anchor.h_next; p != &anchor; p = p->h_next) - { - if (strcmp(rfilename, p->h_rfilename) == 0) - { - /* - * If given name is shorter than the name we were - * previously using for this file, adopt shorter name. - */ - if (strlen(filename) < strlen(p->h_filename)) - { - free(p->h_filename); - p->h_filename = save(filename); - } - break; - } - } - free(rfilename); - if (p == &anchor) - p = NULL; - return (p); + struct ifile *p; + char *rfilename = lrealpath(filename); + + for (p = anchor.h_next; p != &anchor; p = p->h_next) + { + if (strcmp(rfilename, p->h_rfilename) == 0) + { + /* + * If given name is shorter than the name we were + * previously using for this file, adopt shorter name. + */ + if (strlen(filename) < strlen(p->h_filename)) + { + free(p->h_filename); + p->h_filename = save(filename); + } + break; + } + } + free(rfilename); + if (p == &anchor) + p = NULL; + return (p); } /* @@ -251,170 +251,170 @@ find_ifile(filename) * If the filename has not been seen before, * insert the new ifile after "prev" in the list. */ - public IFILE + public IFILE get_ifile(filename, prev) - char *filename; - IFILE prev; + char *filename; + IFILE prev; { - struct ifile *p; + struct ifile *p; - if ((p = find_ifile(filename)) == NULL) - p = new_ifile(filename, int_ifile(prev)); - return (ext_ifile(p)); + if ((p = find_ifile(filename)) == NULL) + p = new_ifile(filename, int_ifile(prev)); + return (ext_ifile(p)); } /* * Get the display filename associated with a ifile. */ - public char * + public char * get_filename(ifile) - IFILE ifile; + IFILE ifile; { - if (ifile == NULL) - return (NULL); - return (int_ifile(ifile)->h_filename); + if (ifile == NULL) + return (NULL); + return (int_ifile(ifile)->h_filename); } /* * Get the canonical filename associated with a ifile. */ - public char * + public char * get_real_filename(ifile) - IFILE ifile; + IFILE ifile; { - if (ifile == NULL) - return (NULL); - return (int_ifile(ifile)->h_rfilename); + if (ifile == NULL) + return (NULL); + return (int_ifile(ifile)->h_rfilename); } /* * Get the index of the file associated with a ifile. */ - public int + public int get_index(ifile) - IFILE ifile; + IFILE ifile; { - return (int_ifile(ifile)->h_index); + return (int_ifile(ifile)->h_index); } /* * Save the file position to be associated with a given file. */ - public void + public void store_pos(ifile, scrpos) - IFILE ifile; - struct scrpos *scrpos; + IFILE ifile; + struct scrpos *scrpos; { - int_ifile(ifile)->h_scrpos = *scrpos; + int_ifile(ifile)->h_scrpos = *scrpos; } /* * Recall the file position associated with a file. * If no position has been associated with the file, return NULL_POSITION. */ - public void + public void get_pos(ifile, scrpos) - IFILE ifile; - struct scrpos *scrpos; + IFILE ifile; + struct scrpos *scrpos; { - *scrpos = int_ifile(ifile)->h_scrpos; + *scrpos = int_ifile(ifile)->h_scrpos; } /* * Mark the ifile as "opened". */ - public void + public void set_open(ifile) - IFILE ifile; + IFILE ifile; { - int_ifile(ifile)->h_opened = 1; + int_ifile(ifile)->h_opened = 1; } /* * Return whether the ifile has been opened previously. */ - public int + public int opened(ifile) - IFILE ifile; + IFILE ifile; { - return (int_ifile(ifile)->h_opened); + return (int_ifile(ifile)->h_opened); } - public void + public void hold_ifile(ifile, incr) - IFILE ifile; - int incr; + IFILE ifile; + int incr; { - int_ifile(ifile)->h_hold += incr; + int_ifile(ifile)->h_hold += incr; } - public int + public int held_ifile(ifile) - IFILE ifile; + IFILE ifile; { - return (int_ifile(ifile)->h_hold); + return (int_ifile(ifile)->h_hold); } - public void * + public void * get_filestate(ifile) - IFILE ifile; + IFILE ifile; { - return (int_ifile(ifile)->h_filestate); + return (int_ifile(ifile)->h_filestate); } - public void + public void set_filestate(ifile, filestate) - IFILE ifile; - void *filestate; + IFILE ifile; + void *filestate; { - int_ifile(ifile)->h_filestate = filestate; + int_ifile(ifile)->h_filestate = filestate; } - public void + public void set_altpipe(ifile, p) - IFILE ifile; - void *p; + IFILE ifile; + void *p; { - int_ifile(ifile)->h_altpipe = p; + int_ifile(ifile)->h_altpipe = p; } - public void * + public void * get_altpipe(ifile) - IFILE ifile; + IFILE ifile; { - return (int_ifile(ifile)->h_altpipe); + return (int_ifile(ifile)->h_altpipe); } - public void + public void set_altfilename(ifile, altfilename) - IFILE ifile; - char *altfilename; + IFILE ifile; + char *altfilename; { - struct ifile *p = int_ifile(ifile); - if (p->h_altfilename != NULL && p->h_altfilename != altfilename) - free(p->h_altfilename); - p->h_altfilename = altfilename; + struct ifile *p = int_ifile(ifile); + if (p->h_altfilename != NULL && p->h_altfilename != altfilename) + free(p->h_altfilename); + p->h_altfilename = altfilename; } - public char * + public char * get_altfilename(ifile) - IFILE ifile; + IFILE ifile; { - return (int_ifile(ifile)->h_altfilename); + return (int_ifile(ifile)->h_altfilename); } #if 0 - public void + public void if_dump(VOID_PARAM) { - struct ifile *p; - - for (p = anchor.h_next; p != &anchor; p = p->h_next) - { - printf("%x: %d. <%s> pos %d,%x\n", - p, p->h_index, p->h_filename, - p->h_scrpos.ln, p->h_scrpos.pos); - ch_dump(p->h_filestate); - } + struct ifile *p; + + for (p = anchor.h_next; p != &anchor; p = p->h_next) + { + printf("%x: %d. <%s> pos %d,%x\n", + p, p->h_index, p->h_filename, + p->h_scrpos.ln, p->h_scrpos.pos); + ch_dump(p->h_filestate); + } } #endif diff --git a/input.c b/input.c index ffd2f13..b375082 100644 --- a/input.c +++ b/input.c @@ -8,7 +8,7 @@ */ /* - * High level routines dealing with getting lines of input + * High level routines dealing with getting lines of input * from the file being viewed. * * When we speak of "lines" here, we mean PRINTABLE lines; @@ -40,230 +40,230 @@ extern int show_attn; * a line. The new position is the position of the first character * of the NEXT line. The line obtained is the line starting at curr_pos. */ - public POSITION + public POSITION forw_line_seg(curr_pos, skipeol, rscroll, nochop) - POSITION curr_pos; - int skipeol; - int rscroll; - int nochop; + POSITION curr_pos; + int skipeol; + int rscroll; + int nochop; { - POSITION base_pos; - POSITION new_pos; - int c; - int blankline; - int endline; - int chopped; - int backchars; + POSITION base_pos; + POSITION new_pos; + int c; + int blankline; + int endline; + int chopped; + int backchars; get_forw_line: - if (curr_pos == NULL_POSITION) - { - null_line(); - return (NULL_POSITION); - } + if (curr_pos == NULL_POSITION) + { + null_line(); + return (NULL_POSITION); + } #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) - { - /* - * If we are ignoring EOI (command F), only prepare - * one line ahead, to avoid getting stuck waiting for - * slow data without displaying the data we already have. - * If we're not ignoring EOI, we *could* do the same, but - * for efficiency we prepare several lines ahead at once. - */ - prep_hilite(curr_pos, curr_pos + 3*size_linebuf, - ignore_eoi ? 1 : -1); - curr_pos = next_unfiltered(curr_pos); - } + if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) + { + /* + * If we are ignoring EOI (command F), only prepare + * one line ahead, to avoid getting stuck waiting for + * slow data without displaying the data we already have. + * If we're not ignoring EOI, we *could* do the same, but + * for efficiency we prepare several lines ahead at once. + */ + prep_hilite(curr_pos, curr_pos + 3*size_linebuf, + ignore_eoi ? 1 : -1); + curr_pos = next_unfiltered(curr_pos); + } #endif - if (ch_seek(curr_pos)) - { - null_line(); - return (NULL_POSITION); - } + if (ch_seek(curr_pos)) + { + null_line(); + return (NULL_POSITION); + } - /* - * Step back to the beginning of the line. - */ - base_pos = curr_pos; - for (;;) - { - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - c = ch_back_get(); - if (c == EOI) - break; - if (c == '\n') - { - (void) ch_forw_get(); - break; - } - --base_pos; - } + /* + * Step back to the beginning of the line. + */ + base_pos = curr_pos; + for (;;) + { + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + c = ch_back_get(); + if (c == EOI) + break; + if (c == '\n') + { + (void) ch_forw_get(); + break; + } + --base_pos; + } - /* - * Read forward again to the position we should start at. - */ - prewind(); - plinestart(base_pos); - (void) ch_seek(base_pos); - new_pos = base_pos; - while (new_pos < curr_pos) - { - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - c = ch_forw_get(); - backchars = pappend(c, new_pos); - new_pos++; - if (backchars > 0) - { - pshift_all(); - new_pos -= backchars; - while (--backchars >= 0) - (void) ch_back_get(); - } - } - (void) pflushmbc(); - pshift_all(); + /* + * Read forward again to the position we should start at. + */ + prewind(); + plinestart(base_pos); + (void) ch_seek(base_pos); + new_pos = base_pos; + while (new_pos < curr_pos) + { + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + c = ch_forw_get(); + backchars = pappend(c, new_pos); + new_pos++; + if (backchars > 0) + { + pshift_all(); + new_pos -= backchars; + while (--backchars >= 0) + (void) ch_back_get(); + } + } + (void) pflushmbc(); + pshift_all(); - /* - * Read the first character to display. - */ - c = ch_forw_get(); - if (c == EOI) - { - null_line(); - return (NULL_POSITION); - } - blankline = (c == '\n' || c == '\r'); + /* + * Read the first character to display. + */ + c = ch_forw_get(); + if (c == EOI) + { + null_line(); + return (NULL_POSITION); + } + blankline = (c == '\n' || c == '\r'); - /* - * Read each character in the line and append to the line buffer. - */ - chopped = FALSE; - for (;;) - { - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - if (c == '\n' || c == EOI) - { - /* - * End of the line. - */ - backchars = pflushmbc(); - new_pos = ch_tell(); - if (backchars > 0 && (nochop || !chop_line()) && hshift == 0) - { - new_pos -= backchars + 1; - endline = FALSE; - } else - endline = TRUE; - break; - } - if (c != '\r') - blankline = 0; + /* + * Read each character in the line and append to the line buffer. + */ + chopped = FALSE; + for (;;) + { + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + if (c == '\n' || c == EOI) + { + /* + * End of the line. + */ + backchars = pflushmbc(); + new_pos = ch_tell(); + if (backchars > 0 && (nochop || !chop_line()) && hshift == 0) + { + new_pos -= backchars + 1; + endline = FALSE; + } else + endline = TRUE; + break; + } + if (c != '\r') + blankline = 0; - /* - * Append the char to the line and get the next char. - */ - backchars = pappend(c, ch_tell()-1); - if (backchars > 0) - { - /* - * The char won't fit in the line; the line - * is too long to print in the screen width. - * End the line here. - */ - if (skipeol) - { - /* Read to end of line. */ - do - { - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - c = ch_forw_get(); - } while (c != '\n' && c != EOI); - new_pos = ch_tell(); - endline = TRUE; - quit_if_one_screen = FALSE; - chopped = TRUE; - } else - { - new_pos = ch_tell() - backchars; - endline = FALSE; - } - break; - } - c = ch_forw_get(); - } + /* + * Append the char to the line and get the next char. + */ + backchars = pappend(c, ch_tell()-1); + if (backchars > 0) + { + /* + * The char won't fit in the line; the line + * is too long to print in the screen width. + * End the line here. + */ + if (skipeol) + { + /* Read to end of line. */ + do + { + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + c = ch_forw_get(); + } while (c != '\n' && c != EOI); + new_pos = ch_tell(); + endline = TRUE; + quit_if_one_screen = FALSE; + chopped = TRUE; + } else + { + new_pos = ch_tell() - backchars; + endline = FALSE; + } + break; + } + c = ch_forw_get(); + } #if HILITE_SEARCH - if (blankline && show_attn) - { - /* Add spurious space to carry possible attn hilite. */ - pappend(' ', ch_tell()-1); - } + if (blankline && show_attn) + { + /* Add spurious space to carry possible attn hilite. */ + pappend(' ', ch_tell()-1); + } #endif - pdone(endline, rscroll && chopped, 1); + pdone(endline, rscroll && chopped, 1); #if HILITE_SEARCH - if (is_filtered(base_pos)) - { - /* - * We don't want to display this line. - * Get the next line. - */ - curr_pos = new_pos; - goto get_forw_line; - } + if (is_filtered(base_pos)) + { + /* + * We don't want to display this line. + * Get the next line. + */ + curr_pos = new_pos; + goto get_forw_line; + } - if (status_col) - { - int attr = is_hilited_attr(base_pos, ch_tell()-1, 1, NULL); - if (attr) - set_status_col('*', attr); - } + if (status_col) + { + int attr = is_hilited_attr(base_pos, ch_tell()-1, 1, NULL); + if (attr) + set_status_col('*', attr); + } #endif - if (squeeze && blankline) - { - /* - * This line is blank. - * Skip down to the last contiguous blank line - * and pretend it is the one which we are returning. - */ - while ((c = ch_forw_get()) == '\n' || c == '\r') - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - if (c != EOI) - (void) ch_back_get(); - new_pos = ch_tell(); - } + if (squeeze && blankline) + { + /* + * This line is blank. + * Skip down to the last contiguous blank line + * and pretend it is the one which we are returning. + */ + while ((c = ch_forw_get()) == '\n' || c == '\r') + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + if (c != EOI) + (void) ch_back_get(); + new_pos = ch_tell(); + } - return (new_pos); + return (new_pos); } - public POSITION + public POSITION forw_line(curr_pos) - POSITION curr_pos; + POSITION curr_pos; { - return forw_line_seg(curr_pos, (chop_line() || hshift > 0), TRUE, FALSE); + return forw_line_seg(curr_pos, (chop_line() || hshift > 0), TRUE, FALSE); } /* @@ -273,223 +273,223 @@ forw_line(curr_pos) * a line. The new position is the position of the first character * of the PREVIOUS line. The line obtained is the one starting at new_pos. */ - public POSITION + public POSITION back_line(curr_pos) - POSITION curr_pos; + POSITION curr_pos; { - POSITION new_pos, begin_new_pos, base_pos; - int c; - int endline; - int chopped; - int backchars; + POSITION new_pos, begin_new_pos, base_pos; + int c; + int endline; + int chopped; + int backchars; get_back_line: - if (curr_pos == NULL_POSITION || curr_pos <= ch_zero()) - { - null_line(); - return (NULL_POSITION); - } + if (curr_pos == NULL_POSITION || curr_pos <= ch_zero()) + { + null_line(); + return (NULL_POSITION); + } #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) - prep_hilite((curr_pos < 3*size_linebuf) ? - 0 : curr_pos - 3*size_linebuf, curr_pos, -1); + if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) + prep_hilite((curr_pos < 3*size_linebuf) ? + 0 : curr_pos - 3*size_linebuf, curr_pos, -1); #endif - if (ch_seek(curr_pos-1)) - { - null_line(); - return (NULL_POSITION); - } + if (ch_seek(curr_pos-1)) + { + null_line(); + return (NULL_POSITION); + } - if (squeeze) - { - /* - * Find out if the "current" line was blank. - */ - (void) ch_forw_get(); /* Skip the newline */ - c = ch_forw_get(); /* First char of "current" line */ - (void) ch_back_get(); /* Restore our position */ - (void) ch_back_get(); + if (squeeze) + { + /* + * Find out if the "current" line was blank. + */ + (void) ch_forw_get(); /* Skip the newline */ + c = ch_forw_get(); /* First char of "current" line */ + (void) ch_back_get(); /* Restore our position */ + (void) ch_back_get(); - if (c == '\n' || c == '\r') - { - /* - * The "current" line was blank. - * Skip over any preceding blank lines, - * since we skipped them in forw_line(). - */ - while ((c = ch_back_get()) == '\n' || c == '\r') - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - if (c == EOI) - { - null_line(); - return (NULL_POSITION); - } - (void) ch_forw_get(); - } - } + if (c == '\n' || c == '\r') + { + /* + * The "current" line was blank. + * Skip over any preceding blank lines, + * since we skipped them in forw_line(). + */ + while ((c = ch_back_get()) == '\n' || c == '\r') + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + if (c == EOI) + { + null_line(); + return (NULL_POSITION); + } + (void) ch_forw_get(); + } + } - /* - * Scan backwards until we hit the beginning of the line. - */ - for (;;) - { - if (ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - c = ch_back_get(); - if (c == '\n') - { - /* - * This is the newline ending the previous line. - * We have hit the beginning of the line. - */ - base_pos = ch_tell() + 1; - break; - } - if (c == EOI) - { - /* - * We have hit the beginning of the file. - * This must be the first line in the file. - * This must, of course, be the beginning of the line. - */ - base_pos = ch_tell(); - break; - } - } + /* + * Scan backwards until we hit the beginning of the line. + */ + for (;;) + { + if (ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + c = ch_back_get(); + if (c == '\n') + { + /* + * This is the newline ending the previous line. + * We have hit the beginning of the line. + */ + base_pos = ch_tell() + 1; + break; + } + if (c == EOI) + { + /* + * We have hit the beginning of the file. + * This must be the first line in the file. + * This must, of course, be the beginning of the line. + */ + base_pos = ch_tell(); + break; + } + } - /* - * Now scan forwards from the beginning of this line. - * We keep discarding "printable lines" (based on screen width) - * until we reach the curr_pos. - * - * {{ This algorithm is pretty inefficient if the lines - * are much longer than the screen width, - * but I don't know of any better way. }} - */ - new_pos = base_pos; - if (ch_seek(new_pos)) - { - null_line(); - return (NULL_POSITION); - } - endline = FALSE; - prewind(); - plinestart(new_pos); + /* + * Now scan forwards from the beginning of this line. + * We keep discarding "printable lines" (based on screen width) + * until we reach the curr_pos. + * + * {{ This algorithm is pretty inefficient if the lines + * are much longer than the screen width, + * but I don't know of any better way. }} + */ + new_pos = base_pos; + if (ch_seek(new_pos)) + { + null_line(); + return (NULL_POSITION); + } + endline = FALSE; + prewind(); + plinestart(new_pos); loop: - begin_new_pos = new_pos; - (void) ch_seek(new_pos); - chopped = FALSE; + begin_new_pos = new_pos; + (void) ch_seek(new_pos); + chopped = FALSE; - do - { - c = ch_forw_get(); - if (c == EOI || ABORT_SIGS()) - { - null_line(); - return (NULL_POSITION); - } - new_pos++; - if (c == '\n') - { - backchars = pflushmbc(); - if (backchars > 0 && !chop_line() && hshift == 0) - { - backchars++; - goto shift; - } - endline = TRUE; - break; - } - backchars = pappend(c, ch_tell()-1); - if (backchars > 0) - { - /* - * Got a full printable line, but we haven't - * reached our curr_pos yet. Discard the line - * and start a new one. - */ - if (chop_line() || hshift > 0) - { - endline = TRUE; - chopped = TRUE; - quit_if_one_screen = FALSE; - break; - } - shift: - pshift_all(); - while (backchars-- > 0) - { - (void) ch_back_get(); - new_pos--; - } - goto loop; - } - } while (new_pos < curr_pos); + do + { + c = ch_forw_get(); + if (c == EOI || ABORT_SIGS()) + { + null_line(); + return (NULL_POSITION); + } + new_pos++; + if (c == '\n') + { + backchars = pflushmbc(); + if (backchars > 0 && !chop_line() && hshift == 0) + { + backchars++; + goto shift; + } + endline = TRUE; + break; + } + backchars = pappend(c, ch_tell()-1); + if (backchars > 0) + { + /* + * Got a full printable line, but we haven't + * reached our curr_pos yet. Discard the line + * and start a new one. + */ + if (chop_line() || hshift > 0) + { + endline = TRUE; + chopped = TRUE; + quit_if_one_screen = FALSE; + break; + } + shift: + pshift_all(); + while (backchars-- > 0) + { + (void) ch_back_get(); + new_pos--; + } + goto loop; + } + } while (new_pos < curr_pos); - pdone(endline, chopped, 0); + pdone(endline, chopped, 0); #if HILITE_SEARCH - if (is_filtered(base_pos)) - { - /* - * We don't want to display this line. - * Get the previous line. - */ - curr_pos = begin_new_pos; - goto get_back_line; - } + if (is_filtered(base_pos)) + { + /* + * We don't want to display this line. + * Get the previous line. + */ + curr_pos = begin_new_pos; + goto get_back_line; + } - if (status_col && curr_pos > 0) - { - int attr = is_hilited_attr(base_pos, curr_pos-1, 1, NULL); - if (attr) - set_status_col('*', attr); - } + if (status_col && curr_pos > 0) + { + int attr = is_hilited_attr(base_pos, curr_pos-1, 1, NULL); + if (attr) + set_status_col('*', attr); + } #endif - return (begin_new_pos); + return (begin_new_pos); } /* * Set attnpos. */ - public void + public void set_attnpos(pos) - POSITION pos; + POSITION pos; { - int c; + int c; - if (pos != NULL_POSITION) - { - if (ch_seek(pos)) - return; - for (;;) - { - c = ch_forw_get(); - if (c == EOI) - break; - if (c == '\n' || c == '\r') - { - (void) ch_back_get(); - break; - } - pos++; - } - end_attnpos = pos; - for (;;) - { - c = ch_back_get(); - if (c == EOI || c == '\n' || c == '\r') - break; - pos--; - } - } - start_attnpos = pos; + if (pos != NULL_POSITION) + { + if (ch_seek(pos)) + return; + for (;;) + { + c = ch_forw_get(); + if (c == EOI) + break; + if (c == '\n' || c == '\r') + { + (void) ch_back_get(); + break; + } + pos++; + } + end_attnpos = pos; + for (;;) + { + c = ch_back_get(); + if (c == EOI || c == '\n' || c == '\r') + break; + pos--; + } + } + start_attnpos = pos; } diff --git a/install.sh b/install.sh index 41ea84f..23a5735 100644 --- a/install.sh +++ b/install.sh @@ -39,50 +39,50 @@ dst="" while [ x"$1" != x ]; do case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - dst=$1 - fi - shift - continue;; + -c) instcmd="$cpprog" + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + dst=$1 + fi + shift + continue;; esac done if [ x"$src" = x ] then - echo "install: no input file specified" - exit 1 + echo "install: no input file specified" + exit 1 fi if [ x"$dst" = x ] then - echo "install: no destination specified" - exit 1 + echo "install: no destination specified" + exit 1 fi @@ -91,7 +91,7 @@ fi if [ -d $dst ] then - dst="$dst"/`basename $src` + dst="$dst"/`basename $src` fi # Make a temp file name in the proper directory. diff --git a/jump.c b/jump.c index ee1b0c6..aa13293 100644 --- a/jump.c +++ b/jump.c @@ -25,169 +25,169 @@ extern int top_scroll; /* * Jump to the end of the file. */ - public void + public void jump_forw(VOID_PARAM) { - POSITION pos; - POSITION end_pos; + POSITION pos; + POSITION end_pos; - if (ch_end_seek()) - { - error("Cannot seek to end of file", NULL_PARG); - return; - } - /* - * Note; lastmark will be called later by jump_loc, but it fails - * because the position table has been cleared by pos_clear below. - * So call it here before calling pos_clear. - */ - lastmark(); - /* - * Position the last line in the file at the last screen line. - * Go back one line from the end of the file - * to get to the beginning of the last line. - */ - pos_clear(); - end_pos = ch_tell(); - pos = back_line(end_pos); - if (pos == NULL_POSITION) - jump_loc(ch_zero(), sc_height-1); - else - { - jump_loc(pos, sc_height-1); - if (position(sc_height-1) != end_pos) - repaint(); - } + if (ch_end_seek()) + { + error("Cannot seek to end of file", NULL_PARG); + return; + } + /* + * Note; lastmark will be called later by jump_loc, but it fails + * because the position table has been cleared by pos_clear below. + * So call it here before calling pos_clear. + */ + lastmark(); + /* + * Position the last line in the file at the last screen line. + * Go back one line from the end of the file + * to get to the beginning of the last line. + */ + pos_clear(); + end_pos = ch_tell(); + pos = back_line(end_pos); + if (pos == NULL_POSITION) + jump_loc(ch_zero(), sc_height-1); + else + { + jump_loc(pos, sc_height-1); + if (position(sc_height-1) != end_pos) + repaint(); + } } /* * Jump to the last buffered line in the file. */ - public void + public void jump_forw_buffered(VOID_PARAM) { - POSITION end; + POSITION end; - if (ch_end_buffer_seek()) - { - error("Cannot seek to end of buffers", NULL_PARG); - return; - } - end = ch_tell(); - if (end != NULL_POSITION && end > 0) - jump_line_loc(end-1, sc_height-1); + if (ch_end_buffer_seek()) + { + error("Cannot seek to end of buffers", NULL_PARG); + return; + } + end = ch_tell(); + if (end != NULL_POSITION && end > 0) + jump_line_loc(end-1, sc_height-1); } /* * Jump to line n in the file. */ - public void + public void jump_back(linenum) - LINENUM linenum; + LINENUM linenum; { - POSITION pos; - PARG parg; + POSITION pos; + PARG parg; - /* - * Find the position of the specified line. - * If we can seek there, just jump to it. - * If we can't seek, but we're trying to go to line number 1, - * use ch_beg_seek() to get as close as we can. - */ - pos = find_pos(linenum); - if (pos != NULL_POSITION && ch_seek(pos) == 0) - { - if (show_attn) - set_attnpos(pos); - jump_loc(pos, jump_sline); - } else if (linenum <= 1 && ch_beg_seek() == 0) - { - jump_loc(ch_tell(), jump_sline); - error("Cannot seek to beginning of file", NULL_PARG); - } else - { - parg.p_linenum = linenum; - error("Cannot seek to line number %n", &parg); - } + /* + * Find the position of the specified line. + * If we can seek there, just jump to it. + * If we can't seek, but we're trying to go to line number 1, + * use ch_beg_seek() to get as close as we can. + */ + pos = find_pos(linenum); + if (pos != NULL_POSITION && ch_seek(pos) == 0) + { + if (show_attn) + set_attnpos(pos); + jump_loc(pos, jump_sline); + } else if (linenum <= 1 && ch_beg_seek() == 0) + { + jump_loc(ch_tell(), jump_sline); + error("Cannot seek to beginning of file", NULL_PARG); + } else + { + parg.p_linenum = linenum; + error("Cannot seek to line number %n", &parg); + } } /* * Repaint the screen. */ - public void + public void repaint(VOID_PARAM) { - struct scrpos scrpos; - /* - * Start at the line currently at the top of the screen - * and redisplay the screen. - */ - get_scrpos(&scrpos, TOP); - pos_clear(); - if (scrpos.pos == NULL_POSITION) - /* Screen hasn't been drawn yet. */ - jump_loc(ch_zero(), 1); - else - jump_loc(scrpos.pos, scrpos.ln); + struct scrpos scrpos; + /* + * Start at the line currently at the top of the screen + * and redisplay the screen. + */ + get_scrpos(&scrpos, TOP); + pos_clear(); + if (scrpos.pos == NULL_POSITION) + /* Screen hasn't been drawn yet. */ + jump_loc(ch_zero(), 1); + else + jump_loc(scrpos.pos, scrpos.ln); } /* * Jump to a specified percentage into the file. */ - public void + public void jump_percent(percent, fraction) - int percent; - long fraction; + int percent; + long fraction; { - POSITION pos, len; + POSITION pos, len; - /* - * Determine the position in the file - * (the specified percentage of the file's length). - */ - if ((len = ch_length()) == NULL_POSITION) - { - ierror("Determining length of file", NULL_PARG); - ch_end_seek(); - } - if ((len = ch_length()) == NULL_POSITION) - { - error("Don't know length of file", NULL_PARG); - return; - } - pos = percent_pos(len, percent, fraction); - if (pos >= len) - pos = len-1; + /* + * Determine the position in the file + * (the specified percentage of the file's length). + */ + if ((len = ch_length()) == NULL_POSITION) + { + ierror("Determining length of file", NULL_PARG); + ch_end_seek(); + } + if ((len = ch_length()) == NULL_POSITION) + { + error("Don't know length of file", NULL_PARG); + return; + } + pos = percent_pos(len, percent, fraction); + if (pos >= len) + pos = len-1; - jump_line_loc(pos, jump_sline); + jump_line_loc(pos, jump_sline); } /* * Jump to a specified position in the file. - * Like jump_loc, but the position need not be + * Like jump_loc, but the position need not be * the first character in a line. */ - public void + public void jump_line_loc(pos, sline) - POSITION pos; - int sline; + POSITION pos; + int sline; { - int c; + int c; - if (ch_seek(pos) == 0) - { - /* - * Back up to the beginning of the line. - */ - while ((c = ch_back_get()) != '\n' && c != EOI) - ; - if (c == '\n') - (void) ch_forw_get(); - pos = ch_tell(); - } - if (show_attn) - set_attnpos(pos); - jump_loc(pos, sline); + if (ch_seek(pos) == 0) + { + /* + * Back up to the beginning of the line. + */ + while ((c = ch_back_get()) != '\n' && c != EOI) + ; + if (c == '\n') + (void) ch_forw_get(); + pos = ch_tell(); + } + if (show_attn) + set_attnpos(pos); + jump_loc(pos, sline); } /* @@ -195,140 +195,140 @@ jump_line_loc(pos, sline) * The position must be the first character in a line. * Place the target line on a specified line on the screen. */ - public void + public void jump_loc(pos, sline) - POSITION pos; - int sline; + POSITION pos; + int sline; { - int nline; - int sindex; - POSITION tpos; - POSITION bpos; + int nline; + int sindex; + POSITION tpos; + POSITION bpos; - /* - * Normalize sline. - */ - sindex = sindex_from_sline(sline); + /* + * Normalize sline. + */ + sindex = sindex_from_sline(sline); - if ((nline = onscreen(pos)) >= 0) - { - /* - * The line is currently displayed. - * Just scroll there. - */ - nline -= sindex; - if (nline > 0) - forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0); - else - back(-nline, position(TOP), 1, 0); + if ((nline = onscreen(pos)) >= 0) + { + /* + * The line is currently displayed. + * Just scroll there. + */ + nline -= sindex; + if (nline > 0) + forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0); + else + back(-nline, position(TOP), 1, 0); #if HILITE_SEARCH - if (show_attn) - repaint_hilite(1); + if (show_attn) + repaint_hilite(1); #endif - return; - } + return; + } - /* - * Line is not on screen. - * Seek to the desired location. - */ - if (ch_seek(pos)) - { - error("Cannot seek to that file position", NULL_PARG); - return; - } + /* + * Line is not on screen. + * Seek to the desired location. + */ + if (ch_seek(pos)) + { + error("Cannot seek to that file position", NULL_PARG); + return; + } - /* - * See if the desired line is before or after - * the currently displayed screen. - */ - tpos = position(TOP); - bpos = position(BOTTOM_PLUS_ONE); - if (tpos == NULL_POSITION || pos >= tpos) - { - /* - * The desired line is after the current screen. - * Move back in the file far enough so that we can - * call forw() and put the desired line at the - * sline-th line on the screen. - */ - for (nline = 0; nline < sindex; nline++) - { - if (bpos != NULL_POSITION && pos <= bpos) - { - /* - * Surprise! The desired line is - * close enough to the current screen - * that we can just scroll there after all. - */ - forw(sc_height-sindex+nline-1, bpos, 1, 0, 0); + /* + * See if the desired line is before or after + * the currently displayed screen. + */ + tpos = position(TOP); + bpos = position(BOTTOM_PLUS_ONE); + if (tpos == NULL_POSITION || pos >= tpos) + { + /* + * The desired line is after the current screen. + * Move back in the file far enough so that we can + * call forw() and put the desired line at the + * sline-th line on the screen. + */ + for (nline = 0; nline < sindex; nline++) + { + if (bpos != NULL_POSITION && pos <= bpos) + { + /* + * Surprise! The desired line is + * close enough to the current screen + * that we can just scroll there after all. + */ + forw(sc_height-sindex+nline-1, bpos, 1, 0, 0); #if HILITE_SEARCH - if (show_attn) - repaint_hilite(1); + if (show_attn) + repaint_hilite(1); #endif - return; - } - pos = back_line(pos); - if (pos == NULL_POSITION) - { - /* - * Oops. Ran into the beginning of the file. - * Exit the loop here and rely on forw() - * below to draw the required number of - * blank lines at the top of the screen. - */ - break; - } - } - lastmark(); - squished = 0; - screen_trashed = 0; - forw(sc_height-1, pos, 1, 0, sindex-nline); - } else - { - /* - * The desired line is before the current screen. - * Move forward in the file far enough so that we - * can call back() and put the desired line at the - * sindex-th line on the screen. - */ - for (nline = sindex; nline < sc_height - 1; nline++) - { - pos = forw_line(pos); - if (pos == NULL_POSITION) - { - /* - * Ran into end of file. - * This shouldn't normally happen, - * but may if there is some kind of read error. - */ - break; - } + return; + } + pos = back_line(pos); + if (pos == NULL_POSITION) + { + /* + * Oops. Ran into the beginning of the file. + * Exit the loop here and rely on forw() + * below to draw the required number of + * blank lines at the top of the screen. + */ + break; + } + } + lastmark(); + squished = 0; + screen_trashed = 0; + forw(sc_height-1, pos, 1, 0, sindex-nline); + } else + { + /* + * The desired line is before the current screen. + * Move forward in the file far enough so that we + * can call back() and put the desired line at the + * sindex-th line on the screen. + */ + for (nline = sindex; nline < sc_height - 1; nline++) + { + pos = forw_line(pos); + if (pos == NULL_POSITION) + { + /* + * Ran into end of file. + * This shouldn't normally happen, + * but may if there is some kind of read error. + */ + break; + } #if HILITE_SEARCH - pos = next_unfiltered(pos); + pos = next_unfiltered(pos); #endif - if (pos >= tpos) - { - /* - * Surprise! The desired line is - * close enough to the current screen - * that we can just scroll there after all. - */ - back(nline+1, tpos, 1, 0); + if (pos >= tpos) + { + /* + * Surprise! The desired line is + * close enough to the current screen + * that we can just scroll there after all. + */ + back(nline+1, tpos, 1, 0); #if HILITE_SEARCH - if (show_attn) - repaint_hilite(1); + if (show_attn) + repaint_hilite(1); #endif - return; - } - } - lastmark(); - if (!top_scroll) - clear(); - else - home(); - screen_trashed = 0; - add_back_pos(pos); - back(sc_height-1, pos, 1, 0); - } + return; + } + } + lastmark(); + if (!top_scroll) + clear(); + else + home(); + screen_trashed = 0; + add_back_pos(pos); + back(sc_height-1, pos, 1, 0); + } } diff --git a/less.h b/less.h index 43e2cc4..ccc3dfc 100644 --- a/less.h +++ b/less.h @@ -326,7 +326,7 @@ struct wchar_range LWCHAR first, last; }; -struct wchar_range_table +struct wchar_range_table { struct wchar_range *table; int count; @@ -412,12 +412,12 @@ struct wchar_range_table typedef enum { CT_NULL, CT_4BIT, CT_6BIT } COLOR_TYPE; typedef enum { - CV_BLUE = 1, - CV_GREEN = 2, - CV_RED = 4, - CV_BRIGHT = 8, - CV_NOCHANGE = -2, - CV_ERROR = -1 + CV_BLUE = 1, + CV_GREEN = 2, + CV_RED = 4, + CV_BRIGHT = 8, + CV_NOCHANGE = -2, + CV_ERROR = -1 } COLOR_VALUE; /* ANSI states */ diff --git a/less.hlp b/less.hlp index 5972578..e4c5769 100644 --- a/less.hlp +++ b/less.hlp @@ -66,9 +66,9 @@ ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>. ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_>. --------------------------------------------------- - Each "find close bracket" command goes forward to the close bracket + Each "find close bracket" command goes forward to the close bracket matching the (_N-th) open bracket in the top line. - Each "find open bracket" command goes backward to the open bracket + Each "find open bracket" command goes backward to the open bracket matching the (_N-th) close bracket in the bottom line. m_<_l_e_t_t_e_r_> Mark the current top line with . @@ -249,7 +249,7 @@ LLIINNEE EEDDIITTIINNGG - These keys can be used to edit text being entered + These keys can be used to edit text being entered on the "command line" at the bottom of the screen. RightArrow ..................... ESC-l ... Move cursor right one character. diff --git a/less.nro b/less.nro index b6dfa43..82a2f7e 100644 --- a/less.nro +++ b/less.nro @@ -122,7 +122,7 @@ To stop waiting for more data, enter the interrupt character (usually ^C). On some systems you can also use ^X. If the input is a pipe and the \-\-exit-follow-on-close option is in effect, .I less -will automatically stop waiting for data when the input side +will automatically stop waiting for data when the input side of the pipe is closed. .IP "ESC-F" Like F, but as soon as a line is found which matches @@ -577,7 +577,7 @@ The \-d option does not otherwise change the behavior of on a dumb terminal. .IP "\-D\fBx\fP\fIcolor\fP or \-\-color=\fBx\fP\fIcolor\fP" Changes the color of different parts of the displayed text. -\fBx\fP is a single character which selects the type of text +\fBx\fP is a single character which selects the type of text whose color is being set: .RS .IP "B" @@ -609,16 +609,16 @@ Standout text. .IP "u" Underlined text. .RE - + .RS The uppercase letters can be used only when the \-\-use-color option is enabled. When text color is specified by both an uppercase letter and a lowercase letter, -the uppercase letter takes precedence. +the uppercase letter takes precedence. For example, error messages are normally displayed as standout text. So if both "s" and "E" are given a color, the "E" color applies to error messages, and the "s" color applies to other standout text. -The "d" and "u" letters refer to bold and underline text formed by -overstriking with backspaces (see the \-u option), +The "d" and "u" letters refer to bold and underline text formed by +overstriking with backspaces (see the \-u option), not to text using ANSI escape sequences with the \-R option. .PP A lowercase letter may be followed by a + to indicate that @@ -629,8 +629,8 @@ But \-Du+g displays underlined text as both green and in underlined format. .PP \fIcolor\fP is either a 4-bit color string or an 8-bit color string: .PP -A 4-bit color string is zero, one or two characters, where -the first character specifies the foreground color and +A 4-bit color string is zero, one or two characters, where +the first character specifies the foreground color and the second specifies the background color as follows: .IP "b" Blue @@ -650,14 +650,14 @@ White Yellow .PP The corresponding upper-case letter denotes a brighter shade of the color. -For example, \-DNGk displays line numbers as bright green text on a black -background, and \-DEbR displays error messages as blue text on a +For example, \-DNGk displays line numbers as bright green text on a black +background, and \-DEbR displays error messages as blue text on a bright red background. -If either character is a "-" or is omitted, the corresponding color +If either character is a "-" or is omitted, the corresponding color is set to that of normal text. .PP An 8-bit color string is one or two decimal integers separated by a dot, -where the first integer specifies the foreground color and +where the first integer specifies the foreground color and the second specifies the background color. Each integer is a value between 0 and 255 inclusive which selects a "CSI 38;5" color value (see @@ -667,11 +667,11 @@ https://en.wikipedia.org/wiki/ANSI_escape_code#SGR) .hy If either integer is a "-" or is omitted, the corresponding color is set to that of normal text. -On MS-DOS versions of +On MS-DOS versions of .IR less , 8-bit color is not supported; instead, decimal values are interpreted as 4-bit CHAR_INFO.Attributes values -(see +(see .br .nh https://docs.microsoft.com/en-us/windows/console/char-info-str). @@ -776,9 +776,9 @@ file. .IP "\-\-lesskey-src=\fIfilename\fP" Causes .I less -to open and interpret the named file as a +to open and interpret the named file as a .IR lesskey (1) -source file. +source file. If the LESSKEYIN or LESSKEYIN_SYSTEM environment variable is set, or if a lesskey source file is found in a standard place (see KEY BINDINGS), it is also used as a @@ -786,9 +786,9 @@ it is also used as a file. Prior to version 582, the .I lesskey -program needed to be run to convert a +program needed to be run to convert a .I "lesskey source" -file to a +file to a .I "lesskey binary" file for .I less @@ -918,10 +918,10 @@ USE OF THE \-r OPTION IS NOT RECOMMENDED. Like \-r, but only ANSI "color" escape sequences and OSC 8 hyperlink sequences are output in "raw" form. Unlike \-r, the screen appearance is maintained correctly, -provided that there are no escape sequences in the file +provided that there are no escape sequences in the file other than these types of escape sequences. Color escape sequences are only supported when the color -is changed within one line, not across lines. +is changed within one line, not across lines. In other words, the beginning of each line is assumed to be normal (non-colored), regardless of any escape sequences in previous lines. For the purpose of keeping track of screen appearance, @@ -929,14 +929,14 @@ these escape sequences are assumed to not move the cursor. .sp OSC 8 hyperlinks are sequences of the form: .sp - ESC ] 8 ; \&...\& \\7 + ESC ] 8 ; \&...\& \\7 .sp -The terminating sequence may be either a BEL character (\\7) +The terminating sequence may be either a BEL character (\\7) or the two-character sequence "ESC \\". .sp ANSI color escape sequences are sequences of the form: .sp - ESC [ \&...\& m + ESC [ \&...\& m .sp where the "...\&" is zero or more color specification characters. You can make @@ -973,7 +973,7 @@ If the environment variable LESSGLOBALTAGS is set, it is taken to be the name of a command compatible with .IR global (1), and that command is executed to find the tag. -(See +(See .nh http://www.gnu.org/software/global/global.html). .hy @@ -1092,14 +1092,14 @@ of the screen width. .IP "\-\-exit-follow-on-close" When using the "F" command on a pipe, .I less -will automatically stop waiting for more data when the input side of the +will automatically stop waiting for more data when the input side of the pipe is closed. .IP "\-\-file-size" If \-\-file-size is specified, .I less -will determine the size of the file +will determine the size of the file immediately after opening the file. -Normally this is not done, because it can be slow if the input file +Normally this is not done, because it can be slow if the input file is non-seekable (such as a pipe) and is large. .IP "\-\-follow-name" Normally, if the input file is renamed while an F command is executing, @@ -1118,15 +1118,15 @@ will display the contents of that new file. Sets the number of header lines and columns displayed on the screen. The value may be of the form "N,M" where N and M are integers, to set the header lines to N and the header columns to M, -or it may be a single integer "N" which sets the header lines to N +or it may be a single integer "N" which sets the header lines to N and the header columns to zero. When N is nonzero, the first N lines at the top of the screen are replaced with the first N lines of the file, regardless of what part of the file are being viewed. -When M is nonzero, the characters displayed at the +When M is nonzero, the characters displayed at the beginning of each line are replaced with the first M characters of the line, even if the rest of the line is scrolled horizontally. -If either N or M is zero, +If either N or M is zero, .I less stops displaying header lines or columns, respectively. (Note that it may be necessary to change the setting of the \-j option @@ -1134,7 +1134,7 @@ to ensure that the target line is not obscured by the header line(s).) .IP "\-\-incsearch" Subsequent search commands will be "incremental"; that is, .I less -will advance to the next line containing the search pattern +will advance to the next line containing the search pattern as each character of the pattern is typed in. .IP "\-\-line-num-width" Sets the minimum width of the line number field when the \-N option is in effect. @@ -1176,7 +1176,7 @@ If set to "\-", truncated lines are not marked. When quitting, after sending the terminal deinitialization string, redraws the entire last screen. On terminals whose terminal deinitialization string causes the -terminal to switch from an alternate screen, +terminal to switch from an alternate screen, this makes the last screenful of the current file remain visible after .I less has quit. @@ -1185,7 +1185,7 @@ Save marks in the history file, so marks are retained across different invocations of .IR less . .IP "\-\-search-options" -Sets default search modifiers. +Sets default search modifiers. The value is a string of one or more of the characters E, F, K, N, R or W. Setting any of these has the same effect as typing that @@ -1210,9 +1210,9 @@ This allows a dollar sign to be included in option strings. .IP "\-\-use-color" Enables colored text in various places. The \-D option can be used to change the colors. -Colored text works only if the terminal supports +Colored text works only if the terminal supports ANSI color escape sequences (as defined in ECMA-48 SGR; -see +see .br .nh https://www.ecma-international.org/publications-and-standards/standards/ecma-48). @@ -1421,33 +1421,33 @@ view them directly: .PP lessopen.sh: .br - #! /bin/sh + #! /bin/sh .br - case "$1" in + case "$1" in .br - *.Z) TEMPFILE=$(mktemp) + *.Z) TEMPFILE=$(mktemp) .br - uncompress \-c $1 >$TEMPFILE 2>/dev/null + uncompress \-c $1 >$TEMPFILE 2>/dev/null .br - if [ \-s $TEMPFILE ]; then + if [ \-s $TEMPFILE ]; then .br - echo $TEMPFILE + echo $TEMPFILE .br - else + else .br - rm \-f $TEMPFILE + rm \-f $TEMPFILE .br - fi + fi .br - ;; + ;; .br - esac + esac .PP lessclose.sh: .br - #! /bin/sh + #! /bin/sh .br - rm $2 + rm $2 .PP To use these scripts, put them both where they can be executed and set LESSOPEN="lessopen.sh\ %s", and @@ -1480,21 +1480,21 @@ previous example scripts: .PP lesspipe.sh: .br - #! /bin/sh + #! /bin/sh .br - case "$1" in + case "$1" in .br - *.Z) uncompress \-c $1 2>/dev/null + *.Z) uncompress \-c $1 2>/dev/null .br - ;; + ;; .br - *) exit 1 + *) exit 1 .br - ;; + ;; .br - esac + esac .br - exit $? + exit $? .br .PP To use this script, put it where it can be executed and set @@ -1505,9 +1505,9 @@ is interpreted as meaning there is no replacement, and the original file is used. To avoid this, if LESSOPEN starts with two vertical bars, the exit status of the script determines the behavior when the output is empty. -If the output is empty and the exit status is zero, +If the output is empty and the exit status is zero, the empty output is considered to be replacement text. -If the output is empty and the exit status is nonzero, +If the output is empty and the exit status is nonzero, the original file is used. For compatibility with previous versions of .IR less , @@ -1607,16 +1607,16 @@ to each of the possible values for LESSCHARSET: .RS 5m .TS l l. -ascii 8bcccbcc18b95.b -dos 8bcccbcc12bc5b95.b. -ebcdic 5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b - 9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b. -IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc - 191.b -iso8859 8bcccbcc18b95.33b. -koi8-r 8bcccbcc18b95.b128. -latin1 8bcccbcc18b95.33b. -next 8bcccbcc18b95.bb125.bb +ascii 8bcccbcc18b95.b +dos 8bcccbcc12bc5b95.b. +ebcdic 5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b + 9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b. +IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc + 191.b +iso8859 8bcccbcc18b95.33b. +koi8-r 8bcccbcc18b95.b128. +latin1 8bcccbcc18b95.33b. +next 8bcccbcc18b95.bb125.bb .TE .RE .PP @@ -1831,17 +1831,17 @@ Each is broken into two lines here for readability only. .nf .sp ?n?f%f\ .?m(%T\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x.: - ?pB%pB\e%:byte\ %bB?s/%s...%t + ?pB%pB\e%:byte\ %bB?s/%s...%t .sp ?f%f\ .?n?m(%T\ %i\ of\ %m)\ ..?ltlines\ %lt-%lb?L/%L.\ : - byte\ %bB?s/%s.\ .?e(END)\ ?x-\ Next\e:\ %x.:?pB%pB\e%..%t + byte\ %bB?s/%s.\ .?e(END)\ ?x-\ Next\e:\ %x.:?pB%pB\e%..%t .sp .fi And here is the default message produced by the = command: .nf .sp ?f%f\ .?m(%T\ %i\ of\ %m)\ .?ltlines\ %lt-%lb?L/%L.\ . - byte\ %bB?s/%s.\ ?e(END)\ :?pB%pB\e%..%t + byte\ %bB?s/%s.\ ?e(END)\ :?pB%pB\e%..%t .fi .PP The prompt expansion features are also used for another purpose: @@ -1851,7 +1851,7 @@ The LESSEDIT string is expanded in the same way as the prompt strings. The default value for LESSEDIT is: .nf .sp - %E\ ?lm+%lm.\ %g + %E\ ?lm+%lm.\ %g .sp .fi Note that this expands to the editor name, followed by a + and the diff --git a/lessecho.c b/lessecho.c index 5cd660d..0ac4193 100644 --- a/lessecho.c +++ b/lessecho.c @@ -38,263 +38,263 @@ static char* metachars = NULL; static int num_metachars = 0; static int size_metachars = 0; - static void + static void pr_usage(VOID_PARAM) { - fprintf(stderr, - "usage: lessecho [-ox] [-cx] [-pn] [-dn] [-mx] [-nn] [-ex] [-fn] [-a] file ...\n"); + fprintf(stderr, + "usage: lessecho [-ox] [-cx] [-pn] [-dn] [-mx] [-nn] [-ex] [-fn] [-a] file ...\n"); } - static void + static void pr_version(VOID_PARAM) { - char *p; - char buf[10]; - char *pbuf = buf; + char *p; + char buf[10]; + char *pbuf = buf; - for (p = version; *p != ' '; p++) - if (*p == '\0') - return; - for (p++; *p != '$' && *p != ' ' && *p != '\0'; p++) - *pbuf++ = *p; - *pbuf = '\0'; - printf("%s\n", buf); + for (p = version; *p != ' '; p++) + if (*p == '\0') + return; + for (p++; *p != '$' && *p != ' ' && *p != '\0'; p++) + *pbuf++ = *p; + *pbuf = '\0'; + printf("%s\n", buf); } - static void + static void pr_error(s) - char *s; + char *s; { - fprintf(stderr, "%s\n", s); - exit(1); + fprintf(stderr, "%s\n", s); + exit(1); } - static long + static long lstrtol(s, radix, pend) - char *s; - int radix; - char **pend; + char *s; + int radix; + char **pend; { - int v; - int neg = 0; - long n = 0; + int v; + int neg = 0; + long n = 0; - /* Skip leading white space. */ - while (*s == ' ' || *s == '\t') - s++; + /* Skip leading white space. */ + while (*s == ' ' || *s == '\t') + s++; - /* Check for a leading + or -. */ - if (*s == '-') - { - neg = 1; - s++; - } else if (*s == '+') - { - s++; - } + /* Check for a leading + or -. */ + if (*s == '-') + { + neg = 1; + s++; + } else if (*s == '+') + { + s++; + } - /* Determine radix if caller does not specify. */ - if (radix == 0) - { - radix = 10; - if (*s == '0') - { - switch (*++s) - { - case 'x': - radix = 16; - s++; - break; - default: - radix = 8; - break; - } - } - } + /* Determine radix if caller does not specify. */ + if (radix == 0) + { + radix = 10; + if (*s == '0') + { + switch (*++s) + { + case 'x': + radix = 16; + s++; + break; + default: + radix = 8; + break; + } + } + } - /* Parse the digits of the number. */ - for (;;) - { - if (*s >= '0' && *s <= '9') - v = *s - '0'; - else if (*s >= 'a' && *s <= 'f') - v = *s - 'a' + 10; - else if (*s >= 'A' && *s <= 'F') - v = *s - 'A' + 10; - else - break; - if (v >= radix) - break; - n = n * radix + v; - s++; - } + /* Parse the digits of the number. */ + for (;;) + { + if (*s >= '0' && *s <= '9') + v = *s - '0'; + else if (*s >= 'a' && *s <= 'f') + v = *s - 'a' + 10; + else if (*s >= 'A' && *s <= 'F') + v = *s - 'A' + 10; + else + break; + if (v >= radix) + break; + n = n * radix + v; + s++; + } - if (pend != NULL) - { - /* Skip trailing white space. */ - while (*s == ' ' || *s == '\t') - s++; - *pend = s; - } - if (neg) - return (-n); - return (n); + if (pend != NULL) + { + /* Skip trailing white space. */ + while (*s == ' ' || *s == '\t') + s++; + *pend = s; + } + if (neg) + return (-n); + return (n); } - static void + static void add_metachar(ch) - int ch; + int ch; { - if (num_metachars+1 >= size_metachars) - { - char *p; - size_metachars = (size_metachars > 0) ? size_metachars*2 : 16; - p = (char *) malloc(size_metachars); - if (p == NULL) - pr_error("Cannot allocate memory"); + if (num_metachars+1 >= size_metachars) + { + char *p; + size_metachars = (size_metachars > 0) ? size_metachars*2 : 16; + p = (char *) malloc(size_metachars); + if (p == NULL) + pr_error("Cannot allocate memory"); - if (metachars != NULL) - { - strcpy(p, metachars); - free(metachars); - } - metachars = p; - } - metachars[num_metachars++] = ch; - metachars[num_metachars] = '\0'; + if (metachars != NULL) + { + strcpy(p, metachars); + free(metachars); + } + metachars = p; + } + metachars[num_metachars++] = ch; + metachars[num_metachars] = '\0'; } - static int + static int is_metachar(ch) - int ch; + int ch; { - return (metachars != NULL && strchr(metachars, ch) != NULL); + return (metachars != NULL && strchr(metachars, ch) != NULL); } #if !HAVE_STRCHR - char * + char * strchr(s, c) - char *s; - int c; + char *s; + int c; { - for ( ; *s != '\0'; s++) - if (*s == c) - return (s); - if (c == '\0') - return (s); - return (NULL); + for ( ; *s != '\0'; s++) + if (*s == c) + return (s); + if (c == '\0') + return (s); + return (NULL); } #endif - int + int main(argc, argv) - int argc; - char *argv[]; + int argc; + char *argv[]; { - char *arg; - char *s; - int no_more_options; + char *arg; + char *s; + int no_more_options; - no_more_options = 0; - while (--argc > 0) - { - arg = *++argv; - if (*arg != '-' || no_more_options) - break; - switch (*++arg) - { - case 'a': - quote_all = 1; - break; - case 'c': - closequote = *++arg; - break; - case 'd': - closequote = lstrtol(++arg, 0, &s); - if (s == arg) - pr_error("Missing number after -d"); - break; - case 'e': - if (strcmp(++arg, "-") == 0) - meta_escape = ""; - else - meta_escape = arg; - break; - case 'f': - meta_escape_buf[0] = lstrtol(++arg, 0, &s); - meta_escape_buf[1] = '\0'; - meta_escape = meta_escape_buf; - if (s == arg) - pr_error("Missing number after -f"); - break; - case 'o': - openquote = *++arg; - break; - case 'p': - openquote = lstrtol(++arg, 0, &s); - if (s == arg) - pr_error("Missing number after -p"); - break; - case 'm': - add_metachar(*++arg); - break; - case 'n': - add_metachar(lstrtol(++arg, 0, &s)); - if (s == arg) - pr_error("Missing number after -n"); - break; - case '?': - pr_usage(); - return (0); - case '-': - if (*++arg == '\0') - { - no_more_options = 1; - break; - } - if (strcmp(arg, "version") == 0) - { - pr_version(); - return (0); - } - if (strcmp(arg, "help") == 0) - { - pr_usage(); - return (0); - } - pr_error("Invalid option after --"); - default: - pr_error("Invalid option letter"); - } - } + no_more_options = 0; + while (--argc > 0) + { + arg = *++argv; + if (*arg != '-' || no_more_options) + break; + switch (*++arg) + { + case 'a': + quote_all = 1; + break; + case 'c': + closequote = *++arg; + break; + case 'd': + closequote = lstrtol(++arg, 0, &s); + if (s == arg) + pr_error("Missing number after -d"); + break; + case 'e': + if (strcmp(++arg, "-") == 0) + meta_escape = ""; + else + meta_escape = arg; + break; + case 'f': + meta_escape_buf[0] = lstrtol(++arg, 0, &s); + meta_escape_buf[1] = '\0'; + meta_escape = meta_escape_buf; + if (s == arg) + pr_error("Missing number after -f"); + break; + case 'o': + openquote = *++arg; + break; + case 'p': + openquote = lstrtol(++arg, 0, &s); + if (s == arg) + pr_error("Missing number after -p"); + break; + case 'm': + add_metachar(*++arg); + break; + case 'n': + add_metachar(lstrtol(++arg, 0, &s)); + if (s == arg) + pr_error("Missing number after -n"); + break; + case '?': + pr_usage(); + return (0); + case '-': + if (*++arg == '\0') + { + no_more_options = 1; + break; + } + if (strcmp(arg, "version") == 0) + { + pr_version(); + return (0); + } + if (strcmp(arg, "help") == 0) + { + pr_usage(); + return (0); + } + pr_error("Invalid option after --"); + default: + pr_error("Invalid option letter"); + } + } - while (argc-- > 0) - { - int has_meta = 0; - arg = *argv++; - for (s = arg; *s != '\0'; s++) - { - if (is_metachar(*s)) - { - has_meta = 1; - break; - } - } - if (quote_all || (has_meta && strlen(meta_escape) == 0)) - printf("%c%s%c", openquote, arg, closequote); - else - { - for (s = arg; *s != '\0'; s++) - { - if (is_metachar(*s)) - printf("%s", meta_escape); - printf("%c", *s); - } - } - if (argc > 0) - printf(" "); - else - printf("\n"); - } - return (0); + while (argc-- > 0) + { + int has_meta = 0; + arg = *argv++; + for (s = arg; *s != '\0'; s++) + { + if (is_metachar(*s)) + { + has_meta = 1; + break; + } + } + if (quote_all || (has_meta && strlen(meta_escape) == 0)) + printf("%c%s%c", openquote, arg, closequote); + else + { + for (s = arg; *s != '\0'; s++) + { + if (is_metachar(*s)) + printf("%s", meta_escape); + printf("%c", *s); + } + } + if (argc > 0) + printf(" "); + else + printf("\n"); + } + return (0); } diff --git a/lesskey.c b/lesskey.c index 39ebe8b..989ac76 100644 --- a/lesskey.c +++ b/lesskey.c @@ -11,7 +11,7 @@ /* * lesskey [-o output] [input] * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Make a .less file. * If no input file is specified, standard input is used. @@ -21,9 +21,9 @@ * key bindings. Basically any sequence of 1 to MAX_CMDLEN * keystrokes may be bound to an existing less function. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * The input file is an ascii file consisting of a + * The input file is an ascii file consisting of a * sequence of lines of the form: * string action [chars] * @@ -37,14 +37,14 @@ * to specify a character by its octal value. * 4. A backslash followed by b, e, n, r or t * to specify \b, ESC, \n, \r or \t, respectively. - * 5. Any character (other than those mentioned above) preceded + * 5. Any character (other than those mentioned above) preceded * by a \ to specify the character itself (characters which * must be preceded by \ include ^, \, and whitespace. * "action" is the name of a "less" action, from the table below. * "chars" is an optional sequence of characters which is treated * as keyboard input after the command is executed. * - * Blank lines and lines which start with # are ignored, + * Blank lines and lines which start with # are ignored, * except for the special control lines: * #command Signals the beginning of the command * keys section. @@ -55,7 +55,7 @@ * #stop Stops command parsing in less; * causes all default keys to be disabled. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * The output file is a non-ascii file, consisting of a header, * one or more sections, and a trailer. @@ -63,7 +63,7 @@ * and the section data. Normally there are three sections: * CMD_SECTION Definition of command keys. * EDIT_SECTION Definition of editing keys. - * END_SECTION A special section header, with no + * END_SECTION A special section header, with no * length word or section data. * * Section data consists of zero or more byte sequences of the form: @@ -77,7 +77,7 @@ * If action is ORed with A_EXTRA, the action byte is followed * by the null-terminated "chars" string. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include @@ -88,15 +88,15 @@ #include "defines.h" char fileheader[] = { - C0_LESSKEY_MAGIC, - C1_LESSKEY_MAGIC, - C2_LESSKEY_MAGIC, - C3_LESSKEY_MAGIC + C0_LESSKEY_MAGIC, + C1_LESSKEY_MAGIC, + C2_LESSKEY_MAGIC, + C3_LESSKEY_MAGIC }; char filetrailer[] = { - C0_END_LESSKEY_MAGIC, - C1_END_LESSKEY_MAGIC, - C2_END_LESSKEY_MAGIC + C0_END_LESSKEY_MAGIC, + C1_END_LESSKEY_MAGIC, + C2_END_LESSKEY_MAGIC }; char cmdsection[1] = { CMD_SECTION }; char editsection[1] = { EDIT_SECTION }; @@ -108,272 +108,272 @@ char *outfile = NULL ; extern char version[]; - static void + static void usage(void) { - fprintf(stderr, "usage: lesskey [-o output] [input]\n"); - exit(1); + fprintf(stderr, "usage: lesskey [-o output] [input]\n"); + exit(1); } - void + void lesskey_parse_error(s) - char *s; + char *s; { - fprintf(stderr, "%s\n", s); + fprintf(stderr, "%s\n", s); } - int + int lstrtoi(buf, ebuf) - char *buf; - char **ebuf; + char *buf; + char **ebuf; { - return (int) strtol(buf, ebuf, 10); + return (int) strtol(buf, ebuf, 10); } - void * + void * ecalloc(count, size) - int count; - unsigned int size; + int count; + unsigned int size; { - void *p; + void *p; - p = calloc(count, size); - if (p != NULL) - return (p); - fprintf(stderr, "lesskey: cannot allocate %d bytes of memory\n", count*size); - exit(1); + p = calloc(count, size); + if (p != NULL) + return (p); + fprintf(stderr, "lesskey: cannot allocate %d bytes of memory\n", count*size); + exit(1); } - static char * + static char * mkpathname(dirname, filename) - char *dirname; - char *filename; + char *dirname; + char *filename; { - char *pathname; + char *pathname; - pathname = ecalloc(strlen(dirname) + strlen(filename) + 2, sizeof(char)); - strcpy(pathname, dirname); - strcat(pathname, PATHNAME_SEP); - strcat(pathname, filename); - return (pathname); + pathname = ecalloc(strlen(dirname) + strlen(filename) + 2, sizeof(char)); + strcpy(pathname, dirname); + strcat(pathname, PATHNAME_SEP); + strcat(pathname, filename); + return (pathname); } /* * Figure out the name of a default file (in the user's HOME directory). */ - char * + char * homefile(filename) - char *filename; + char *filename; { - char *p; - char *pathname; + char *p; + char *pathname; - if ((p = getenv("HOME")) != NULL && *p != '\0') - pathname = mkpathname(p, filename); + if ((p = getenv("HOME")) != NULL && *p != '\0') + pathname = mkpathname(p, filename); #if OS2 - else if ((p = getenv("INIT")) != NULL && *p != '\0') - pathname = mkpathname(p, filename); + else if ((p = getenv("INIT")) != NULL && *p != '\0') + pathname = mkpathname(p, filename); #endif - else - { - fprintf(stderr, "cannot find $HOME - using current directory\n"); - pathname = mkpathname(".", filename); - } - return (pathname); + else + { + fprintf(stderr, "cannot find $HOME - using current directory\n"); + pathname = mkpathname(".", filename); + } + return (pathname); } /* * Parse command line arguments. */ - static void + static void parse_args(argc, argv) - int argc; - char **argv; + int argc; + char **argv; { - char *arg; + char *arg; - outfile = NULL; - while (--argc > 0) - { - arg = *++argv; - if (arg[0] != '-') - /* Arg does not start with "-"; it's not an option. */ - break; - if (arg[1] == '\0') - /* "-" means standard input. */ - break; - if (arg[1] == '-' && arg[2] == '\0') - { - /* "--" means end of options. */ - argc--; - argv++; - break; - } - switch (arg[1]) - { - case '-': - if (strncmp(arg, "--output", 8) == 0) - { - if (arg[8] == '\0') - outfile = &arg[8]; - else if (arg[8] == '=') - outfile = &arg[9]; - else - usage(); - goto opt_o; - } - if (strcmp(arg, "--version") == 0) - { - goto opt_V; - } - usage(); - break; - case 'o': - outfile = &argv[0][2]; - opt_o: - if (*outfile == '\0') - { - if (--argc <= 0) - usage(); - outfile = *(++argv); - } - break; - case 'V': - opt_V: - printf("lesskey version %s\n", version); - exit(0); - default: - usage(); - } - } - if (argc > 1) - usage(); - /* - * Open the input file, or use DEF_LESSKEYINFILE if none specified. - */ - if (argc > 0) - infile = *argv; + outfile = NULL; + while (--argc > 0) + { + arg = *++argv; + if (arg[0] != '-') + /* Arg does not start with "-"; it's not an option. */ + break; + if (arg[1] == '\0') + /* "-" means standard input. */ + break; + if (arg[1] == '-' && arg[2] == '\0') + { + /* "--" means end of options. */ + argc--; + argv++; + break; + } + switch (arg[1]) + { + case '-': + if (strncmp(arg, "--output", 8) == 0) + { + if (arg[8] == '\0') + outfile = &arg[8]; + else if (arg[8] == '=') + outfile = &arg[9]; + else + usage(); + goto opt_o; + } + if (strcmp(arg, "--version") == 0) + { + goto opt_V; + } + usage(); + break; + case 'o': + outfile = &argv[0][2]; + opt_o: + if (*outfile == '\0') + { + if (--argc <= 0) + usage(); + outfile = *(++argv); + } + break; + case 'V': + opt_V: + printf("lesskey version %s\n", version); + exit(0); + default: + usage(); + } + } + if (argc > 1) + usage(); + /* + * Open the input file, or use DEF_LESSKEYINFILE if none specified. + */ + if (argc > 0) + infile = *argv; } /* * Output some bytes. */ - static void + static void fputbytes(fd, buf, len) - FILE *fd; - char *buf; - int len; + FILE *fd; + char *buf; + int len; { - while (len-- > 0) - { - fwrite(buf, sizeof(char), 1, fd); - buf++; - } + while (len-- > 0) + { + fwrite(buf, sizeof(char), 1, fd); + buf++; + } } /* * Output an integer, in special KRADIX form. */ - static void + static void fputint(fd, val) - FILE *fd; - unsigned int val; + FILE *fd; + unsigned int val; { - char c; + char c; - if (val >= KRADIX*KRADIX) - { - fprintf(stderr, "error: cannot write %d, max %d\n", - val, KRADIX*KRADIX); - exit(1); - } - c = val % KRADIX; - fwrite(&c, sizeof(char), 1, fd); - c = val / KRADIX; - fwrite(&c, sizeof(char), 1, fd); + if (val >= KRADIX*KRADIX) + { + fprintf(stderr, "error: cannot write %d, max %d\n", + val, KRADIX*KRADIX); + exit(1); + } + c = val % KRADIX; + fwrite(&c, sizeof(char), 1, fd); + c = val / KRADIX; + fwrite(&c, sizeof(char), 1, fd); } - int + int main(argc, argv) - int argc; - char *argv[]; + int argc; + char *argv[]; { - struct lesskey_tables tables; - FILE *out; - int errors; + struct lesskey_tables tables; + FILE *out; + int errors; #ifdef WIN32 - if (getenv("HOME") == NULL) - { - /* - * If there is no HOME environment variable, - * try the concatenation of HOMEDRIVE + HOMEPATH. - */ - char *drive = getenv("HOMEDRIVE"); - char *path = getenv("HOMEPATH"); - if (drive != NULL && path != NULL) - { - char *env = (char *) ecalloc(strlen(drive) + - strlen(path) + 6, sizeof(char)); - strcpy(env, "HOME="); - strcat(env, drive); - strcat(env, path); - putenv(env); - } - } + if (getenv("HOME") == NULL) + { + /* + * If there is no HOME environment variable, + * try the concatenation of HOMEDRIVE + HOMEPATH. + */ + char *drive = getenv("HOMEDRIVE"); + char *path = getenv("HOMEPATH"); + if (drive != NULL && path != NULL) + { + char *env = (char *) ecalloc(strlen(drive) + + strlen(path) + 6, sizeof(char)); + strcpy(env, "HOME="); + strcat(env, drive); + strcat(env, path); + putenv(env); + } + } #endif /* WIN32 */ - /* - * Process command line arguments. - */ - parse_args(argc, argv); - errors = parse_lesskey(infile, &tables); - if (errors) - { - fprintf(stderr, "%d errors; no output produced\n", errors); - return (1); - } + /* + * Process command line arguments. + */ + parse_args(argc, argv); + errors = parse_lesskey(infile, &tables); + if (errors) + { + fprintf(stderr, "%d errors; no output produced\n", errors); + return (1); + } - fprintf(stderr, "NOTE: lesskey is deprecated.\n It is no longer necessary to run lesskey,\n when using less version 582 and later.\n"); + fprintf(stderr, "NOTE: lesskey is deprecated.\n It is no longer necessary to run lesskey,\n when using less version 582 and later.\n"); - /* - * Write the output file. - * If no output file was specified, use "$HOME/.less" - */ - if (outfile == NULL) - outfile = getenv("LESSKEY"); - if (outfile == NULL) - outfile = homefile(LESSKEYFILE); - if ((out = fopen(outfile, "wb")) == NULL) - { + /* + * Write the output file. + * If no output file was specified, use "$HOME/.less" + */ + if (outfile == NULL) + outfile = getenv("LESSKEY"); + if (outfile == NULL) + outfile = homefile(LESSKEYFILE); + if ((out = fopen(outfile, "wb")) == NULL) + { #if HAVE_PERROR - perror(outfile); + perror(outfile); #else - fprintf(stderr, "Cannot open %s\n", outfile); + fprintf(stderr, "Cannot open %s\n", outfile); #endif - return (1); - } + return (1); + } - /* File header */ - fputbytes(out, fileheader, sizeof(fileheader)); + /* File header */ + fputbytes(out, fileheader, sizeof(fileheader)); - /* Command key section */ - fputbytes(out, cmdsection, sizeof(cmdsection)); - fputint(out, tables.cmdtable.buf.end); - fputbytes(out, (char *)tables.cmdtable.buf.data, tables.cmdtable.buf.end); - /* Edit key section */ - fputbytes(out, editsection, sizeof(editsection)); - fputint(out, tables.edittable.buf.end); - fputbytes(out, (char *)tables.edittable.buf.data, tables.edittable.buf.end); + /* Command key section */ + fputbytes(out, cmdsection, sizeof(cmdsection)); + fputint(out, tables.cmdtable.buf.end); + fputbytes(out, (char *)tables.cmdtable.buf.data, tables.cmdtable.buf.end); + /* Edit key section */ + fputbytes(out, editsection, sizeof(editsection)); + fputint(out, tables.edittable.buf.end); + fputbytes(out, (char *)tables.edittable.buf.data, tables.edittable.buf.end); - /* Environment variable section */ - fputbytes(out, varsection, sizeof(varsection)); - fputint(out, tables.vartable.buf.end); - fputbytes(out, (char *)tables.vartable.buf.data, tables.vartable.buf.end); + /* Environment variable section */ + fputbytes(out, varsection, sizeof(varsection)); + fputint(out, tables.vartable.buf.end); + fputbytes(out, (char *)tables.vartable.buf.data, tables.vartable.buf.end); - /* File trailer */ - fputbytes(out, endsection, sizeof(endsection)); - fputbytes(out, filetrailer, sizeof(filetrailer)); - fclose(out); - return (0); + /* File trailer */ + fputbytes(out, endsection, sizeof(endsection)); + fputbytes(out, filetrailer, sizeof(filetrailer)); + fclose(out); + return (0); } diff --git a/lesskey.h b/lesskey.h index 988c6aa..94fd062 100644 --- a/lesskey.h +++ b/lesskey.h @@ -41,23 +41,23 @@ struct lesskey_cmdname { - char *cn_name; - int cn_action; + char *cn_name; + int cn_action; }; struct lesskey_table { - struct lesskey_cmdname *names; - struct xbuffer buf; - int is_var; + struct lesskey_cmdname *names; + struct xbuffer buf; + int is_var; }; struct lesskey_tables { - struct lesskey_table *currtable; - struct lesskey_table cmdtable; - struct lesskey_table edittable; - struct lesskey_table vartable; + struct lesskey_table *currtable; + struct lesskey_table cmdtable; + struct lesskey_table edittable; + struct lesskey_table vartable; }; extern int parse_lesskey(char *infile, struct lesskey_tables *tables); diff --git a/lesskey.nro b/lesskey.nro index 0e8cb1b..be3524b 100644 --- a/lesskey.nro +++ b/lesskey.nro @@ -11,17 +11,17 @@ lesskey \- customize key bindings for less .br .B "lesskey \-\-version" .SH SCOPE -This document describes the format of the +This document describes the format of the .I lesskey source file, which is used by .I less version 582 and later. -In previous versions of +In previous versions of .IR less , a separate program called .I lesskey -was used to compile the -.I lesskey +was used to compile the +.I lesskey source file into a format understood by .IR less . This compilation step is no longer required and the @@ -60,7 +60,7 @@ If the command section is the first section in the file, this line may be omitted. The command section consists of lines of the form: .sp - \fIstring\fP \fIaction\fP [extra-string] + \fIstring\fP \fIaction\fP [extra-string] .sp Whitespace is any sequence of one or more spaces and/or tabs. The \fIstring\fP is the command key(s) which invoke the action. @@ -75,33 +75,33 @@ characters as follows: .RS 5m .TS l l l. -\eb BACKSPACE (0x08) -\ee ESCAPE (0x1B) -\en NEWLINE (0x0A) -\er RETURN (0x0D) -\et TAB (0x09) +\eb BACKSPACE (0x08) +\ee ESCAPE (0x1B) +\en NEWLINE (0x0A) +\er RETURN (0x0D) +\et TAB (0x09) .TE .sp \ek followed by a single character represents the char(s) produced when one of these keys is pressed: .TS l l. -\ekb BACKSPACE (the BACKSPACE key) -\ekB ctrl-BACKSPACE -\ekd DOWN ARROW -\ekD PAGE DOWN -\eke END -\ekh HOME -\eki INSERT -\ekl LEFT ARROW -\ekL ctrl-LEFT ARROW -\ekr RIGHT ARROW -\ekR ctrl-RIGHT ARROW -\ekt BACKTAB -\eku UP ARROW -\ekU PAGE UP -\ekx DELETE -\ekX ctrl-DELETE -\ek1 F1 +\ekb BACKSPACE (the BACKSPACE key) +\ekB ctrl-BACKSPACE +\ekd DOWN ARROW +\ekD PAGE DOWN +\eke END +\ekh HOME +\eki INSERT +\ekl LEFT ARROW +\ekL ctrl-LEFT ARROW +\ekr RIGHT ARROW +\ekR ctrl-RIGHT ARROW +\ekt BACKTAB +\eku UP ARROW +\ekU PAGE UP +\ekx DELETE +\ekX ctrl-DELETE +\ek1 F1 .TE .PP @@ -126,7 +126,7 @@ quits, the first character of the extra string is used as its exit status. . .SH EXAMPLE The following input file describes the set of -default command keys used by +default command keys used by .IR less . Documentation on each command can be found in the .less @@ -136,126 +136,126 @@ man page, under the key sequence which invokes the command. .TS l l. #command -\er forw-line -\en forw-line -e forw-line -j forw-line -\ekd forw-line -^E forw-line -^N forw-line -k back-line -y back-line -^Y back-line -^K back-line -^P back-line -J forw-line-force -K back-line-force -Y back-line-force -d forw-scroll -^D forw-scroll -u back-scroll -^U back-scroll -\e40 forw-screen -f forw-screen -^F forw-screen -^V forw-screen -\ekD forw-screen -b back-screen -^B back-screen -\eev back-screen -\ekU back-screen -z forw-window -w back-window -\ee\e40 forw-screen-force -F forw-forever -\eeF forw-until-hilite -R repaint-flush -r repaint -^R repaint -^L repaint -\eeu undo-hilite -\eeU clear-search -g goto-line -\ekh goto-line -< goto-line -\ee< goto-line -p percent -% percent -\ee[ left-scroll -\ee] right-scroll -\ee( left-scroll -\ee) right-scroll -\ekl left-scroll -\ekr right-scroll -\ee{ no-scroll -\ee} end-scroll -{ forw-bracket {} -} back-bracket {} -( forw-bracket () -) back-bracket () -[ forw-bracket [] -] back-bracket [] -\ee^F forw-bracket -\ee^B back-bracket -G goto-end -\ee> goto-end -> goto-end -\eke goto-end -\eeG goto-end-buffered -\&= status -^G status -:f status -/ forw-search -? back-search -\ee/ forw-search * -\ee? back-search * -n repeat-search -\een repeat-search-all -N reverse-search -\eeN reverse-search-all -& filter -m set-mark -M set-mark-bottom -\eem clear-mark -' goto-mark -^X^X goto-mark -E examine -:e examine -^X^V examine -:n next-file -:p prev-file -t next-tag -T prev-tag -:x index-file -:d remove-file -- toggle-option -:t toggle-option t -s toggle-option o - ## Use a long option name by starting the extra string with ONE dash; eg: - ## s toggle-option -log-file\n -\&_ display-option -| pipe -v visual -! shell -+ firstcmd -H help -h help -V version -0 digit -1 digit -2 digit -3 digit -4 digit -5 digit -6 digit -7 digit -8 digit -9 digit -q quit -Q quit -:q quit -:Q quit -ZZ quit +\er forw-line +\en forw-line +e forw-line +j forw-line +\ekd forw-line +^E forw-line +^N forw-line +k back-line +y back-line +^Y back-line +^K back-line +^P back-line +J forw-line-force +K back-line-force +Y back-line-force +d forw-scroll +^D forw-scroll +u back-scroll +^U back-scroll +\e40 forw-screen +f forw-screen +^F forw-screen +^V forw-screen +\ekD forw-screen +b back-screen +^B back-screen +\eev back-screen +\ekU back-screen +z forw-window +w back-window +\ee\e40 forw-screen-force +F forw-forever +\eeF forw-until-hilite +R repaint-flush +r repaint +^R repaint +^L repaint +\eeu undo-hilite +\eeU clear-search +g goto-line +\ekh goto-line +< goto-line +\ee< goto-line +p percent +% percent +\ee[ left-scroll +\ee] right-scroll +\ee( left-scroll +\ee) right-scroll +\ekl left-scroll +\ekr right-scroll +\ee{ no-scroll +\ee} end-scroll +{ forw-bracket {} +} back-bracket {} +( forw-bracket () +) back-bracket () +[ forw-bracket [] +] back-bracket [] +\ee^F forw-bracket +\ee^B back-bracket +G goto-end +\ee> goto-end +> goto-end +\eke goto-end +\eeG goto-end-buffered +\&= status +^G status +:f status +/ forw-search +? back-search +\ee/ forw-search * +\ee? back-search * +n repeat-search +\een repeat-search-all +N reverse-search +\eeN reverse-search-all +& filter +m set-mark +M set-mark-bottom +\eem clear-mark +' goto-mark +^X^X goto-mark +E examine +:e examine +^X^V examine +:n next-file +:p prev-file +t next-tag +T prev-tag +:x index-file +:d remove-file +- toggle-option +:t toggle-option t +s toggle-option o + ## Use a long option name by starting the extra string with ONE dash; eg: + ## s toggle-option -log-file\n +\&_ display-option +| pipe +v visual +! shell ++ firstcmd +H help +h help +V version +0 digit +1 digit +2 digit +3 digit +4 digit +5 digit +6 digit +7 digit +8 digit +9 digit +q quit +Q quit +:q quit +:Q quit +ZZ quit .TE .RE .sp @@ -305,34 +305,34 @@ default line-editing keys used by .TS l l. #line-edit -\et forw-complete -\e17 back-complete -\ee\et back-complete -^L expand -^V literal -^A literal -\eel right -\ekr right -\eeh left -\ekl left -\eeb word-left -\ee\ekl word-left -\eew word-right -\ee\ekr word-right -\eei insert -\eex delete -\ekx delete -\eeX word-delete -\eekx word-delete -\ee\eb word-backspace -\ee0 home -\ekh home -\ee$ end -\eke end -\eek up -\eku up -\eej down -^G abort +\et forw-complete +\e17 back-complete +\ee\et back-complete +^L expand +^V literal +^A literal +\eel right +\ekr right +\eeh left +\ekl left +\eeb word-left +\ee\ekl word-left +\eew word-right +\ee\ekr word-right +\eei insert +\eex delete +\ekx delete +\eeX word-delete +\eekx word-delete +\ee\eb word-backspace +\ee0 home +\ekh home +\ee$ end +\eke end +\eek up +\eku up +\eej down +^G abort .TE .RE .sp @@ -370,7 +370,7 @@ matches the operator. This can be helpful if a lesskey file is used by different versions of .IR less . .sp -For example, suppose that a new command named 'sideways-search' is added in +For example, suppose that a new command named 'sideways-search' is added in .I less version 777. Then the following line would assign the command to the Q key, but only in versions of @@ -378,19 +378,19 @@ Then the following line would assign the command to the Q key, but only in versi which support it. The line would be ignored by versions earlier than 777. .sp .nf - #version >= 777 Q sideways-search + #version >= 777 Q sideways-search .fi .sp These six operators are supported: .RS 5m .TS l l. - > Greater than - < Less than - >= Greater than or equal to - <= Less than or equal to - = Equal to - != Not equal to + > Greater than + < Less than + >= Greater than or equal to + <= Less than or equal to + = Equal to + != Not equal to .TE .RE .sp @@ -407,9 +407,9 @@ The following input file sets the \-i and \-S options when is run and, on version 595 and higher, adds a \-\-color option. .sp .nf - #env - LESS = \-i\ \-S - #version\ >=\ 595\ \ LESS\ +=\ \-\-color=Hkc + #env + LESS = \-i\ \-S + #version\ >=\ 595\ \ LESS\ +=\ \-\-color=Hkc .fi . .SH "SEE ALSO" diff --git a/lesskey_parse.c b/lesskey_parse.c index 7042b6e..76466ce 100644 --- a/lesskey_parse.c +++ b/lesskey_parse.c @@ -29,384 +29,384 @@ static int errors; static int less_version = 0; static char *lesskey_file; -static struct lesskey_cmdname cmdnames[] = +static struct lesskey_cmdname cmdnames[] = { - { "back-bracket", A_B_BRACKET }, - { "back-line", A_B_LINE }, - { "back-line-force", A_BF_LINE }, - { "back-screen", A_B_SCREEN }, - { "back-scroll", A_B_SCROLL }, - { "back-search", A_B_SEARCH }, - { "back-window", A_B_WINDOW }, - { "clear-mark", A_CLRMARK }, - { "debug", A_DEBUG }, - { "digit", A_DIGIT }, - { "display-flag", A_DISP_OPTION }, - { "display-option", A_DISP_OPTION }, - { "end", A_GOEND }, - { "end-scroll", A_RRSHIFT }, - { "examine", A_EXAMINE }, - { "filter", A_FILTER }, - { "first-cmd", A_FIRSTCMD }, - { "firstcmd", A_FIRSTCMD }, - { "flush-repaint", A_FREPAINT }, - { "forw-bracket", A_F_BRACKET }, - { "forw-forever", A_F_FOREVER }, - { "forw-until-hilite", A_F_UNTIL_HILITE }, - { "forw-line", A_F_LINE }, - { "forw-line-force", A_FF_LINE }, - { "forw-screen", A_F_SCREEN }, - { "forw-screen-force", A_FF_SCREEN }, - { "forw-scroll", A_F_SCROLL }, - { "forw-search", A_F_SEARCH }, - { "forw-window", A_F_WINDOW }, - { "goto-end", A_GOEND }, - { "goto-end-buffered", A_GOEND_BUF }, - { "goto-line", A_GOLINE }, - { "goto-mark", A_GOMARK }, - { "help", A_HELP }, - { "index-file", A_INDEX_FILE }, - { "invalid", A_UINVALID }, - { "left-scroll", A_LSHIFT }, - { "next-file", A_NEXT_FILE }, - { "next-tag", A_NEXT_TAG }, - { "noaction", A_NOACTION }, - { "no-scroll", A_LLSHIFT }, - { "percent", A_PERCENT }, - { "pipe", A_PIPE }, - { "prev-file", A_PREV_FILE }, - { "prev-tag", A_PREV_TAG }, - { "quit", A_QUIT }, - { "remove-file", A_REMOVE_FILE }, - { "repaint", A_REPAINT }, - { "repaint-flush", A_FREPAINT }, - { "repeat-search", A_AGAIN_SEARCH }, - { "repeat-search-all", A_T_AGAIN_SEARCH }, - { "reverse-search", A_REVERSE_SEARCH }, - { "reverse-search-all", A_T_REVERSE_SEARCH }, - { "right-scroll", A_RSHIFT }, - { "set-mark", A_SETMARK }, - { "set-mark-bottom", A_SETMARKBOT }, - { "shell", A_SHELL }, - { "status", A_STAT }, - { "toggle-flag", A_OPT_TOGGLE }, - { "toggle-option", A_OPT_TOGGLE }, - { "undo-hilite", A_UNDO_SEARCH }, - { "clear-search", A_CLR_SEARCH }, - { "version", A_VERSION }, - { "visual", A_VISUAL }, - { NULL, 0 } + { "back-bracket", A_B_BRACKET }, + { "back-line", A_B_LINE }, + { "back-line-force", A_BF_LINE }, + { "back-screen", A_B_SCREEN }, + { "back-scroll", A_B_SCROLL }, + { "back-search", A_B_SEARCH }, + { "back-window", A_B_WINDOW }, + { "clear-mark", A_CLRMARK }, + { "debug", A_DEBUG }, + { "digit", A_DIGIT }, + { "display-flag", A_DISP_OPTION }, + { "display-option", A_DISP_OPTION }, + { "end", A_GOEND }, + { "end-scroll", A_RRSHIFT }, + { "examine", A_EXAMINE }, + { "filter", A_FILTER }, + { "first-cmd", A_FIRSTCMD }, + { "firstcmd", A_FIRSTCMD }, + { "flush-repaint", A_FREPAINT }, + { "forw-bracket", A_F_BRACKET }, + { "forw-forever", A_F_FOREVER }, + { "forw-until-hilite", A_F_UNTIL_HILITE }, + { "forw-line", A_F_LINE }, + { "forw-line-force", A_FF_LINE }, + { "forw-screen", A_F_SCREEN }, + { "forw-screen-force", A_FF_SCREEN }, + { "forw-scroll", A_F_SCROLL }, + { "forw-search", A_F_SEARCH }, + { "forw-window", A_F_WINDOW }, + { "goto-end", A_GOEND }, + { "goto-end-buffered", A_GOEND_BUF }, + { "goto-line", A_GOLINE }, + { "goto-mark", A_GOMARK }, + { "help", A_HELP }, + { "index-file", A_INDEX_FILE }, + { "invalid", A_UINVALID }, + { "left-scroll", A_LSHIFT }, + { "next-file", A_NEXT_FILE }, + { "next-tag", A_NEXT_TAG }, + { "noaction", A_NOACTION }, + { "no-scroll", A_LLSHIFT }, + { "percent", A_PERCENT }, + { "pipe", A_PIPE }, + { "prev-file", A_PREV_FILE }, + { "prev-tag", A_PREV_TAG }, + { "quit", A_QUIT }, + { "remove-file", A_REMOVE_FILE }, + { "repaint", A_REPAINT }, + { "repaint-flush", A_FREPAINT }, + { "repeat-search", A_AGAIN_SEARCH }, + { "repeat-search-all", A_T_AGAIN_SEARCH }, + { "reverse-search", A_REVERSE_SEARCH }, + { "reverse-search-all", A_T_REVERSE_SEARCH }, + { "right-scroll", A_RSHIFT }, + { "set-mark", A_SETMARK }, + { "set-mark-bottom", A_SETMARKBOT }, + { "shell", A_SHELL }, + { "status", A_STAT }, + { "toggle-flag", A_OPT_TOGGLE }, + { "toggle-option", A_OPT_TOGGLE }, + { "undo-hilite", A_UNDO_SEARCH }, + { "clear-search", A_CLR_SEARCH }, + { "version", A_VERSION }, + { "visual", A_VISUAL }, + { NULL, 0 } }; -static struct lesskey_cmdname editnames[] = +static struct lesskey_cmdname editnames[] = { - { "back-complete", EC_B_COMPLETE }, - { "backspace", EC_BACKSPACE }, - { "delete", EC_DELETE }, - { "down", EC_DOWN }, - { "end", EC_END }, - { "expand", EC_EXPAND }, - { "forw-complete", EC_F_COMPLETE }, - { "home", EC_HOME }, - { "insert", EC_INSERT }, - { "invalid", EC_UINVALID }, - { "kill-line", EC_LINEKILL }, - { "abort", EC_ABORT }, - { "left", EC_LEFT }, - { "literal", EC_LITERAL }, - { "right", EC_RIGHT }, - { "up", EC_UP }, - { "word-backspace", EC_W_BACKSPACE }, - { "word-delete", EC_W_DELETE }, - { "word-left", EC_W_LEFT }, - { "word-right", EC_W_RIGHT }, - { NULL, 0 } + { "back-complete", EC_B_COMPLETE }, + { "backspace", EC_BACKSPACE }, + { "delete", EC_DELETE }, + { "down", EC_DOWN }, + { "end", EC_END }, + { "expand", EC_EXPAND }, + { "forw-complete", EC_F_COMPLETE }, + { "home", EC_HOME }, + { "insert", EC_INSERT }, + { "invalid", EC_UINVALID }, + { "kill-line", EC_LINEKILL }, + { "abort", EC_ABORT }, + { "left", EC_LEFT }, + { "literal", EC_LITERAL }, + { "right", EC_RIGHT }, + { "up", EC_UP }, + { "word-backspace", EC_W_BACKSPACE }, + { "word-delete", EC_W_DELETE }, + { "word-left", EC_W_LEFT }, + { "word-right", EC_W_RIGHT }, + { NULL, 0 } }; /* * Print a parse error message. */ - static void + static void parse_error(fmt, arg1) - char *fmt; - char *arg1; + char *fmt; + char *arg1; { - char buf[1024]; - int n = snprintf(buf, sizeof(buf), "%s: line %d: ", lesskey_file, linenum); - if (n >= 0 && n < sizeof(buf)) - snprintf(buf+n, sizeof(buf)-n, fmt, arg1); - ++errors; - lesskey_parse_error(buf); + char buf[1024]; + int n = snprintf(buf, sizeof(buf), "%s: line %d: ", lesskey_file, linenum); + if (n >= 0 && n < sizeof(buf)) + snprintf(buf+n, sizeof(buf)-n, fmt, arg1); + ++errors; + lesskey_parse_error(buf); } /* * Initialize lesskey_tables. */ - static void + static void init_tables(tables) - struct lesskey_tables *tables; + struct lesskey_tables *tables; { - tables->currtable = &tables->cmdtable; + tables->currtable = &tables->cmdtable; - tables->cmdtable.names = cmdnames; - tables->cmdtable.is_var = 0; - xbuf_init(&tables->cmdtable.buf); + tables->cmdtable.names = cmdnames; + tables->cmdtable.is_var = 0; + xbuf_init(&tables->cmdtable.buf); - tables->edittable.names = editnames; - tables->edittable.is_var = 0; - xbuf_init(&tables->edittable.buf); + tables->edittable.names = editnames; + tables->edittable.is_var = 0; + xbuf_init(&tables->edittable.buf); - tables->vartable.names = NULL; - tables->vartable.is_var = 1; - xbuf_init(&tables->vartable.buf); + tables->vartable.names = NULL; + tables->vartable.is_var = 1; + xbuf_init(&tables->vartable.buf); } #define CHAR_STRING_LEN 8 - static char * + static char * char_string(buf, ch, lit) - char *buf; - int ch; - int lit; + char *buf; + int ch; + int lit; { - if (lit || (ch >= 0x20 && ch < 0x7f)) - { - buf[0] = ch; - buf[1] = '\0'; - } else - { - snprintf(buf, CHAR_STRING_LEN, "\\x%02x", ch); - } - return buf; + if (lit || (ch >= 0x20 && ch < 0x7f)) + { + buf[0] = ch; + buf[1] = '\0'; + } else + { + snprintf(buf, CHAR_STRING_LEN, "\\x%02x", ch); + } + return buf; } /* * Increment char pointer by one up to terminating nul byte. */ - static char * + static char * increment_pointer(p) - char *p; + char *p; { - if (*p == '\0') - return p; - return p+1; + if (*p == '\0') + return p; + return p+1; } /* * Parse one character of a string. */ - static char * + static char * tstr(pp, xlate) - char **pp; - int xlate; + char **pp; + int xlate; { - char *p; - char ch; - int i; - static char buf[CHAR_STRING_LEN]; - static char tstr_control_k[] = - { SK_SPECIAL_KEY, SK_CONTROL_K, 6, 1, 1, 1, '\0' }; - - p = *pp; - switch (*p) - { - case '\\': - ++p; - switch (*p) - { - case '0': case '1': case '2': case '3': - case '4': case '5': case '6': case '7': - /* - * Parse an octal number. - */ - ch = 0; - i = 0; - do - ch = 8*ch + (*p - '0'); - while (*++p >= '0' && *p <= '7' && ++i < 3); - *pp = p; - if (xlate && ch == CONTROL('K')) - return tstr_control_k; - return char_string(buf, ch, 1); - case 'b': - *pp = p+1; - return ("\b"); - case 'e': - *pp = p+1; - return char_string(buf, ESC, 1); - case 'n': - *pp = p+1; - return ("\n"); - case 'r': - *pp = p+1; - return ("\r"); - case 't': - *pp = p+1; - return ("\t"); - case 'k': - if (xlate) - { - switch (*++p) - { - case 'b': ch = SK_BACKSPACE; break; - case 'B': ch = SK_CTL_BACKSPACE; break; - case 'd': ch = SK_DOWN_ARROW; break; - case 'D': ch = SK_PAGE_DOWN; break; - case 'e': ch = SK_END; break; - case 'h': ch = SK_HOME; break; - case 'i': ch = SK_INSERT; break; - case 'l': ch = SK_LEFT_ARROW; break; - case 'L': ch = SK_CTL_LEFT_ARROW; break; - case 'r': ch = SK_RIGHT_ARROW; break; - case 'R': ch = SK_CTL_RIGHT_ARROW; break; - case 't': ch = SK_BACKTAB; break; - case 'u': ch = SK_UP_ARROW; break; - case 'U': ch = SK_PAGE_UP; break; - case 'x': ch = SK_DELETE; break; - case 'X': ch = SK_CTL_DELETE; break; - case '1': ch = SK_F1; break; - default: - parse_error("invalid escape sequence \"\\k%s\"", char_string(buf, *p, 0)); - *pp = increment_pointer(p); - return (""); - } - *pp = p+1; - buf[0] = SK_SPECIAL_KEY; - buf[1] = ch; - buf[2] = 6; - buf[3] = 1; - buf[4] = 1; - buf[5] = 1; - buf[6] = '\0'; - return (buf); - } - /* FALLTHRU */ - default: - /* - * Backslash followed by any other char - * just means that char. - */ - *pp = increment_pointer(p); - char_string(buf, *p, 1); - if (xlate && buf[0] == CONTROL('K')) - return tstr_control_k; - return (buf); - } - case '^': - /* - * Caret means CONTROL. - */ - *pp = increment_pointer(p+1); - char_string(buf, CONTROL(p[1]), 1); - if (xlate && buf[0] == CONTROL('K')) - return tstr_control_k; - return (buf); - } - *pp = increment_pointer(p); - char_string(buf, *p, 1); - if (xlate && buf[0] == CONTROL('K')) - return tstr_control_k; - return (buf); + char *p; + char ch; + int i; + static char buf[CHAR_STRING_LEN]; + static char tstr_control_k[] = + { SK_SPECIAL_KEY, SK_CONTROL_K, 6, 1, 1, 1, '\0' }; + + p = *pp; + switch (*p) + { + case '\\': + ++p; + switch (*p) + { + case '0': case '1': case '2': case '3': + case '4': case '5': case '6': case '7': + /* + * Parse an octal number. + */ + ch = 0; + i = 0; + do + ch = 8*ch + (*p - '0'); + while (*++p >= '0' && *p <= '7' && ++i < 3); + *pp = p; + if (xlate && ch == CONTROL('K')) + return tstr_control_k; + return char_string(buf, ch, 1); + case 'b': + *pp = p+1; + return ("\b"); + case 'e': + *pp = p+1; + return char_string(buf, ESC, 1); + case 'n': + *pp = p+1; + return ("\n"); + case 'r': + *pp = p+1; + return ("\r"); + case 't': + *pp = p+1; + return ("\t"); + case 'k': + if (xlate) + { + switch (*++p) + { + case 'b': ch = SK_BACKSPACE; break; + case 'B': ch = SK_CTL_BACKSPACE; break; + case 'd': ch = SK_DOWN_ARROW; break; + case 'D': ch = SK_PAGE_DOWN; break; + case 'e': ch = SK_END; break; + case 'h': ch = SK_HOME; break; + case 'i': ch = SK_INSERT; break; + case 'l': ch = SK_LEFT_ARROW; break; + case 'L': ch = SK_CTL_LEFT_ARROW; break; + case 'r': ch = SK_RIGHT_ARROW; break; + case 'R': ch = SK_CTL_RIGHT_ARROW; break; + case 't': ch = SK_BACKTAB; break; + case 'u': ch = SK_UP_ARROW; break; + case 'U': ch = SK_PAGE_UP; break; + case 'x': ch = SK_DELETE; break; + case 'X': ch = SK_CTL_DELETE; break; + case '1': ch = SK_F1; break; + default: + parse_error("invalid escape sequence \"\\k%s\"", char_string(buf, *p, 0)); + *pp = increment_pointer(p); + return (""); + } + *pp = p+1; + buf[0] = SK_SPECIAL_KEY; + buf[1] = ch; + buf[2] = 6; + buf[3] = 1; + buf[4] = 1; + buf[5] = 1; + buf[6] = '\0'; + return (buf); + } + /* FALLTHRU */ + default: + /* + * Backslash followed by any other char + * just means that char. + */ + *pp = increment_pointer(p); + char_string(buf, *p, 1); + if (xlate && buf[0] == CONTROL('K')) + return tstr_control_k; + return (buf); + } + case '^': + /* + * Caret means CONTROL. + */ + *pp = increment_pointer(p+1); + char_string(buf, CONTROL(p[1]), 1); + if (xlate && buf[0] == CONTROL('K')) + return tstr_control_k; + return (buf); + } + *pp = increment_pointer(p); + char_string(buf, *p, 1); + if (xlate && buf[0] == CONTROL('K')) + return tstr_control_k; + return (buf); } - static int + static int issp(ch) - char ch; + char ch; { - return (ch == ' ' || ch == '\t'); + return (ch == ' ' || ch == '\t'); } /* * Skip leading spaces in a string. */ - static char * + static char * skipsp(s) - char *s; + char *s; { - while (issp(*s)) - s++; - return (s); + while (issp(*s)) + s++; + return (s); } /* * Skip non-space characters in a string. */ - static char * + static char * skipnsp(s) - char *s; + char *s; { - while (*s != '\0' && !issp(*s)) - s++; - return (s); + while (*s != '\0' && !issp(*s)) + s++; + return (s); } /* * Clean up an input line: * strip off the trailing newline & any trailing # comment. */ - static char * + static char * clean_line(s) - char *s; + char *s; { - int i; - - s = skipsp(s); - for (i = 0; s[i] != '\0' && s[i] != '\n' && s[i] != '\r'; i++) - if (s[i] == '#' && (i == 0 || s[i-1] != '\\')) - break; - s[i] = '\0'; - return (s); + int i; + + s = skipsp(s); + for (i = 0; s[i] != '\0' && s[i] != '\n' && s[i] != '\r'; i++) + if (s[i] == '#' && (i == 0 || s[i-1] != '\\')) + break; + s[i] = '\0'; + return (s); } /* * Add a byte to the output command table. */ - static void + static void add_cmd_char(c, tables) - int c; - struct lesskey_tables *tables; + int c; + struct lesskey_tables *tables; { - xbuf_add(&tables->currtable->buf, c); + xbuf_add(&tables->currtable->buf, c); } - static void + static void erase_cmd_char(tables) - struct lesskey_tables *tables; + struct lesskey_tables *tables; { - xbuf_pop(&tables->currtable->buf); + xbuf_pop(&tables->currtable->buf); } /* * Add a string to the output command table. */ - static void + static void add_cmd_str(s, tables) - char *s; - struct lesskey_tables *tables; + char *s; + struct lesskey_tables *tables; { - for ( ; *s != '\0'; s++) - add_cmd_char(*s, tables); + for ( ; *s != '\0'; s++) + add_cmd_char(*s, tables); } /* * Does a given version number match the running version? * Operator compares the running version to the given version. */ - static int + static int match_version(op, ver) - char op; - int ver; + char op; + int ver; { - switch (op) - { - case '>': return less_version > ver; - case '<': return less_version < ver; - case '+': return less_version >= ver; - case '-': return less_version <= ver; - case '=': return less_version == ver; - case '!': return less_version != ver; - default: return 0; /* cannot happen */ - } + switch (op) + { + case '>': return less_version > ver; + case '<': return less_version < ver; + case '+': return less_version >= ver; + case '-': return less_version <= ver; + case '=': return less_version == ver; + case '!': return less_version != ver; + default: return 0; /* cannot happen */ + } } /* @@ -414,291 +414,291 @@ match_version(op, ver) * If the version matches, return the part of the line that should be executed. * Otherwise, return NULL. */ - static char * + static char * version_line(s, tables) - char *s; - struct lesskey_tables *tables; + char *s; + struct lesskey_tables *tables; { - char op; - int ver; - char *e; - char buf[CHAR_STRING_LEN]; - - s += strlen("#version"); - s = skipsp(s); - op = *s++; - /* Simplify 2-char op to one char. */ - switch (op) - { - case '<': if (*s == '=') { s++; op = '-'; } break; - case '>': if (*s == '=') { s++; op = '+'; } break; - case '=': if (*s == '=') { s++; } break; - case '!': if (*s == '=') { s++; } break; - default: - parse_error("invalid operator '%s' in #version line", char_string(buf, op, 0)); - return (NULL); - } - s = skipsp(s); - ver = lstrtoi(s, &e); - if (e == s) - { - parse_error("non-numeric version number in #version line", ""); - return (NULL); - } - if (!match_version(op, ver)) - return (NULL); - return (e); + char op; + int ver; + char *e; + char buf[CHAR_STRING_LEN]; + + s += strlen("#version"); + s = skipsp(s); + op = *s++; + /* Simplify 2-char op to one char. */ + switch (op) + { + case '<': if (*s == '=') { s++; op = '-'; } break; + case '>': if (*s == '=') { s++; op = '+'; } break; + case '=': if (*s == '=') { s++; } break; + case '!': if (*s == '=') { s++; } break; + default: + parse_error("invalid operator '%s' in #version line", char_string(buf, op, 0)); + return (NULL); + } + s = skipsp(s); + ver = lstrtoi(s, &e); + if (e == s) + { + parse_error("non-numeric version number in #version line", ""); + return (NULL); + } + if (!match_version(op, ver)) + return (NULL); + return (e); } /* * See if we have a special "control" line. */ - static char * + static char * control_line(s, tables) - char *s; - struct lesskey_tables *tables; + char *s; + struct lesskey_tables *tables; { #define PREFIX(str,pat) (strncmp(str,pat,strlen(pat)) == 0) - if (PREFIX(s, "#line-edit")) - { - tables->currtable = &tables->edittable; - return (NULL); - } - if (PREFIX(s, "#command")) - { - tables->currtable = &tables->cmdtable; - return (NULL); - } - if (PREFIX(s, "#env")) - { - tables->currtable = &tables->vartable; - return (NULL); - } - if (PREFIX(s, "#stop")) - { - add_cmd_char('\0', tables); - add_cmd_char(A_END_LIST, tables); - return (NULL); - } - if (PREFIX(s, "#version")) - { - return (version_line(s, tables)); - } - return (s); + if (PREFIX(s, "#line-edit")) + { + tables->currtable = &tables->edittable; + return (NULL); + } + if (PREFIX(s, "#command")) + { + tables->currtable = &tables->cmdtable; + return (NULL); + } + if (PREFIX(s, "#env")) + { + tables->currtable = &tables->vartable; + return (NULL); + } + if (PREFIX(s, "#stop")) + { + add_cmd_char('\0', tables); + add_cmd_char(A_END_LIST, tables); + return (NULL); + } + if (PREFIX(s, "#version")) + { + return (version_line(s, tables)); + } + return (s); } /* * Find an action, given the name of the action. */ - static int + static int findaction(actname, tables) - char *actname; - struct lesskey_tables *tables; + char *actname; + struct lesskey_tables *tables; { - int i; + int i; - for (i = 0; tables->currtable->names[i].cn_name != NULL; i++) - if (strcmp(tables->currtable->names[i].cn_name, actname) == 0) - return (tables->currtable->names[i].cn_action); - parse_error("unknown action: \"%s\"", actname); - return (A_INVALID); + for (i = 0; tables->currtable->names[i].cn_name != NULL; i++) + if (strcmp(tables->currtable->names[i].cn_name, actname) == 0) + return (tables->currtable->names[i].cn_action); + parse_error("unknown action: \"%s\"", actname); + return (A_INVALID); } /* * Parse a line describing one key binding, of the form * KEY ACTION [EXTRA] - * where KEY is the user key sequence, ACTION is the + * where KEY is the user key sequence, ACTION is the * resulting less action, and EXTRA is an "extra" user * key sequence injected after the action. */ - static void + static void parse_cmdline(p, tables) - char *p; - struct lesskey_tables *tables; + char *p; + struct lesskey_tables *tables; { - char *actname; - int action; - char *s; - char c; - - /* - * Parse the command string and store it in the current table. - */ - do - { - s = tstr(&p, 1); - add_cmd_str(s, tables); - } while (*p != '\0' && !issp(*p)); - /* - * Terminate the command string with a null byte. - */ - add_cmd_char('\0', tables); - - /* - * Skip white space between the command string - * and the action name. - * Terminate the action name with a null byte. - */ - p = skipsp(p); - if (*p == '\0') - { - parse_error("missing action", ""); - return; - } - actname = p; - p = skipnsp(p); - c = *p; - *p = '\0'; - - /* - * Parse the action name and store it in the current table. - */ - action = findaction(actname, tables); - - /* - * See if an extra string follows the action name. - */ - *p = c; - p = skipsp(p); - if (*p == '\0') - { - add_cmd_char(action, tables); - } else - { - /* - * OR the special value A_EXTRA into the action byte. - * Put the extra string after the action byte. - */ - add_cmd_char(action | A_EXTRA, tables); - while (*p != '\0') - add_cmd_str(tstr(&p, 0), tables); - add_cmd_char('\0', tables); - } + char *actname; + int action; + char *s; + char c; + + /* + * Parse the command string and store it in the current table. + */ + do + { + s = tstr(&p, 1); + add_cmd_str(s, tables); + } while (*p != '\0' && !issp(*p)); + /* + * Terminate the command string with a null byte. + */ + add_cmd_char('\0', tables); + + /* + * Skip white space between the command string + * and the action name. + * Terminate the action name with a null byte. + */ + p = skipsp(p); + if (*p == '\0') + { + parse_error("missing action", ""); + return; + } + actname = p; + p = skipnsp(p); + c = *p; + *p = '\0'; + + /* + * Parse the action name and store it in the current table. + */ + action = findaction(actname, tables); + + /* + * See if an extra string follows the action name. + */ + *p = c; + p = skipsp(p); + if (*p == '\0') + { + add_cmd_char(action, tables); + } else + { + /* + * OR the special value A_EXTRA into the action byte. + * Put the extra string after the action byte. + */ + add_cmd_char(action | A_EXTRA, tables); + while (*p != '\0') + add_cmd_str(tstr(&p, 0), tables); + add_cmd_char('\0', tables); + } } /* * Parse a variable definition line, of the form * NAME = VALUE */ - static void + static void parse_varline(line, tables) - char *line; - struct lesskey_tables *tables; + char *line; + struct lesskey_tables *tables; { - char *s; - char *p = line; - char *eq; - - eq = strchr(line, '='); - if (eq != NULL && eq > line && eq[-1] == '+') - { - /* - * Rather ugly way of handling a += line. - * {{ Note that we ignore the variable name and - * just append to the previously defined variable. }} - */ - erase_cmd_char(tables); /* backspace over the final null */ - p = eq+1; - } else - { - do - { - s = tstr(&p, 0); - add_cmd_str(s, tables); - } while (*p != '\0' && !issp(*p) && *p != '='); - /* - * Terminate the variable name with a null byte. - */ - add_cmd_char('\0', tables); - p = skipsp(p); - if (*p++ != '=') - { - parse_error("missing = in variable definition", ""); - return; - } - add_cmd_char(EV_OK|A_EXTRA, tables); - } - p = skipsp(p); - while (*p != '\0') - { - s = tstr(&p, 0); - add_cmd_str(s, tables); - } - add_cmd_char('\0', tables); + char *s; + char *p = line; + char *eq; + + eq = strchr(line, '='); + if (eq != NULL && eq > line && eq[-1] == '+') + { + /* + * Rather ugly way of handling a += line. + * {{ Note that we ignore the variable name and + * just append to the previously defined variable. }} + */ + erase_cmd_char(tables); /* backspace over the final null */ + p = eq+1; + } else + { + do + { + s = tstr(&p, 0); + add_cmd_str(s, tables); + } while (*p != '\0' && !issp(*p) && *p != '='); + /* + * Terminate the variable name with a null byte. + */ + add_cmd_char('\0', tables); + p = skipsp(p); + if (*p++ != '=') + { + parse_error("missing = in variable definition", ""); + return; + } + add_cmd_char(EV_OK|A_EXTRA, tables); + } + p = skipsp(p); + while (*p != '\0') + { + s = tstr(&p, 0); + add_cmd_str(s, tables); + } + add_cmd_char('\0', tables); } /* * Parse a line from the lesskey file. */ - static void + static void parse_line(line, tables) - char *line; - struct lesskey_tables *tables; + char *line; + struct lesskey_tables *tables; { - char *p; - - /* - * See if it is a control line. - */ - p = control_line(line, tables); - if (p == NULL) - return; - /* - * Skip leading white space. - * Replace the final newline with a null byte. - * Ignore blank lines and comments. - */ - p = clean_line(p); - if (*p == '\0') - return; - - if (tables->currtable->is_var) - parse_varline(p, tables); - else - parse_cmdline(p, tables); + char *p; + + /* + * See if it is a control line. + */ + p = control_line(line, tables); + if (p == NULL) + return; + /* + * Skip leading white space. + * Replace the final newline with a null byte. + * Ignore blank lines and comments. + */ + p = clean_line(p); + if (*p == '\0') + return; + + if (tables->currtable->is_var) + parse_varline(p, tables); + else + parse_cmdline(p, tables); } /* * Parse a lesskey source file and store result in tables. */ - int + int parse_lesskey(infile, tables) - char *infile; - struct lesskey_tables *tables; + char *infile; + struct lesskey_tables *tables; { - FILE *desc; - char line[1024]; - - if (infile == NULL) - infile = homefile(DEF_LESSKEYINFILE); - lesskey_file = infile; - - init_tables(tables); - errors = 0; - linenum = 0; - if (less_version == 0) - less_version = lstrtoi(version, NULL); - - /* - * Open the input file. - */ - if (strcmp(infile, "-") == 0) - desc = stdin; - else if ((desc = fopen(infile, "r")) == NULL) - { - /* parse_error("cannot open lesskey file %s", infile); */ - return (-1); - } - - /* - * Read and parse the input file, one line at a time. - */ - while (fgets(line, sizeof(line), desc) != NULL) - { - ++linenum; - parse_line(line, tables); - } - fclose(desc); - return (errors); + FILE *desc; + char line[1024]; + + if (infile == NULL) + infile = homefile(DEF_LESSKEYINFILE); + lesskey_file = infile; + + init_tables(tables); + errors = 0; + linenum = 0; + if (less_version == 0) + less_version = lstrtoi(version, NULL); + + /* + * Open the input file. + */ + if (strcmp(infile, "-") == 0) + desc = stdin; + else if ((desc = fopen(infile, "r")) == NULL) + { + /* parse_error("cannot open lesskey file %s", infile); */ + return (-1); + } + + /* + * Read and parse the input file, one line at a time. + */ + while (fgets(line, sizeof(line), desc) != NULL) + { + ++linenum; + parse_line(line, tables); + } + fclose(desc); + return (errors); } diff --git a/line.c b/line.c index 2f1b3fb..217f6c7 100644 --- a/line.c +++ b/line.c @@ -24,18 +24,18 @@ #define MAX_PFX_WIDTH (MAX_LINENUM_WIDTH + MAX_STATUSCOL_WIDTH + 1) static struct { - char *buf; /* Buffer which holds the current output line */ - int *attr; /* Parallel to buf, to hold attributes */ - int print; /* Index in buf of first printable char */ - int end; /* Number of chars in buf */ - char pfx[MAX_PFX_WIDTH]; /* Holds status column and line number */ - int pfx_attr[MAX_PFX_WIDTH]; - int pfx_end; /* Number of chars in pfx */ + char *buf; /* Buffer which holds the current output line */ + int *attr; /* Parallel to buf, to hold attributes */ + int print; /* Index in buf of first printable char */ + int end; /* Number of chars in buf */ + char pfx[MAX_PFX_WIDTH]; /* Holds status column and line number */ + int pfx_attr[MAX_PFX_WIDTH]; + int pfx_end; /* Number of chars in pfx */ } linebuf; /* - * Buffer of ansi sequences which have been shifted off the left edge - * of the screen. + * Buffer of ansi sequences which have been shifted off the left edge + * of the screen. */ struct xbuffer shifted_ansi; @@ -108,353 +108,353 @@ static POSITION mbc_pos; /* Configurable color map */ static char color_map[AT_NUM_COLORS][12] = { - "Wm", /* AT_COLOR_ATTN */ - "kR", /* AT_COLOR_BIN */ - "kR", /* AT_COLOR_CTRL */ - "kY", /* AT_COLOR_ERROR */ - "c", /* AT_COLOR_LINENUM */ - "Wb", /* AT_COLOR_MARK */ - "kC", /* AT_COLOR_PROMPT */ - "kc", /* AT_COLOR_RSCROLL */ - "kG", /* AT_COLOR_SEARCH */ - "", /* AT_COLOR_HEADER */ - "", /* AT_UNDERLINE */ - "", /* AT_BOLD */ - "", /* AT_BLINK */ - "", /* AT_STANDOUT */ + "Wm", /* AT_COLOR_ATTN */ + "kR", /* AT_COLOR_BIN */ + "kR", /* AT_COLOR_CTRL */ + "kY", /* AT_COLOR_ERROR */ + "c", /* AT_COLOR_LINENUM */ + "Wb", /* AT_COLOR_MARK */ + "kC", /* AT_COLOR_PROMPT */ + "kc", /* AT_COLOR_RSCROLL */ + "kG", /* AT_COLOR_SEARCH */ + "", /* AT_COLOR_HEADER */ + "", /* AT_UNDERLINE */ + "", /* AT_BOLD */ + "", /* AT_BLINK */ + "", /* AT_STANDOUT */ }; /* State while processing an ANSI escape sequence */ struct ansi_state { - int hindex; /* Index into hyperlink prefix */ - int hlink; /* Processing hyperlink address? */ - int prev_esc; /* Prev char was ESC (to detect ESC-\ seq) */ + int hindex; /* Index into hyperlink prefix */ + int hlink; /* Processing hyperlink address? */ + int prev_esc; /* Prev char was ESC (to detect ESC-\ seq) */ }; /* * Initialize from environment variables. */ - public void + public void init_line(VOID_PARAM) { - int ax; - - end_ansi_chars = lgetenv("LESSANSIENDCHARS"); - if (isnullenv(end_ansi_chars)) - end_ansi_chars = "m"; - - mid_ansi_chars = lgetenv("LESSANSIMIDCHARS"); - if (isnullenv(mid_ansi_chars)) - mid_ansi_chars = "0123456789:;[?!\"'#%()*+ "; - - linebuf.buf = (char *) ecalloc(LINEBUF_SIZE, sizeof(char)); - linebuf.attr = (int *) ecalloc(LINEBUF_SIZE, sizeof(int)); - size_linebuf = LINEBUF_SIZE; - xbuf_init(&shifted_ansi); - xbuf_init(&last_ansi); - for (ax = 0; ax < NUM_LAST_ANSIS; ax++) - xbuf_init(&last_ansis[ax]); - curr_last_ansi = 0; + int ax; + + end_ansi_chars = lgetenv("LESSANSIENDCHARS"); + if (isnullenv(end_ansi_chars)) + end_ansi_chars = "m"; + + mid_ansi_chars = lgetenv("LESSANSIMIDCHARS"); + if (isnullenv(mid_ansi_chars)) + mid_ansi_chars = "0123456789:;[?!\"'#%()*+ "; + + linebuf.buf = (char *) ecalloc(LINEBUF_SIZE, sizeof(char)); + linebuf.attr = (int *) ecalloc(LINEBUF_SIZE, sizeof(int)); + size_linebuf = LINEBUF_SIZE; + xbuf_init(&shifted_ansi); + xbuf_init(&last_ansi); + for (ax = 0; ax < NUM_LAST_ANSIS; ax++) + xbuf_init(&last_ansis[ax]); + curr_last_ansi = 0; } /* * Expand the line buffer. */ - static int + static int expand_linebuf(VOID_PARAM) { - /* Double the size of the line buffer. */ - int new_size = size_linebuf * 2; - char *new_buf = (char *) calloc(new_size, sizeof(char)); - int *new_attr = (int *) calloc(new_size, sizeof(int)); - if (new_buf == NULL || new_attr == NULL) - { - if (new_attr != NULL) - free(new_attr); - if (new_buf != NULL) - free(new_buf); - return 1; - } - /* - * We just calloc'd the buffers; copy the old contents. - */ - memcpy(new_buf, linebuf.buf, size_linebuf * sizeof(char)); - memcpy(new_attr, linebuf.attr, size_linebuf * sizeof(int)); - free(linebuf.attr); - free(linebuf.buf); - linebuf.buf = new_buf; - linebuf.attr = new_attr; - size_linebuf = new_size; - return 0; + /* Double the size of the line buffer. */ + int new_size = size_linebuf * 2; + char *new_buf = (char *) calloc(new_size, sizeof(char)); + int *new_attr = (int *) calloc(new_size, sizeof(int)); + if (new_buf == NULL || new_attr == NULL) + { + if (new_attr != NULL) + free(new_attr); + if (new_buf != NULL) + free(new_buf); + return 1; + } + /* + * We just calloc'd the buffers; copy the old contents. + */ + memcpy(new_buf, linebuf.buf, size_linebuf * sizeof(char)); + memcpy(new_attr, linebuf.attr, size_linebuf * sizeof(int)); + free(linebuf.attr); + free(linebuf.buf); + linebuf.buf = new_buf; + linebuf.attr = new_attr; + size_linebuf = new_size; + return 0; } /* * Is a character ASCII? */ - public int + public int is_ascii_char(ch) - LWCHAR ch; + LWCHAR ch; { - return (ch <= 0x7F); + return (ch <= 0x7F); } /* */ - static void + static void inc_end_column(w) - int w; + int w; { - if (end_column > right_column && w > 0) - { - right_column = end_column; - right_curr = linebuf.end; - } - end_column += w; + if (end_column > right_column && w > 0) + { + right_column = end_column; + right_curr = linebuf.end; + } + end_column += w; } /* * Rewind the line buffer. */ - public void + public void prewind(VOID_PARAM) { - int ax; - - linebuf.print = 6; /* big enough for longest UTF-8 sequence */ - linebuf.pfx_end = 0; - for (linebuf.end = 0; linebuf.end < linebuf.print; linebuf.end++) - { - linebuf.buf[linebuf.end] = '\0'; - linebuf.attr[linebuf.end] = 0; - } - - end_column = 0; - right_curr = 0; - right_column = 0; - cshift = 0; - overstrike = 0; - last_overstrike = AT_NORMAL; - mbc_buf_len = 0; - is_null_line = 0; - pendc = '\0'; - in_hilite = 0; - ansi_in_line = 0; - hlink_in_line = 0; - line_mark_attr = 0; - xbuf_reset(&shifted_ansi); - xbuf_reset(&last_ansi); - for (ax = 0; ax < NUM_LAST_ANSIS; ax++) - xbuf_reset(&last_ansis[ax]); - curr_last_ansi = 0; + int ax; + + linebuf.print = 6; /* big enough for longest UTF-8 sequence */ + linebuf.pfx_end = 0; + for (linebuf.end = 0; linebuf.end < linebuf.print; linebuf.end++) + { + linebuf.buf[linebuf.end] = '\0'; + linebuf.attr[linebuf.end] = 0; + } + + end_column = 0; + right_curr = 0; + right_column = 0; + cshift = 0; + overstrike = 0; + last_overstrike = AT_NORMAL; + mbc_buf_len = 0; + is_null_line = 0; + pendc = '\0'; + in_hilite = 0; + ansi_in_line = 0; + hlink_in_line = 0; + line_mark_attr = 0; + xbuf_reset(&shifted_ansi); + xbuf_reset(&last_ansi); + for (ax = 0; ax < NUM_LAST_ANSIS; ax++) + xbuf_reset(&last_ansis[ax]); + curr_last_ansi = 0; } /* * Set a character in the line buffer. */ - static void + static void set_linebuf(n, ch, attr) - int n; - char ch; - int attr; + int n; + char ch; + int attr; { - linebuf.buf[n] = ch; - linebuf.attr[n] = attr; + linebuf.buf[n] = ch; + linebuf.attr[n] = attr; } /* * Append a character to the line buffer. */ - static void + static void add_linebuf(ch, attr, w) - char ch; - int attr; - int w; + char ch; + int attr; + int w; { - set_linebuf(linebuf.end++, ch, attr); - inc_end_column(w); + set_linebuf(linebuf.end++, ch, attr); + inc_end_column(w); } /* * Append a string to the line buffer. */ - static void + static void addstr_linebuf(s, attr, cw) - char *s; - int attr; - int cw; + char *s; + int attr; + int cw; { - for ( ; *s != '\0'; s++) - add_linebuf(*s, attr, cw); + for ( ; *s != '\0'; s++) + add_linebuf(*s, attr, cw); } /* * Set a character in the line prefix buffer. */ - static void + static void set_pfx(n, ch, attr) - int n; - char ch; - int attr; + int n; + char ch; + int attr; { - linebuf.pfx[n] = ch; - linebuf.pfx_attr[n] = attr; + linebuf.pfx[n] = ch; + linebuf.pfx_attr[n] = attr; } /* * Append a character to the line prefix buffer. */ - static void + static void add_pfx(ch, attr) - char ch; - int attr; + char ch; + int attr; { - set_pfx(linebuf.pfx_end++, ch, attr); + set_pfx(linebuf.pfx_end++, ch, attr); } /* * Insert the status column and line number into the line buffer. */ - public void + public void plinestart(pos) - POSITION pos; + POSITION pos; { - LINENUM linenum = 0; - int i; - - if (linenums == OPT_ONPLUS) - { - /* - * Get the line number and put it in the current line. - * {{ Note: since find_linenum calls forw_raw_line, - * it may seek in the input file, requiring the caller - * of plinestart to re-seek if necessary. }} - * {{ Since forw_raw_line modifies linebuf, we must - * do this first, before storing anything in linebuf. }} - */ - linenum = find_linenum(pos); - } - - /* - * Display a status column if the -J option is set. - */ - if (status_col || status_line) - { - char c = posmark(pos); - if (c != 0) - line_mark_attr = AT_HILITE|AT_COLOR_MARK; - else if (start_attnpos != NULL_POSITION && - pos >= start_attnpos && pos <= end_attnpos) - line_mark_attr = AT_HILITE|AT_COLOR_ATTN; - if (status_col) - { - add_pfx(c ? c : ' ', line_mark_attr); /* column 0: status */ - while (linebuf.pfx_end < status_col_width) - add_pfx(' ', AT_NORMAL); - } - } - - /* - * Display the line number at the start of each line - * if the -N option is set. - */ - if (linenums == OPT_ONPLUS) - { - char buf[INT_STRLEN_BOUND(linenum) + 2]; - int len; - - linenum = vlinenum(linenum); - if (linenum == 0) - len = 0; - else - { - linenumtoa(linenum, buf); - len = (int) strlen(buf); - } - for (i = 0; i < linenum_width - len; i++) - add_pfx(' ', AT_NORMAL); - for (i = 0; i < len; i++) - add_pfx(buf[i], AT_BOLD|AT_COLOR_LINENUM); - add_pfx(' ', AT_NORMAL); - } - end_column = linebuf.pfx_end; + LINENUM linenum = 0; + int i; + + if (linenums == OPT_ONPLUS) + { + /* + * Get the line number and put it in the current line. + * {{ Note: since find_linenum calls forw_raw_line, + * it may seek in the input file, requiring the caller + * of plinestart to re-seek if necessary. }} + * {{ Since forw_raw_line modifies linebuf, we must + * do this first, before storing anything in linebuf. }} + */ + linenum = find_linenum(pos); + } + + /* + * Display a status column if the -J option is set. + */ + if (status_col || status_line) + { + char c = posmark(pos); + if (c != 0) + line_mark_attr = AT_HILITE|AT_COLOR_MARK; + else if (start_attnpos != NULL_POSITION && + pos >= start_attnpos && pos <= end_attnpos) + line_mark_attr = AT_HILITE|AT_COLOR_ATTN; + if (status_col) + { + add_pfx(c ? c : ' ', line_mark_attr); /* column 0: status */ + while (linebuf.pfx_end < status_col_width) + add_pfx(' ', AT_NORMAL); + } + } + + /* + * Display the line number at the start of each line + * if the -N option is set. + */ + if (linenums == OPT_ONPLUS) + { + char buf[INT_STRLEN_BOUND(linenum) + 2]; + int len; + + linenum = vlinenum(linenum); + if (linenum == 0) + len = 0; + else + { + linenumtoa(linenum, buf); + len = (int) strlen(buf); + } + for (i = 0; i < linenum_width - len; i++) + add_pfx(' ', AT_NORMAL); + for (i = 0; i < len; i++) + add_pfx(buf[i], AT_BOLD|AT_COLOR_LINENUM); + add_pfx(' ', AT_NORMAL); + } + end_column = linebuf.pfx_end; } /* * Return the width of the line prefix (status column and line number). * {{ Actual line number can be wider than linenum_width. }} */ - public int + public int line_pfx_width(VOID_PARAM) { - int width = 0; - if (status_col) - width += status_col_width; - if (linenums == OPT_ONPLUS) - width += linenum_width + 1; - return width; + int width = 0; + if (status_col) + width += status_col_width; + if (linenums == OPT_ONPLUS) + width += linenum_width + 1; + return width; } /* * Shift line left so that the last char is just to the left * of the first visible column. */ - public void + public void pshift_all(VOID_PARAM) { - int i; - for (i = linebuf.print; i < linebuf.end; i++) - if (linebuf.attr[i] == AT_ANSI) - xbuf_add(&shifted_ansi, linebuf.buf[i]); - linebuf.end = linebuf.print; - end_column = linebuf.pfx_end; + int i; + for (i = linebuf.print; i < linebuf.end; i++) + if (linebuf.attr[i] == AT_ANSI) + xbuf_add(&shifted_ansi, linebuf.buf[i]); + linebuf.end = linebuf.print; + end_column = linebuf.pfx_end; } /* * Return the printing width of the start (enter) sequence * for a given character attribute. */ - static int + static int attr_swidth(a) - int a; + int a; { - int w = 0; + int w = 0; - a = apply_at_specials(a); + a = apply_at_specials(a); - if (a & AT_UNDERLINE) - w += ul_s_width; - if (a & AT_BOLD) - w += bo_s_width; - if (a & AT_BLINK) - w += bl_s_width; - if (a & AT_STANDOUT) - w += so_s_width; + if (a & AT_UNDERLINE) + w += ul_s_width; + if (a & AT_BOLD) + w += bo_s_width; + if (a & AT_BLINK) + w += bl_s_width; + if (a & AT_STANDOUT) + w += so_s_width; - return w; + return w; } /* * Return the printing width of the end (exit) sequence * for a given character attribute. */ - static int + static int attr_ewidth(a) - int a; + int a; { - int w = 0; + int w = 0; - a = apply_at_specials(a); + a = apply_at_specials(a); - if (a & AT_UNDERLINE) - w += ul_e_width; - if (a & AT_BOLD) - w += bo_e_width; - if (a & AT_BLINK) - w += bl_e_width; - if (a & AT_STANDOUT) - w += so_e_width; + if (a & AT_UNDERLINE) + w += ul_e_width; + if (a & AT_BOLD) + w += bo_e_width; + if (a & AT_BLINK) + w += bl_e_width; + if (a & AT_STANDOUT) + w += so_e_width; - return w; + return w; } /* @@ -463,392 +463,392 @@ attr_ewidth(a) * Adding a character with a given attribute may cause an enter or exit * attribute sequence to be inserted, so this must be taken into account. */ - public int + public int pwidth(ch, a, prev_ch, prev_a) - LWCHAR ch; - int a; - LWCHAR prev_ch; - int prev_a; + LWCHAR ch; + int a; + LWCHAR prev_ch; + int prev_a; { - int w; - - if (ch == '\b') - { - /* - * Backspace moves backwards one or two positions. - */ - if (prev_a & (AT_ANSI|AT_BINARY)) - return strlen(prchar('\b')); - return (utf_mode && is_wide_char(prev_ch)) ? -2 : -1; - } - - if (!utf_mode || is_ascii_char(ch)) - { - if (control_char((char)ch)) - { - /* - * Control characters do unpredictable things, - * so we don't even try to guess; say it doesn't move. - * This can only happen if the -r flag is in effect. - */ - return (0); - } - } else - { - if (is_composing_char(ch) || is_combining_char(prev_ch, ch)) - { - /* - * Composing and combining chars take up no space. - * - * Some terminals, upon failure to compose a - * composing character with the character(s) that - * precede(s) it will actually take up one end_column - * for the composing character; there isn't much - * we could do short of testing the (complex) - * composition process ourselves and printing - * a binary representation when it fails. - */ - return (0); - } - } - - /* - * Other characters take one or two columns, - * plus the width of any attribute enter/exit sequence. - */ - w = 1; - if (is_wide_char(ch)) - w++; - if (linebuf.end > 0 && !is_at_equiv(linebuf.attr[linebuf.end-1], a)) - w += attr_ewidth(linebuf.attr[linebuf.end-1]); - if (apply_at_specials(a) != AT_NORMAL && - (linebuf.end == 0 || !is_at_equiv(linebuf.attr[linebuf.end-1], a))) - w += attr_swidth(a); - return (w); + int w; + + if (ch == '\b') + { + /* + * Backspace moves backwards one or two positions. + */ + if (prev_a & (AT_ANSI|AT_BINARY)) + return strlen(prchar('\b')); + return (utf_mode && is_wide_char(prev_ch)) ? -2 : -1; + } + + if (!utf_mode || is_ascii_char(ch)) + { + if (control_char((char)ch)) + { + /* + * Control characters do unpredictable things, + * so we don't even try to guess; say it doesn't move. + * This can only happen if the -r flag is in effect. + */ + return (0); + } + } else + { + if (is_composing_char(ch) || is_combining_char(prev_ch, ch)) + { + /* + * Composing and combining chars take up no space. + * + * Some terminals, upon failure to compose a + * composing character with the character(s) that + * precede(s) it will actually take up one end_column + * for the composing character; there isn't much + * we could do short of testing the (complex) + * composition process ourselves and printing + * a binary representation when it fails. + */ + return (0); + } + } + + /* + * Other characters take one or two columns, + * plus the width of any attribute enter/exit sequence. + */ + w = 1; + if (is_wide_char(ch)) + w++; + if (linebuf.end > 0 && !is_at_equiv(linebuf.attr[linebuf.end-1], a)) + w += attr_ewidth(linebuf.attr[linebuf.end-1]); + if (apply_at_specials(a) != AT_NORMAL && + (linebuf.end == 0 || !is_at_equiv(linebuf.attr[linebuf.end-1], a))) + w += attr_swidth(a); + return (w); } /* * Delete to the previous base character in the line buffer. */ - static int + static int backc(VOID_PARAM) { - LWCHAR ch; - char *p; - - if (linebuf.end == 0) - return (0); - p = &linebuf.buf[linebuf.end]; - ch = step_char(&p, -1, linebuf.buf); - /* Skip back to the next nonzero-width char. */ - while (p > linebuf.buf) - { - LWCHAR prev_ch; - int width; - linebuf.end = (int) (p - linebuf.buf); - prev_ch = step_char(&p, -1, linebuf.buf); - width = pwidth(ch, linebuf.attr[linebuf.end], prev_ch, linebuf.attr[linebuf.end-1]); - end_column -= width; - /* {{ right_column? }} */ - if (width > 0) - break; - ch = prev_ch; - } - return (1); + LWCHAR ch; + char *p; + + if (linebuf.end == 0) + return (0); + p = &linebuf.buf[linebuf.end]; + ch = step_char(&p, -1, linebuf.buf); + /* Skip back to the next nonzero-width char. */ + while (p > linebuf.buf) + { + LWCHAR prev_ch; + int width; + linebuf.end = (int) (p - linebuf.buf); + prev_ch = step_char(&p, -1, linebuf.buf); + width = pwidth(ch, linebuf.attr[linebuf.end], prev_ch, linebuf.attr[linebuf.end-1]); + end_column -= width; + /* {{ right_column? }} */ + if (width > 0) + break; + ch = prev_ch; + } + return (1); } /* * Is a character the end of an ANSI escape sequence? */ - public int + public int is_ansi_end(ch) - LWCHAR ch; + LWCHAR ch; { - if (!is_ascii_char(ch)) - return (0); - return (strchr(end_ansi_chars, (char) ch) != NULL); + if (!is_ascii_char(ch)) + return (0); + return (strchr(end_ansi_chars, (char) ch) != NULL); } /* * Can a char appear in an ANSI escape sequence, before the end char? */ - public int + public int is_ansi_middle(ch) - LWCHAR ch; + LWCHAR ch; { - if (!is_ascii_char(ch)) - return (0); - if (is_ansi_end(ch)) - return (0); - return (strchr(mid_ansi_chars, (char) ch) != NULL); + if (!is_ascii_char(ch)) + return (0); + if (is_ansi_end(ch)) + return (0); + return (strchr(mid_ansi_chars, (char) ch) != NULL); } /* * Skip past an ANSI escape sequence. * pp is initially positioned just after the CSI_START char. */ - public void + public void skip_ansi(pansi, pp, limit) - struct ansi_state *pansi; - char **pp; - constant char *limit; + struct ansi_state *pansi; + char **pp; + constant char *limit; { - LWCHAR c; - do { - c = step_char(pp, +1, limit); - } while (*pp < limit && ansi_step(pansi, c) == ANSI_MID); - /* Note that we discard final char, for which is_ansi_end is true. */ + LWCHAR c; + do { + c = step_char(pp, +1, limit); + } while (*pp < limit && ansi_step(pansi, c) == ANSI_MID); + /* Note that we discard final char, for which is_ansi_end is true. */ } /* * Determine if a character starts an ANSI escape sequence. * If so, return an ansi_state struct; otherwise return NULL. */ - public struct ansi_state * + public struct ansi_state * ansi_start(ch) - LWCHAR ch; + LWCHAR ch; { - struct ansi_state *pansi; - - if (!IS_CSI_START(ch)) - return NULL; - pansi = ecalloc(1, sizeof(struct ansi_state)); - pansi->hindex = 0; - pansi->hlink = 0; - pansi->prev_esc = 0; - return pansi; + struct ansi_state *pansi; + + if (!IS_CSI_START(ch)) + return NULL; + pansi = ecalloc(1, sizeof(struct ansi_state)); + pansi->hindex = 0; + pansi->hlink = 0; + pansi->prev_esc = 0; + return pansi; } /* * Determine whether the next char in an ANSI escape sequence * ends the sequence. */ - public int + public int ansi_step(pansi, ch) - struct ansi_state *pansi; - LWCHAR ch; + struct ansi_state *pansi; + LWCHAR ch; { - if (pansi->hlink) - { - /* Hyperlink ends with \7 or ESC-backslash. */ - if (ch == '\7') - return ANSI_END; - if (pansi->prev_esc && ch == '\\') - return ANSI_END; - pansi->prev_esc = (ch == ESC); - return ANSI_MID; - } - if (pansi->hindex >= 0) - { - static char hlink_prefix[] = ESCS "]8;"; - if (ch == hlink_prefix[pansi->hindex] || - (pansi->hindex == 0 && IS_CSI_START(ch))) - { - pansi->hindex++; - if (hlink_prefix[pansi->hindex] == '\0') - pansi->hlink = 1; /* now processing hyperlink addr */ - return ANSI_MID; - } - pansi->hindex = -1; /* not a hyperlink */ - } - /* Check for SGR sequences */ - if (is_ansi_middle(ch)) - return ANSI_MID; - if (is_ansi_end(ch)) - return ANSI_END; - return ANSI_ERR; + if (pansi->hlink) + { + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; + if (pansi->prev_esc && ch == '\\') + return ANSI_END; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } + if (pansi->hindex >= 0) + { + static char hlink_prefix[] = ESCS "]8;"; + if (ch == hlink_prefix[pansi->hindex] || + (pansi->hindex == 0 && IS_CSI_START(ch))) + { + pansi->hindex++; + if (hlink_prefix[pansi->hindex] == '\0') + pansi->hlink = 1; /* now processing hyperlink addr */ + return ANSI_MID; + } + pansi->hindex = -1; /* not a hyperlink */ + } + /* Check for SGR sequences */ + if (is_ansi_middle(ch)) + return ANSI_MID; + if (is_ansi_end(ch)) + return ANSI_END; + return ANSI_ERR; } /* * Free an ansi_state structure. */ - public void + public void ansi_done(pansi) - struct ansi_state *pansi; + struct ansi_state *pansi; { - free(pansi); + free(pansi); } /* * Will w characters in attribute a fit on the screen? */ - static int + static int fits_on_screen(w, a) - int w; - int a; + int w; + int a; { - if (ctldisp == OPT_ON) - /* We're not counting, so say that everything fits. */ - return 1; - return (end_column - cshift + w + attr_ewidth(a) <= sc_width); + if (ctldisp == OPT_ON) + /* We're not counting, so say that everything fits. */ + return 1; + return (end_column - cshift + w + attr_ewidth(a) <= sc_width); } /* * Append a character and attribute to the line buffer. */ #define STORE_CHAR(ch,a,rep,pos) \ - do { \ - if (store_char((ch),(a),(rep),(pos))) return (1); \ - } while (0) + do { \ + if (store_char((ch),(a),(rep),(pos))) return (1); \ + } while (0) - static int + static int store_char(ch, a, rep, pos) - LWCHAR ch; - int a; - char *rep; - POSITION pos; + LWCHAR ch; + int a; + char *rep; + POSITION pos; { - int w; - int i; - int replen; - char cs; + int w; + int i; + int replen; + char cs; - i = (a & (AT_UNDERLINE|AT_BOLD)); - if (i != AT_NORMAL) - last_overstrike = i; + i = (a & (AT_UNDERLINE|AT_BOLD)); + if (i != AT_NORMAL) + last_overstrike = i; #if HILITE_SEARCH - { - int matches; - int resend_last = 0; - int hl_attr; - - if (pos == NULL_POSITION) - { - /* Color the prompt unless it has ansi sequences in it. */ - hl_attr = ansi_in_line ? 0 : AT_STANDOUT|AT_COLOR_PROMPT; - } else - { - hl_attr = is_hilited_attr(pos, pos+1, 0, &matches); - if (hl_attr == 0 && status_line) - hl_attr = line_mark_attr; - } - if (hl_attr) - { - /* - * This character should be highlighted. - * Override the attribute passed in. - */ - if (a != AT_ANSI) - { - if (highest_hilite != NULL_POSITION && pos != NULL_POSITION && pos > highest_hilite) - highest_hilite = pos; - a |= hl_attr; - } - in_hilite = 1; - } else - { - if (in_hilite) - { - /* - * This is the first non-hilited char after a hilite. - * Resend the last ANSI seq to restore color. - */ - resend_last = 1; - } - in_hilite = 0; - } - if (resend_last) - { - int ai; - for (ai = 0; ai < NUM_LAST_ANSIS; ai++) - { - int ax = (curr_last_ansi + ai) % NUM_LAST_ANSIS; - for (i = 0; i < last_ansis[ax].end; i++) - STORE_CHAR(last_ansis[ax].data[i], AT_ANSI, NULL, pos); - } - } - } + { + int matches; + int resend_last = 0; + int hl_attr; + + if (pos == NULL_POSITION) + { + /* Color the prompt unless it has ansi sequences in it. */ + hl_attr = ansi_in_line ? 0 : AT_STANDOUT|AT_COLOR_PROMPT; + } else + { + hl_attr = is_hilited_attr(pos, pos+1, 0, &matches); + if (hl_attr == 0 && status_line) + hl_attr = line_mark_attr; + } + if (hl_attr) + { + /* + * This character should be highlighted. + * Override the attribute passed in. + */ + if (a != AT_ANSI) + { + if (highest_hilite != NULL_POSITION && pos != NULL_POSITION && pos > highest_hilite) + highest_hilite = pos; + a |= hl_attr; + } + in_hilite = 1; + } else + { + if (in_hilite) + { + /* + * This is the first non-hilited char after a hilite. + * Resend the last ANSI seq to restore color. + */ + resend_last = 1; + } + in_hilite = 0; + } + if (resend_last) + { + int ai; + for (ai = 0; ai < NUM_LAST_ANSIS; ai++) + { + int ax = (curr_last_ansi + ai) % NUM_LAST_ANSIS; + for (i = 0; i < last_ansis[ax].end; i++) + STORE_CHAR(last_ansis[ax].data[i], AT_ANSI, NULL, pos); + } + } + } #endif - if (a == AT_ANSI) { - w = 0; - } else { - char *p = &linebuf.buf[linebuf.end]; - LWCHAR prev_ch = (linebuf.end > 0) ? step_char(&p, -1, linebuf.buf) : 0; - int prev_a = (linebuf.end > 0) ? linebuf.attr[linebuf.end-1] : 0; - w = pwidth(ch, a, prev_ch, prev_a); - } - - if (!fits_on_screen(w, a)) - return (1); - - if (rep == NULL) - { - cs = (char) ch; - rep = &cs; - replen = 1; - } else - { - replen = utf_len(rep[0]); - } - if (linebuf.end + replen >= size_linebuf-6) - { - /* - * Won't fit in line buffer. - * Try to expand it. - */ - if (expand_linebuf()) - return (1); - } - - if (cshift == hshift && shifted_ansi.end > 0) - { - /* Copy shifted ANSI sequences to beginning of line. */ - for (i = 0; i < shifted_ansi.end; i++) - add_linebuf(shifted_ansi.data[i], AT_ANSI, 0); - xbuf_reset(&shifted_ansi); - } - /* Add the char to the buf, even if we will left-shift it next. */ - inc_end_column(w); - for (i = 0; i < replen; i++) - add_linebuf(*rep++, a, 0); - - if (cshift < hshift) - { - /* We haven't left-shifted enough yet. */ - if (a == AT_ANSI) - xbuf_add(&shifted_ansi, ch); /* Save ANSI attributes */ - if (linebuf.end > linebuf.print) - { - /* Shift left enough to put last byte of this char at print-1. */ - int i; - for (i = 0; i < linebuf.print; i++) - { - linebuf.buf[i] = linebuf.buf[i+replen]; - linebuf.attr[i] = linebuf.attr[i+replen]; - } - linebuf.end -= replen; - cshift += w; - /* - * If the char we just left-shifted was double width, - * the 2 spaces we shifted may be too much. - * Represent the "half char" at start of line with a highlighted space. - */ - while (cshift > hshift) - { - add_linebuf(' ', rscroll_attr, 0); - cshift--; - } - } - } - return (0); + if (a == AT_ANSI) { + w = 0; + } else { + char *p = &linebuf.buf[linebuf.end]; + LWCHAR prev_ch = (linebuf.end > 0) ? step_char(&p, -1, linebuf.buf) : 0; + int prev_a = (linebuf.end > 0) ? linebuf.attr[linebuf.end-1] : 0; + w = pwidth(ch, a, prev_ch, prev_a); + } + + if (!fits_on_screen(w, a)) + return (1); + + if (rep == NULL) + { + cs = (char) ch; + rep = &cs; + replen = 1; + } else + { + replen = utf_len(rep[0]); + } + if (linebuf.end + replen >= size_linebuf-6) + { + /* + * Won't fit in line buffer. + * Try to expand it. + */ + if (expand_linebuf()) + return (1); + } + + if (cshift == hshift && shifted_ansi.end > 0) + { + /* Copy shifted ANSI sequences to beginning of line. */ + for (i = 0; i < shifted_ansi.end; i++) + add_linebuf(shifted_ansi.data[i], AT_ANSI, 0); + xbuf_reset(&shifted_ansi); + } + /* Add the char to the buf, even if we will left-shift it next. */ + inc_end_column(w); + for (i = 0; i < replen; i++) + add_linebuf(*rep++, a, 0); + + if (cshift < hshift) + { + /* We haven't left-shifted enough yet. */ + if (a == AT_ANSI) + xbuf_add(&shifted_ansi, ch); /* Save ANSI attributes */ + if (linebuf.end > linebuf.print) + { + /* Shift left enough to put last byte of this char at print-1. */ + int i; + for (i = 0; i < linebuf.print; i++) + { + linebuf.buf[i] = linebuf.buf[i+replen]; + linebuf.attr[i] = linebuf.attr[i+replen]; + } + linebuf.end -= replen; + cshift += w; + /* + * If the char we just left-shifted was double width, + * the 2 spaces we shifted may be too much. + * Represent the "half char" at start of line with a highlighted space. + */ + while (cshift > hshift) + { + add_linebuf(' ', rscroll_attr, 0); + cshift--; + } + } + } + return (0); } #define STORE_STRING(s,a,pos) \ - do { if (store_string((s),(a),(pos))) return (1); } while (0) + do { if (store_string((s),(a),(pos))) return (1); } while (0) - static int + static int store_string(s, a, pos) - char *s; - int a; - POSITION pos; + char *s; + int a; + POSITION pos; { - if (!fits_on_screen(strlen(s), a)) - return 1; - for ( ; *s != 0; s++) - STORE_CHAR(*s, a, NULL, pos); - return 0; + if (!fits_on_screen(strlen(s), a)) + return 1; + for ( ; *s != 0; s++) + STORE_CHAR(*s, a, NULL, pos); + return 0; } /* @@ -856,58 +856,58 @@ store_string(s, a, pos) * Store spaces to represent the tab. */ #define STORE_TAB(a,pos) \ - do { if (store_tab((a),(pos))) return (1); } while (0) + do { if (store_tab((a),(pos))) return (1); } while (0) - static int + static int store_tab(attr, pos) - int attr; - POSITION pos; + int attr; + POSITION pos; { - int to_tab = end_column - linebuf.pfx_end; - - if (ntabstops < 2 || to_tab >= tabstops[ntabstops-1]) - to_tab = tabdefault - - ((to_tab - tabstops[ntabstops-1]) % tabdefault); - else - { - int i; - for (i = ntabstops - 2; i >= 0; i--) - if (to_tab >= tabstops[i]) - break; - to_tab = tabstops[i+1] - to_tab; - } - - do { - STORE_CHAR(' ', attr, " ", pos); - } while (--to_tab > 0); - return 0; + int to_tab = end_column - linebuf.pfx_end; + + if (ntabstops < 2 || to_tab >= tabstops[ntabstops-1]) + to_tab = tabdefault - + ((to_tab - tabstops[ntabstops-1]) % tabdefault); + else + { + int i; + for (i = ntabstops - 2; i >= 0; i--) + if (to_tab >= tabstops[i]) + break; + to_tab = tabstops[i+1] - to_tab; + } + + do { + STORE_CHAR(' ', attr, " ", pos); + } while (--to_tab > 0); + return 0; } #define STORE_PRCHAR(c, pos) \ - do { if (store_prchar((c), (pos))) return 1; } while (0) + do { if (store_prchar((c), (pos))) return 1; } while (0) - static int + static int store_prchar(c, pos) - LWCHAR c; - POSITION pos; + LWCHAR c; + POSITION pos; { - /* - * Convert to printable representation. - */ - STORE_STRING(prchar(c), AT_BINARY|AT_COLOR_CTRL, pos); - return 0; + /* + * Convert to printable representation. + */ + STORE_STRING(prchar(c), AT_BINARY|AT_COLOR_CTRL, pos); + return 0; } - static int + static int flush_mbc_buf(pos) - POSITION pos; + POSITION pos; { - int i; + int i; - for (i = 0; i < mbc_buf_index; i++) - if (store_prchar(mbc_buf[i], pos)) - return mbc_buf_index - i; - return 0; + for (i = 0; i < mbc_buf_index; i++) + if (store_prchar(mbc_buf[i], pos)) + return mbc_buf_index - i; + return 0; } /* @@ -915,436 +915,436 @@ flush_mbc_buf(pos) * Expand tabs into spaces, handle underlining, boldfacing, etc. * Returns 0 if ok, 1 if couldn't fit in buffer. */ - public int + public int pappend(c, pos) - int c; - POSITION pos; + int c; + POSITION pos; { - int r; - - if (pendc) - { - if (c == '\r' && pendc == '\r') - return (0); - if (do_append(pendc, NULL, pendpos)) - /* - * Oops. We've probably lost the char which - * was in pendc, since caller won't back up. - */ - return (1); - pendc = '\0'; - } - - if (c == '\r' && bs_mode == BS_SPECIAL) - { - if (mbc_buf_len > 0) /* utf_mode must be on. */ - { - /* Flush incomplete (truncated) sequence. */ - r = flush_mbc_buf(mbc_pos); - mbc_buf_index = r + 1; - mbc_buf_len = 0; - if (r) - return (mbc_buf_index); - } - - /* - * Don't put the CR into the buffer until we see - * the next char. If the next char is a newline, - * discard the CR. - */ - pendc = c; - pendpos = pos; - return (0); - } - - if (!utf_mode) - { - r = do_append(c, NULL, pos); - } else - { - /* Perform strict validation in all possible cases. */ - if (mbc_buf_len == 0) - { - retry: - mbc_buf_index = 1; - *mbc_buf = c; - if (IS_ASCII_OCTET(c)) - r = do_append(c, NULL, pos); - else if (IS_UTF8_LEAD(c)) - { - mbc_buf_len = utf_len(c); - mbc_pos = pos; - return (0); - } else - /* UTF8_INVALID or stray UTF8_TRAIL */ - r = flush_mbc_buf(pos); - } else if (IS_UTF8_TRAIL(c)) - { - mbc_buf[mbc_buf_index++] = c; - if (mbc_buf_index < mbc_buf_len) - return (0); - if (is_utf8_well_formed(mbc_buf, mbc_buf_index)) - r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos); - else - /* Complete, but not shortest form, sequence. */ - mbc_buf_index = r = flush_mbc_buf(mbc_pos); - mbc_buf_len = 0; - } else - { - /* Flush incomplete (truncated) sequence. */ - r = flush_mbc_buf(mbc_pos); - mbc_buf_index = r + 1; - mbc_buf_len = 0; - /* Handle new char. */ - if (!r) - goto retry; - } - } - if (r) - { - /* How many chars should caller back up? */ - r = (!utf_mode) ? 1 : mbc_buf_index; - } - return (r); + int r; + + if (pendc) + { + if (c == '\r' && pendc == '\r') + return (0); + if (do_append(pendc, NULL, pendpos)) + /* + * Oops. We've probably lost the char which + * was in pendc, since caller won't back up. + */ + return (1); + pendc = '\0'; + } + + if (c == '\r' && bs_mode == BS_SPECIAL) + { + if (mbc_buf_len > 0) /* utf_mode must be on. */ + { + /* Flush incomplete (truncated) sequence. */ + r = flush_mbc_buf(mbc_pos); + mbc_buf_index = r + 1; + mbc_buf_len = 0; + if (r) + return (mbc_buf_index); + } + + /* + * Don't put the CR into the buffer until we see + * the next char. If the next char is a newline, + * discard the CR. + */ + pendc = c; + pendpos = pos; + return (0); + } + + if (!utf_mode) + { + r = do_append(c, NULL, pos); + } else + { + /* Perform strict validation in all possible cases. */ + if (mbc_buf_len == 0) + { + retry: + mbc_buf_index = 1; + *mbc_buf = c; + if (IS_ASCII_OCTET(c)) + r = do_append(c, NULL, pos); + else if (IS_UTF8_LEAD(c)) + { + mbc_buf_len = utf_len(c); + mbc_pos = pos; + return (0); + } else + /* UTF8_INVALID or stray UTF8_TRAIL */ + r = flush_mbc_buf(pos); + } else if (IS_UTF8_TRAIL(c)) + { + mbc_buf[mbc_buf_index++] = c; + if (mbc_buf_index < mbc_buf_len) + return (0); + if (is_utf8_well_formed(mbc_buf, mbc_buf_index)) + r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos); + else + /* Complete, but not shortest form, sequence. */ + mbc_buf_index = r = flush_mbc_buf(mbc_pos); + mbc_buf_len = 0; + } else + { + /* Flush incomplete (truncated) sequence. */ + r = flush_mbc_buf(mbc_pos); + mbc_buf_index = r + 1; + mbc_buf_len = 0; + /* Handle new char. */ + if (!r) + goto retry; + } + } + if (r) + { + /* How many chars should caller back up? */ + r = (!utf_mode) ? 1 : mbc_buf_index; + } + return (r); } - static int + static int store_control_char(ch, rep, pos) - LWCHAR ch; - char *rep; - POSITION pos; + LWCHAR ch; + char *rep; + POSITION pos; { - if (ctldisp == OPT_ON) - { - /* Output the character itself. */ - STORE_CHAR(ch, AT_NORMAL, rep, pos); - } else - { - /* Output a printable representation of the character. */ - STORE_PRCHAR((char) ch, pos); - } - return (0); + if (ctldisp == OPT_ON) + { + /* Output the character itself. */ + STORE_CHAR(ch, AT_NORMAL, rep, pos); + } else + { + /* Output a printable representation of the character. */ + STORE_PRCHAR((char) ch, pos); + } + return (0); } - static int + static int store_ansi(ch, rep, pos) - LWCHAR ch; - char *rep; - POSITION pos; + LWCHAR ch; + char *rep; + POSITION pos; { - switch (ansi_step(line_ansi, ch)) - { - case ANSI_MID: - STORE_CHAR(ch, AT_ANSI, rep, pos); - if (line_ansi->hlink) - hlink_in_line = 1; - xbuf_add(&last_ansi, ch); - break; - case ANSI_END: - STORE_CHAR(ch, AT_ANSI, rep, pos); - ansi_done(line_ansi); - line_ansi = NULL; - xbuf_add(&last_ansi, ch); - xbuf_set(&last_ansis[curr_last_ansi], &last_ansi); - xbuf_reset(&last_ansi); - curr_last_ansi = (curr_last_ansi + 1) % NUM_LAST_ANSIS; - break; - case ANSI_ERR: - { - /* Remove whole unrecognized sequence. */ - char *start = (cshift < hshift) ? shifted_ansi.data : linebuf.buf; - int *end = (cshift < hshift) ? &shifted_ansi.end : &linebuf.end; - char *p = start + *end; - LWCHAR bch; - do { - bch = step_char(&p, -1, start); - } while (p > start && !IS_CSI_START(bch)); - *end = (int) (p - start); - } - xbuf_reset(&last_ansi); - ansi_done(line_ansi); - line_ansi = NULL; - break; - } - return (0); -} - - static int + switch (ansi_step(line_ansi, ch)) + { + case ANSI_MID: + STORE_CHAR(ch, AT_ANSI, rep, pos); + if (line_ansi->hlink) + hlink_in_line = 1; + xbuf_add(&last_ansi, ch); + break; + case ANSI_END: + STORE_CHAR(ch, AT_ANSI, rep, pos); + ansi_done(line_ansi); + line_ansi = NULL; + xbuf_add(&last_ansi, ch); + xbuf_set(&last_ansis[curr_last_ansi], &last_ansi); + xbuf_reset(&last_ansi); + curr_last_ansi = (curr_last_ansi + 1) % NUM_LAST_ANSIS; + break; + case ANSI_ERR: + { + /* Remove whole unrecognized sequence. */ + char *start = (cshift < hshift) ? shifted_ansi.data : linebuf.buf; + int *end = (cshift < hshift) ? &shifted_ansi.end : &linebuf.end; + char *p = start + *end; + LWCHAR bch; + do { + bch = step_char(&p, -1, start); + } while (p > start && !IS_CSI_START(bch)); + *end = (int) (p - start); + } + xbuf_reset(&last_ansi); + ansi_done(line_ansi); + line_ansi = NULL; + break; + } + return (0); +} + + static int store_bs(ch, rep, pos) - LWCHAR ch; - char *rep; - POSITION pos; + LWCHAR ch; + char *rep; + POSITION pos; { - if (bs_mode == BS_CONTROL) - return store_control_char(ch, rep, pos); - if (linebuf.end > 0 && - ((linebuf.end <= linebuf.print && linebuf.buf[linebuf.end-1] == '\0') || - (linebuf.end > 0 && linebuf.attr[linebuf.end - 1] & (AT_ANSI|AT_BINARY)))) - STORE_PRCHAR('\b', pos); - else if (bs_mode == BS_NORMAL) - STORE_CHAR(ch, AT_NORMAL, NULL, pos); - else if (bs_mode == BS_SPECIAL) - overstrike = backc(); - return 0; + if (bs_mode == BS_CONTROL) + return store_control_char(ch, rep, pos); + if (linebuf.end > 0 && + ((linebuf.end <= linebuf.print && linebuf.buf[linebuf.end-1] == '\0') || + (linebuf.end > 0 && linebuf.attr[linebuf.end - 1] & (AT_ANSI|AT_BINARY)))) + STORE_PRCHAR('\b', pos); + else if (bs_mode == BS_NORMAL) + STORE_CHAR(ch, AT_NORMAL, NULL, pos); + else if (bs_mode == BS_SPECIAL) + overstrike = backc(); + return 0; } - static int + static int do_append(ch, rep, pos) - LWCHAR ch; - char *rep; - POSITION pos; + LWCHAR ch; + char *rep; + POSITION pos; { - int a = AT_NORMAL; - - if (ctldisp == OPT_ONPLUS && line_ansi == NULL) - { - line_ansi = ansi_start(ch); - if (line_ansi != NULL) - ansi_in_line = 1; - } - - if (line_ansi != NULL) - return store_ansi(ch, rep, pos); - - if (ch == '\b') - return store_bs(ch, rep, pos); - - if (overstrike > 0) - { - /* - * Overstrike the character at the current position - * in the line buffer. This will cause either - * underline (if a "_" is overstruck), - * bold (if an identical character is overstruck), - * or just replacing the character in the buffer. - */ - LWCHAR prev_ch; - overstrike = utf_mode ? -1 : 0; - if (utf_mode) - { - /* To be correct, this must be a base character. */ - prev_ch = get_wchar(&linebuf.buf[linebuf.end]); - } else - { - prev_ch = (unsigned char) linebuf.buf[linebuf.end]; - } - a = linebuf.attr[linebuf.end]; - if (ch == prev_ch) - { - /* - * Overstriking a char with itself means make it bold. - * But overstriking an underscore with itself is - * ambiguous. It could mean make it bold, or - * it could mean make it underlined. - * Use the previous overstrike to resolve it. - */ - if (ch == '_') - { - if ((a & (AT_BOLD|AT_UNDERLINE)) != AT_NORMAL) - a |= (AT_BOLD|AT_UNDERLINE); - else if (last_overstrike != AT_NORMAL) - a |= last_overstrike; - else - a |= AT_BOLD; - } else - a |= AT_BOLD; - } else if (ch == '_') - { - a |= AT_UNDERLINE; - ch = prev_ch; - rep = &linebuf.buf[linebuf.end]; - } else if (prev_ch == '_') - { - a |= AT_UNDERLINE; - } - /* Else we replace prev_ch, but we keep its attributes. */ - } else if (overstrike < 0) - { - if ( is_composing_char(ch) - || is_combining_char(get_wchar(&linebuf.buf[linebuf.end]), ch)) - /* Continuation of the same overstrike. */ - a = last_overstrike; - else - overstrike = 0; - } - - if (ch == '\t') - { - /* - * Expand a tab into spaces. - */ - switch (bs_mode) - { - case BS_CONTROL: - return store_control_char(ch, rep, pos); - case BS_NORMAL: - case BS_SPECIAL: - STORE_TAB(a, pos); - break; - } - return (0); - } - if ((!utf_mode || is_ascii_char(ch)) && control_char((char)ch)) - { - return store_control_char(ch, rep, pos); - } else if (utf_mode && ctldisp != OPT_ON && is_ubin_char(ch)) - { - STORE_STRING(prutfchar(ch), AT_BINARY, pos); - } else - { - STORE_CHAR(ch, a, rep, pos); - } - return (0); + int a = AT_NORMAL; + + if (ctldisp == OPT_ONPLUS && line_ansi == NULL) + { + line_ansi = ansi_start(ch); + if (line_ansi != NULL) + ansi_in_line = 1; + } + + if (line_ansi != NULL) + return store_ansi(ch, rep, pos); + + if (ch == '\b') + return store_bs(ch, rep, pos); + + if (overstrike > 0) + { + /* + * Overstrike the character at the current position + * in the line buffer. This will cause either + * underline (if a "_" is overstruck), + * bold (if an identical character is overstruck), + * or just replacing the character in the buffer. + */ + LWCHAR prev_ch; + overstrike = utf_mode ? -1 : 0; + if (utf_mode) + { + /* To be correct, this must be a base character. */ + prev_ch = get_wchar(&linebuf.buf[linebuf.end]); + } else + { + prev_ch = (unsigned char) linebuf.buf[linebuf.end]; + } + a = linebuf.attr[linebuf.end]; + if (ch == prev_ch) + { + /* + * Overstriking a char with itself means make it bold. + * But overstriking an underscore with itself is + * ambiguous. It could mean make it bold, or + * it could mean make it underlined. + * Use the previous overstrike to resolve it. + */ + if (ch == '_') + { + if ((a & (AT_BOLD|AT_UNDERLINE)) != AT_NORMAL) + a |= (AT_BOLD|AT_UNDERLINE); + else if (last_overstrike != AT_NORMAL) + a |= last_overstrike; + else + a |= AT_BOLD; + } else + a |= AT_BOLD; + } else if (ch == '_') + { + a |= AT_UNDERLINE; + ch = prev_ch; + rep = &linebuf.buf[linebuf.end]; + } else if (prev_ch == '_') + { + a |= AT_UNDERLINE; + } + /* Else we replace prev_ch, but we keep its attributes. */ + } else if (overstrike < 0) + { + if ( is_composing_char(ch) + || is_combining_char(get_wchar(&linebuf.buf[linebuf.end]), ch)) + /* Continuation of the same overstrike. */ + a = last_overstrike; + else + overstrike = 0; + } + + if (ch == '\t') + { + /* + * Expand a tab into spaces. + */ + switch (bs_mode) + { + case BS_CONTROL: + return store_control_char(ch, rep, pos); + case BS_NORMAL: + case BS_SPECIAL: + STORE_TAB(a, pos); + break; + } + return (0); + } + if ((!utf_mode || is_ascii_char(ch)) && control_char((char)ch)) + { + return store_control_char(ch, rep, pos); + } else if (utf_mode && ctldisp != OPT_ON && is_ubin_char(ch)) + { + STORE_STRING(prutfchar(ch), AT_BINARY, pos); + } else + { + STORE_CHAR(ch, a, rep, pos); + } + return (0); } /* * */ - public int + public int pflushmbc(VOID_PARAM) { - int r = 0; - - if (mbc_buf_len > 0) - { - /* Flush incomplete (truncated) sequence. */ - r = flush_mbc_buf(mbc_pos); - mbc_buf_len = 0; - } - return r; + int r = 0; + + if (mbc_buf_len > 0) + { + /* Flush incomplete (truncated) sequence. */ + r = flush_mbc_buf(mbc_pos); + mbc_buf_len = 0; + } + return r; } /* * Switch to normal attribute at end of line. */ - static void + static void add_attr_normal(VOID_PARAM) { - if (ctldisp != OPT_ONPLUS || !is_ansi_end('m')) - return; - addstr_linebuf("\033[m", AT_ANSI, 0); - if (hlink_in_line) /* Don't send hyperlink clear if we know we don't need to. */ - addstr_linebuf("\033]8;;\033\\", AT_ANSI, 0); + if (ctldisp != OPT_ONPLUS || !is_ansi_end('m')) + return; + addstr_linebuf("\033[m", AT_ANSI, 0); + if (hlink_in_line) /* Don't send hyperlink clear if we know we don't need to. */ + addstr_linebuf("\033]8;;\033\\", AT_ANSI, 0); } /* * Terminate the line in the line buffer. */ - public void + public void pdone(endline, chopped, forw) - int endline; - int chopped; - int forw; + int endline; + int chopped; + int forw; { - (void) pflushmbc(); - - if (pendc && (pendc != '\r' || !endline)) - /* - * If we had a pending character, put it in the buffer. - * But discard a pending CR if we are at end of line - * (that is, discard the CR in a CR/LF sequence). - */ - (void) do_append(pendc, NULL, pendpos); - - if (chopped && rscroll_char) - { - /* - * Display the right scrolling char. - * If we've already filled the rightmost screen char - * (in the buffer), overwrite it. - */ - if (end_column >= sc_width + cshift) - { - /* We've already written in the rightmost char. */ - end_column = right_column; - linebuf.end = right_curr; - } - add_attr_normal(); - while (end_column < sc_width-1 + cshift) - { - /* - * Space to last (rightmost) char on screen. - * This may be necessary if the char we overwrote - * was double-width. - */ - add_linebuf(' ', rscroll_attr, 1); - } - /* Print rscroll char. It must be single-width. */ - add_linebuf(rscroll_char, rscroll_attr, 1); - } else - { - add_attr_normal(); - } - - /* - * If we're coloring a status line, fill out the line with spaces. - */ - if (status_line && line_mark_attr != 0) { - while (end_column +1 < sc_width + cshift) - add_linebuf(' ', line_mark_attr, 1); - } - - /* - * Add a newline if necessary, - * and append a '\0' to the end of the line. - * We output a newline if we're not at the right edge of the screen, - * or if the terminal doesn't auto wrap, - * or if this is really the end of the line AND the terminal ignores - * a newline at the right edge. - * (In the last case we don't want to output a newline if the terminal - * doesn't ignore it since that would produce an extra blank line. - * But we do want to output a newline if the terminal ignores it in case - * the next line is blank. In that case the single newline output for - * that blank line would be ignored!) - */ - if (end_column < sc_width + cshift || !auto_wrap || (endline && ignaw) || ctldisp == OPT_ON) - { - add_linebuf('\n', AT_NORMAL, 0); - } - else if (ignaw && end_column >= sc_width + cshift && forw) - { - /* - * Terminals with "ignaw" don't wrap until they *really* need - * to, i.e. when the character *after* the last one to fit on a - * line is output. But they are too hard to deal with when they - * get in the state where a full screen width of characters - * have been output but the cursor is sitting on the right edge - * instead of at the start of the next line. - * So we nudge them into wrapping by outputting a space - * character plus a backspace. But do this only if moving - * forward; if we're moving backward and drawing this line at - * the top of the screen, the space would overwrite the first - * char on the next line. We don't need to do this "nudge" - * at the top of the screen anyway. - */ - add_linebuf(' ', AT_NORMAL, 1); - add_linebuf('\b', AT_NORMAL, -1); - } - set_linebuf(linebuf.end, '\0', AT_NORMAL); + (void) pflushmbc(); + + if (pendc && (pendc != '\r' || !endline)) + /* + * If we had a pending character, put it in the buffer. + * But discard a pending CR if we are at end of line + * (that is, discard the CR in a CR/LF sequence). + */ + (void) do_append(pendc, NULL, pendpos); + + if (chopped && rscroll_char) + { + /* + * Display the right scrolling char. + * If we've already filled the rightmost screen char + * (in the buffer), overwrite it. + */ + if (end_column >= sc_width + cshift) + { + /* We've already written in the rightmost char. */ + end_column = right_column; + linebuf.end = right_curr; + } + add_attr_normal(); + while (end_column < sc_width-1 + cshift) + { + /* + * Space to last (rightmost) char on screen. + * This may be necessary if the char we overwrote + * was double-width. + */ + add_linebuf(' ', rscroll_attr, 1); + } + /* Print rscroll char. It must be single-width. */ + add_linebuf(rscroll_char, rscroll_attr, 1); + } else + { + add_attr_normal(); + } + + /* + * If we're coloring a status line, fill out the line with spaces. + */ + if (status_line && line_mark_attr != 0) { + while (end_column +1 < sc_width + cshift) + add_linebuf(' ', line_mark_attr, 1); + } + + /* + * Add a newline if necessary, + * and append a '\0' to the end of the line. + * We output a newline if we're not at the right edge of the screen, + * or if the terminal doesn't auto wrap, + * or if this is really the end of the line AND the terminal ignores + * a newline at the right edge. + * (In the last case we don't want to output a newline if the terminal + * doesn't ignore it since that would produce an extra blank line. + * But we do want to output a newline if the terminal ignores it in case + * the next line is blank. In that case the single newline output for + * that blank line would be ignored!) + */ + if (end_column < sc_width + cshift || !auto_wrap || (endline && ignaw) || ctldisp == OPT_ON) + { + add_linebuf('\n', AT_NORMAL, 0); + } + else if (ignaw && end_column >= sc_width + cshift && forw) + { + /* + * Terminals with "ignaw" don't wrap until they *really* need + * to, i.e. when the character *after* the last one to fit on a + * line is output. But they are too hard to deal with when they + * get in the state where a full screen width of characters + * have been output but the cursor is sitting on the right edge + * instead of at the start of the next line. + * So we nudge them into wrapping by outputting a space + * character plus a backspace. But do this only if moving + * forward; if we're moving backward and drawing this line at + * the top of the screen, the space would overwrite the first + * char on the next line. We don't need to do this "nudge" + * at the top of the screen anyway. + */ + add_linebuf(' ', AT_NORMAL, 1); + add_linebuf('\b', AT_NORMAL, -1); + } + set_linebuf(linebuf.end, '\0', AT_NORMAL); } /* * Set an attribute on each char of the line in the line buffer. */ - public void + public void set_attr_line(a) - int a; + int a; { - int i; + int i; - for (i = linebuf.print; i < linebuf.end; i++) - linebuf.attr[i] |= a; + for (i = linebuf.print; i < linebuf.end; i++) + linebuf.attr[i] |= a; } /* * Set the char to be displayed in the status column. */ - public void + public void set_status_col(c, attr) - int c; - int attr; + int c; + int attr; { - set_pfx(0, c, attr); + set_pfx(0, c, attr); } /* @@ -1352,49 +1352,49 @@ set_status_col(c, attr) * Return the character as the function return value, * and the character attribute in *ap. */ - public int + public int gline(i, ap) - int i; - int *ap; + int i; + int *ap; { - if (is_null_line) - { - /* - * If there is no current line, we pretend the line is - * either "~" or "", depending on the "twiddle" flag. - */ - if (twiddle) - { - if (i == 0) - { - *ap = AT_BOLD; - return '~'; - } - --i; - } - /* Make sure we're back to AT_NORMAL before the '\n'. */ - *ap = AT_NORMAL; - return i ? '\0' : '\n'; - } - - if (i < linebuf.pfx_end) - { - *ap = linebuf.pfx_attr[i]; - return linebuf.pfx[i]; - } - i += linebuf.print - linebuf.pfx_end; - *ap = linebuf.attr[i]; - return (linebuf.buf[i] & 0xFF); + if (is_null_line) + { + /* + * If there is no current line, we pretend the line is + * either "~" or "", depending on the "twiddle" flag. + */ + if (twiddle) + { + if (i == 0) + { + *ap = AT_BOLD; + return '~'; + } + --i; + } + /* Make sure we're back to AT_NORMAL before the '\n'. */ + *ap = AT_NORMAL; + return i ? '\0' : '\n'; + } + + if (i < linebuf.pfx_end) + { + *ap = linebuf.pfx_attr[i]; + return linebuf.pfx[i]; + } + i += linebuf.print - linebuf.pfx_end; + *ap = linebuf.attr[i]; + return (linebuf.buf[i] & 0xFF); } /* * Indicate that there is no current line. */ - public void + public void null_line(VOID_PARAM) { - is_null_line = 1; - cshift = 0; + is_null_line = 1; + cshift = 0; } /* @@ -1402,139 +1402,139 @@ null_line(VOID_PARAM) * lines which are not split for screen width. * {{ This is supposed to be more efficient than forw_line(). }} */ - public POSITION + public POSITION forw_raw_line(curr_pos, linep, line_lenp) - POSITION curr_pos; - char **linep; - int *line_lenp; + POSITION curr_pos; + char **linep; + int *line_lenp; { - int n; - int c; - POSITION new_pos; - - if (curr_pos == NULL_POSITION || ch_seek(curr_pos) || - (c = ch_forw_get()) == EOI) - return (NULL_POSITION); - - n = 0; - for (;;) - { - if (c == '\n' || c == EOI || ABORT_SIGS()) - { - new_pos = ch_tell(); - break; - } - if (n >= size_linebuf-1) - { - if (expand_linebuf()) - { - /* - * Overflowed the input buffer. - * Pretend the line ended here. - */ - new_pos = ch_tell() - 1; - break; - } - } - linebuf.buf[n++] = c; - c = ch_forw_get(); - } - linebuf.buf[n] = '\0'; - if (linep != NULL) - *linep = linebuf.buf; - if (line_lenp != NULL) - *line_lenp = n; - return (new_pos); + int n; + int c; + POSITION new_pos; + + if (curr_pos == NULL_POSITION || ch_seek(curr_pos) || + (c = ch_forw_get()) == EOI) + return (NULL_POSITION); + + n = 0; + for (;;) + { + if (c == '\n' || c == EOI || ABORT_SIGS()) + { + new_pos = ch_tell(); + break; + } + if (n >= size_linebuf-1) + { + if (expand_linebuf()) + { + /* + * Overflowed the input buffer. + * Pretend the line ended here. + */ + new_pos = ch_tell() - 1; + break; + } + } + linebuf.buf[n++] = c; + c = ch_forw_get(); + } + linebuf.buf[n] = '\0'; + if (linep != NULL) + *linep = linebuf.buf; + if (line_lenp != NULL) + *line_lenp = n; + return (new_pos); } /* * Analogous to back_line(), but deals with "raw lines". * {{ This is supposed to be more efficient than back_line(). }} */ - public POSITION + public POSITION back_raw_line(curr_pos, linep, line_lenp) - POSITION curr_pos; - char **linep; - int *line_lenp; + POSITION curr_pos; + char **linep; + int *line_lenp; { - int n; - int c; - POSITION new_pos; - - if (curr_pos == NULL_POSITION || curr_pos <= ch_zero() || - ch_seek(curr_pos-1)) - return (NULL_POSITION); - - n = size_linebuf; - linebuf.buf[--n] = '\0'; - for (;;) - { - c = ch_back_get(); - if (c == '\n' || ABORT_SIGS()) - { - /* - * This is the newline ending the previous line. - * We have hit the beginning of the line. - */ - new_pos = ch_tell() + 1; - break; - } - if (c == EOI) - { - /* - * We have hit the beginning of the file. - * This must be the first line in the file. - * This must, of course, be the beginning of the line. - */ - new_pos = ch_zero(); - break; - } - if (n <= 0) - { - int old_size_linebuf = size_linebuf; - char *fm; - char *to; - if (expand_linebuf()) - { - /* - * Overflowed the input buffer. - * Pretend the line ended here. - */ - new_pos = ch_tell() + 1; - break; - } - /* - * Shift the data to the end of the new linebuf. - */ - for (fm = linebuf.buf + old_size_linebuf - 1, - to = linebuf.buf + size_linebuf - 1; - fm >= linebuf.buf; fm--, to--) - *to = *fm; - n = size_linebuf - old_size_linebuf; - } - linebuf.buf[--n] = c; - } - if (linep != NULL) - *linep = &linebuf.buf[n]; - if (line_lenp != NULL) - *line_lenp = size_linebuf - 1 - n; - return (new_pos); + int n; + int c; + POSITION new_pos; + + if (curr_pos == NULL_POSITION || curr_pos <= ch_zero() || + ch_seek(curr_pos-1)) + return (NULL_POSITION); + + n = size_linebuf; + linebuf.buf[--n] = '\0'; + for (;;) + { + c = ch_back_get(); + if (c == '\n' || ABORT_SIGS()) + { + /* + * This is the newline ending the previous line. + * We have hit the beginning of the line. + */ + new_pos = ch_tell() + 1; + break; + } + if (c == EOI) + { + /* + * We have hit the beginning of the file. + * This must be the first line in the file. + * This must, of course, be the beginning of the line. + */ + new_pos = ch_zero(); + break; + } + if (n <= 0) + { + int old_size_linebuf = size_linebuf; + char *fm; + char *to; + if (expand_linebuf()) + { + /* + * Overflowed the input buffer. + * Pretend the line ended here. + */ + new_pos = ch_tell() + 1; + break; + } + /* + * Shift the data to the end of the new linebuf. + */ + for (fm = linebuf.buf + old_size_linebuf - 1, + to = linebuf.buf + size_linebuf - 1; + fm >= linebuf.buf; fm--, to--) + *to = *fm; + n = size_linebuf - old_size_linebuf; + } + linebuf.buf[--n] = c; + } + if (linep != NULL) + *linep = &linebuf.buf[n]; + if (line_lenp != NULL) + *line_lenp = size_linebuf - 1 - n; + return (new_pos); } /* * Append a string to the line buffer. */ - static int + static int pappstr(str) - constant char *str; + constant char *str; { - while (*str != '\0') - { - if (pappend(*str++, NULL_POSITION)) - /* Doesn't fit on screen. */ - return 1; - } - return 0; + while (*str != '\0') + { + if (pappend(*str++, NULL_POSITION)) + /* Doesn't fit on screen. */ + return 1; + } + return 0; } /* @@ -1542,117 +1542,117 @@ pappstr(str) * If the string is too long to fit on the screen, * truncate the beginning of the string to fit. */ - public void + public void load_line(str) - constant char *str; + constant char *str; { - int save_hshift = hshift; - - hshift = 0; - for (;;) - { - prewind(); - if (pappstr(str) == 0) - break; - /* - * Didn't fit on screen; increase left shift by one. - * {{ This gets very inefficient if the string - * is much longer than the screen width. }} - */ - hshift += 1; - } - set_linebuf(linebuf.end, '\0', AT_NORMAL); - hshift = save_hshift; + int save_hshift = hshift; + + hshift = 0; + for (;;) + { + prewind(); + if (pappstr(str) == 0) + break; + /* + * Didn't fit on screen; increase left shift by one. + * {{ This gets very inefficient if the string + * is much longer than the screen width. }} + */ + hshift += 1; + } + set_linebuf(linebuf.end, '\0', AT_NORMAL); + hshift = save_hshift; } /* * Find the shift necessary to show the end of the longest displayed line. */ - public int + public int rrshift(VOID_PARAM) { - POSITION pos; - int save_width; - int line; - int longest = 0; - - save_width = sc_width; - sc_width = INT_MAX; - pos = position(TOP); - for (line = 0; line < sc_height && pos != NULL_POSITION; line++) - { - pos = forw_line(pos); - if (end_column > longest) - longest = end_column; - } - sc_width = save_width; - if (longest < sc_width) - return 0; - return longest - sc_width; + POSITION pos; + int save_width; + int line; + int longest = 0; + + save_width = sc_width; + sc_width = INT_MAX; + pos = position(TOP); + for (line = 0; line < sc_height && pos != NULL_POSITION; line++) + { + pos = forw_line(pos); + if (end_column > longest) + longest = end_column; + } + sc_width = save_width; + if (longest < sc_width) + return 0; + return longest - sc_width; } /* * Get the color_map index associated with a given attribute. */ - static int + static int color_index(attr) - int attr; + int attr; { - if (use_color) - { - switch (attr & AT_COLOR) - { - case AT_COLOR_ATTN: return 0; - case AT_COLOR_BIN: return 1; - case AT_COLOR_CTRL: return 2; - case AT_COLOR_ERROR: return 3; - case AT_COLOR_LINENUM: return 4; - case AT_COLOR_MARK: return 5; - case AT_COLOR_PROMPT: return 6; - case AT_COLOR_RSCROLL: return 7; - case AT_COLOR_SEARCH: return 8; - case AT_COLOR_HEADER: return 9; - } - } - if (attr & AT_UNDERLINE) - return 10; - if (attr & AT_BOLD) - return 11; - if (attr & AT_BLINK) - return 12; - if (attr & AT_STANDOUT) - return 13; - return -1; + if (use_color) + { + switch (attr & AT_COLOR) + { + case AT_COLOR_ATTN: return 0; + case AT_COLOR_BIN: return 1; + case AT_COLOR_CTRL: return 2; + case AT_COLOR_ERROR: return 3; + case AT_COLOR_LINENUM: return 4; + case AT_COLOR_MARK: return 5; + case AT_COLOR_PROMPT: return 6; + case AT_COLOR_RSCROLL: return 7; + case AT_COLOR_SEARCH: return 8; + case AT_COLOR_HEADER: return 9; + } + } + if (attr & AT_UNDERLINE) + return 10; + if (attr & AT_BOLD) + return 11; + if (attr & AT_BLINK) + return 12; + if (attr & AT_STANDOUT) + return 13; + return -1; } /* * Set the color string to use for a given attribute. */ - public int + public int set_color_map(attr, colorstr) - int attr; - char *colorstr; + int attr; + char *colorstr; { - int cx = color_index(attr); - if (cx < 0) - return -1; - if (strlen(colorstr)+1 > sizeof(color_map[cx])) - return -1; - if (*colorstr != '\0' && parse_color(colorstr, NULL, NULL) == CT_NULL) - return -1; - strcpy(color_map[cx], colorstr); - return 0; + int cx = color_index(attr); + if (cx < 0) + return -1; + if (strlen(colorstr)+1 > sizeof(color_map[cx])) + return -1; + if (*colorstr != '\0' && parse_color(colorstr, NULL, NULL) == CT_NULL) + return -1; + strcpy(color_map[cx], colorstr); + return 0; } /* * Get the color string to use for a given attribute. */ - public char * + public char * get_color_map(attr) - int attr; + int attr; { - int cx = color_index(attr); - if (cx < 0) - return NULL; - return color_map[cx]; + int cx = color_index(attr); + if (cx < 0) + return NULL; + return color_map[cx]; } diff --git a/linenum.c b/linenum.c index 1808ea9..3ea4388 100644 --- a/linenum.c +++ b/linenum.c @@ -40,11 +40,11 @@ */ struct linenum_info { - struct linenum_info *next; /* Link to next in the list */ - struct linenum_info *prev; /* Line to previous in the list */ - POSITION pos; /* File position */ - POSITION gap; /* Gap between prev and next */ - LINENUM line; /* Line number */ + struct linenum_info *next; /* Link to next in the list */ + struct linenum_info *prev; /* Line to previous in the list */ + POSITION pos; /* File position */ + POSITION gap; /* Gap between prev and next */ + LINENUM line; /* Line number */ }; /* * "gap" needs some explanation: the gap of any particular line number @@ -74,47 +74,47 @@ extern int nonum_headers; /* * Initialize the line number structures. */ - public void + public void clr_linenum(VOID_PARAM) { - struct linenum_info *p; - - /* - * Put all the entries on the free list. - * Leave one for the "spare". - */ - for (p = pool; p < &pool[NPOOL-2]; p++) - p->next = p+1; - pool[NPOOL-2].next = NULL; - freelist = pool; - - spare = &pool[NPOOL-1]; - - /* - * Initialize the anchor. - */ - anchor.next = anchor.prev = &anchor; - anchor.gap = 0; - anchor.pos = (POSITION)0; - anchor.line = 1; + struct linenum_info *p; + + /* + * Put all the entries on the free list. + * Leave one for the "spare". + */ + for (p = pool; p < &pool[NPOOL-2]; p++) + p->next = p+1; + pool[NPOOL-2].next = NULL; + freelist = pool; + + spare = &pool[NPOOL-1]; + + /* + * Initialize the anchor. + */ + anchor.next = anchor.prev = &anchor; + anchor.gap = 0; + anchor.pos = (POSITION)0; + anchor.line = 1; } /* * Calculate the gap for an entry. */ - static void + static void calcgap(p) - struct linenum_info *p; + struct linenum_info *p; { - /* - * Don't bother to compute a gap for the anchor. - * Also don't compute a gap for the last one in the list. - * The gap for that last one should be considered infinite, - * but we never look at it anyway. - */ - if (p == &anchor || p->next == &anchor) - return; - p->gap = p->next->pos - p->prev->pos; + /* + * Don't bother to compute a gap for the anchor. + * Also don't compute a gap for the last one in the list. + * The gap for that last one should be considered infinite, + * but we never look at it anyway. + */ + if (p == &anchor || p->next == &anchor) + return; + p->gap = p->next->pos - p->prev->pos; } /* @@ -122,98 +122,98 @@ calcgap(p) * The specified position (pos) should be the file position of the * FIRST character in the specified line. */ - public void + public void add_lnum(linenum, pos) - LINENUM linenum; - POSITION pos; + LINENUM linenum; + POSITION pos; { - struct linenum_info *p; - struct linenum_info *new; - struct linenum_info *nextp; - struct linenum_info *prevp; - POSITION mingap; - - /* - * Find the proper place in the list for the new one. - * The entries are sorted by position. - */ - for (p = anchor.next; p != &anchor && p->pos < pos; p = p->next) - if (p->line == linenum) - /* We already have this one. */ - return; - nextp = p; - prevp = p->prev; - - if (freelist != NULL) - { - /* - * We still have free (unused) entries. - * Use one of them. - */ - new = freelist; - freelist = freelist->next; - } else - { - /* - * No free entries. - * Use the "spare" entry. - */ - new = spare; - spare = NULL; - } - - /* - * Fill in the fields of the new entry, - * and insert it into the proper place in the list. - */ - new->next = nextp; - new->prev = prevp; - new->pos = pos; - new->line = linenum; - - nextp->prev = new; - prevp->next = new; - - /* - * Recalculate gaps for the new entry and the neighboring entries. - */ - calcgap(new); - calcgap(nextp); - calcgap(prevp); - - if (spare == NULL) - { - /* - * We have used the spare entry. - * Scan the list to find the one with the smallest - * gap, take it out and make it the spare. - * We should never remove the last one, so stop when - * we get to p->next == &anchor. This also avoids - * looking at the gap of the last one, which is - * not computed by calcgap. - */ - mingap = anchor.next->gap; - for (p = anchor.next; p->next != &anchor; p = p->next) - { - if (p->gap <= mingap) - { - spare = p; - mingap = p->gap; - } - } - spare->next->prev = spare->prev; - spare->prev->next = spare->next; - } + struct linenum_info *p; + struct linenum_info *new; + struct linenum_info *nextp; + struct linenum_info *prevp; + POSITION mingap; + + /* + * Find the proper place in the list for the new one. + * The entries are sorted by position. + */ + for (p = anchor.next; p != &anchor && p->pos < pos; p = p->next) + if (p->line == linenum) + /* We already have this one. */ + return; + nextp = p; + prevp = p->prev; + + if (freelist != NULL) + { + /* + * We still have free (unused) entries. + * Use one of them. + */ + new = freelist; + freelist = freelist->next; + } else + { + /* + * No free entries. + * Use the "spare" entry. + */ + new = spare; + spare = NULL; + } + + /* + * Fill in the fields of the new entry, + * and insert it into the proper place in the list. + */ + new->next = nextp; + new->prev = prevp; + new->pos = pos; + new->line = linenum; + + nextp->prev = new; + prevp->next = new; + + /* + * Recalculate gaps for the new entry and the neighboring entries. + */ + calcgap(new); + calcgap(nextp); + calcgap(prevp); + + if (spare == NULL) + { + /* + * We have used the spare entry. + * Scan the list to find the one with the smallest + * gap, take it out and make it the spare. + * We should never remove the last one, so stop when + * we get to p->next == &anchor. This also avoids + * looking at the gap of the last one, which is + * not computed by calcgap. + */ + mingap = anchor.next->gap; + for (p = anchor.next; p->next != &anchor; p = p->next) + { + if (p->gap <= mingap) + { + spare = p; + mingap = p->gap; + } + } + spare->next->prev = spare->prev; + spare->prev->next = spare->next; + } } /* * If we get stuck in a long loop trying to figure out the * line number, print a message to tell the user what we're doing. */ - static void + static void longloopmessage(VOID_PARAM) { - ierror("Calculating line numbers", NULL_PARG); + ierror("Calculating line numbers", NULL_PARG); } static int loopcount; @@ -221,25 +221,25 @@ static int loopcount; static time_type startime; #endif - static void + static void longish(VOID_PARAM) { #if HAVE_TIME - if (loopcount >= 0 && ++loopcount > 100) - { - loopcount = 0; - if (get_time() >= startime + LONGTIME) - { - longloopmessage(); - loopcount = -1; - } - } + if (loopcount >= 0 && ++loopcount > 100) + { + loopcount = 0; + if (get_time() >= startime + LONGTIME) + { + longloopmessage(); + loopcount = -1; + } + } #else - if (loopcount >= 0 && ++loopcount > LONGLOOP) - { - longloopmessage(); - loopcount = -1; - } + if (loopcount >= 0 && ++loopcount > LONGLOOP) + { + longloopmessage(); + loopcount = -1; + } #endif } @@ -247,204 +247,204 @@ longish(VOID_PARAM) * Turn off line numbers because the user has interrupted * a lengthy line number calculation. */ - static void + static void abort_long(VOID_PARAM) { - if (loopcount >= 0) - return; - if (linenums == OPT_ONPLUS) - /* - * We were displaying line numbers, so need to repaint. - */ - screen_trashed = 1; - linenums = 0; - error("Line numbers turned off", NULL_PARG); + if (loopcount >= 0) + return; + if (linenums == OPT_ONPLUS) + /* + * We were displaying line numbers, so need to repaint. + */ + screen_trashed = 1; + linenums = 0; + error("Line numbers turned off", NULL_PARG); } /* * Find the line number associated with a given position. * Return 0 if we can't figure it out. */ - public LINENUM + public LINENUM find_linenum(pos) - POSITION pos; + POSITION pos; { - struct linenum_info *p; - LINENUM linenum; - POSITION cpos; - - if (!linenums) - /* - * We're not using line numbers. - */ - return (0); - if (pos == NULL_POSITION) - /* - * Caller doesn't know what he's talking about. - */ - return (0); - if (pos <= ch_zero()) - /* - * Beginning of file is always line number 1. - */ - return (1); - - /* - * Find the entry nearest to the position we want. - */ - for (p = anchor.next; p != &anchor && p->pos < pos; p = p->next) - continue; - if (p->pos == pos) - /* Found it exactly. */ - return (p->line); - - /* - * This is the (possibly) time-consuming part. - * We start at the line we just found and start - * reading the file forward or backward till we - * get to the place we want. - * - * First decide whether we should go forward from the - * previous one or backwards from the next one. - * The decision is based on which way involves - * traversing fewer bytes in the file. - */ + struct linenum_info *p; + LINENUM linenum; + POSITION cpos; + + if (!linenums) + /* + * We're not using line numbers. + */ + return (0); + if (pos == NULL_POSITION) + /* + * Caller doesn't know what he's talking about. + */ + return (0); + if (pos <= ch_zero()) + /* + * Beginning of file is always line number 1. + */ + return (1); + + /* + * Find the entry nearest to the position we want. + */ + for (p = anchor.next; p != &anchor && p->pos < pos; p = p->next) + continue; + if (p->pos == pos) + /* Found it exactly. */ + return (p->line); + + /* + * This is the (possibly) time-consuming part. + * We start at the line we just found and start + * reading the file forward or backward till we + * get to the place we want. + * + * First decide whether we should go forward from the + * previous one or backwards from the next one. + * The decision is based on which way involves + * traversing fewer bytes in the file. + */ #if HAVE_TIME - startime = get_time(); + startime = get_time(); #endif - loopcount = 0; - if (p == &anchor || pos - p->prev->pos < p->pos - pos) - { - /* - * Go forward. - */ - p = p->prev; - if (ch_seek(p->pos)) - return (0); - for (linenum = p->line, cpos = p->pos; cpos < pos; linenum++) - { - /* - * Allow a signal to abort this loop. - */ - cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL); - if (ABORT_SIGS()) { - abort_long(); - return (0); - } - if (cpos == NULL_POSITION) - return (0); - longish(); - } - /* - * We might as well cache it. - */ - add_lnum(linenum, cpos); - /* - * If the given position is not at the start of a line, - * make sure we return the correct line number. - */ - if (cpos > pos) - linenum--; - } else - { - /* - * Go backward. - */ - if (ch_seek(p->pos)) - return (0); - for (linenum = p->line, cpos = p->pos; cpos > pos; linenum--) - { - /* - * Allow a signal to abort this loop. - */ - cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL); - if (ABORT_SIGS()) { - abort_long(); - return (0); - } - if (cpos == NULL_POSITION) - return (0); - longish(); - } - /* - * We might as well cache it. - */ - add_lnum(linenum, cpos); - } - loopcount = 0; - return (linenum); + loopcount = 0; + if (p == &anchor || pos - p->prev->pos < p->pos - pos) + { + /* + * Go forward. + */ + p = p->prev; + if (ch_seek(p->pos)) + return (0); + for (linenum = p->line, cpos = p->pos; cpos < pos; linenum++) + { + /* + * Allow a signal to abort this loop. + */ + cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL); + if (ABORT_SIGS()) { + abort_long(); + return (0); + } + if (cpos == NULL_POSITION) + return (0); + longish(); + } + /* + * We might as well cache it. + */ + add_lnum(linenum, cpos); + /* + * If the given position is not at the start of a line, + * make sure we return the correct line number. + */ + if (cpos > pos) + linenum--; + } else + { + /* + * Go backward. + */ + if (ch_seek(p->pos)) + return (0); + for (linenum = p->line, cpos = p->pos; cpos > pos; linenum--) + { + /* + * Allow a signal to abort this loop. + */ + cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL); + if (ABORT_SIGS()) { + abort_long(); + return (0); + } + if (cpos == NULL_POSITION) + return (0); + longish(); + } + /* + * We might as well cache it. + */ + add_lnum(linenum, cpos); + } + loopcount = 0; + return (linenum); } /* * Find the position of a given line number. * Return NULL_POSITION if we can't figure it out. */ - public POSITION + public POSITION find_pos(linenum) - LINENUM linenum; + LINENUM linenum; { - struct linenum_info *p; - POSITION cpos; - LINENUM clinenum; - - if (linenum <= 1) - /* - * Line number 1 is beginning of file. - */ - return (ch_zero()); - - /* - * Find the entry nearest to the line number we want. - */ - for (p = anchor.next; p != &anchor && p->line < linenum; p = p->next) - continue; - if (p->line == linenum) - /* Found it exactly. */ - return (p->pos); - - if (p == &anchor || linenum - p->prev->line < p->line - linenum) - { - /* - * Go forward. - */ - p = p->prev; - if (ch_seek(p->pos)) - return (NULL_POSITION); - for (clinenum = p->line, cpos = p->pos; clinenum < linenum; clinenum++) - { - /* - * Allow a signal to abort this loop. - */ - cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL); - if (ABORT_SIGS()) - return (NULL_POSITION); - if (cpos == NULL_POSITION) - return (NULL_POSITION); - } - } else - { - /* - * Go backward. - */ - if (ch_seek(p->pos)) - return (NULL_POSITION); - for (clinenum = p->line, cpos = p->pos; clinenum > linenum; clinenum--) - { - /* - * Allow a signal to abort this loop. - */ - cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL); - if (ABORT_SIGS()) - return (NULL_POSITION); - if (cpos == NULL_POSITION) - return (NULL_POSITION); - } - } - /* - * We might as well cache it. - */ - add_lnum(clinenum, cpos); - return (cpos); + struct linenum_info *p; + POSITION cpos; + LINENUM clinenum; + + if (linenum <= 1) + /* + * Line number 1 is beginning of file. + */ + return (ch_zero()); + + /* + * Find the entry nearest to the line number we want. + */ + for (p = anchor.next; p != &anchor && p->line < linenum; p = p->next) + continue; + if (p->line == linenum) + /* Found it exactly. */ + return (p->pos); + + if (p == &anchor || linenum - p->prev->line < p->line - linenum) + { + /* + * Go forward. + */ + p = p->prev; + if (ch_seek(p->pos)) + return (NULL_POSITION); + for (clinenum = p->line, cpos = p->pos; clinenum < linenum; clinenum++) + { + /* + * Allow a signal to abort this loop. + */ + cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL); + if (ABORT_SIGS()) + return (NULL_POSITION); + if (cpos == NULL_POSITION) + return (NULL_POSITION); + } + } else + { + /* + * Go backward. + */ + if (ch_seek(p->pos)) + return (NULL_POSITION); + for (clinenum = p->line, cpos = p->pos; clinenum > linenum; clinenum--) + { + /* + * Allow a signal to abort this loop. + */ + cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL); + if (ABORT_SIGS()) + return (NULL_POSITION); + if (cpos == NULL_POSITION) + return (NULL_POSITION); + } + } + /* + * We might as well cache it. + */ + add_lnum(clinenum, cpos); + return (cpos); } /* @@ -452,58 +452,58 @@ find_pos(linenum) * The argument "where" tells which line is to be considered * the "current" line (e.g. TOP, BOTTOM, MIDDLE, etc). */ - public LINENUM + public LINENUM currline(where) - int where; + int where; { - POSITION pos; - POSITION len; - LINENUM linenum; - - pos = position(where); - len = ch_length(); - while (pos == NULL_POSITION && where >= 0 && where < sc_height) - pos = position(++where); - if (pos == NULL_POSITION) - pos = len; - linenum = find_linenum(pos); - if (pos == len) - linenum--; - return (linenum); + POSITION pos; + POSITION len; + LINENUM linenum; + + pos = position(where); + len = ch_length(); + while (pos == NULL_POSITION && where >= 0 && where < sc_height) + pos = position(++where); + if (pos == NULL_POSITION) + pos = len; + linenum = find_linenum(pos); + if (pos == len) + linenum--; + return (linenum); } /* * Scan entire file, counting line numbers. */ - public void + public void scan_eof(VOID_PARAM) { - POSITION pos = 0; - LINENUM linenum = 0; - - if (ch_seek(0)) - return; - ierror("Determining length of file", NULL_PARG); - while (pos != NULL_POSITION) - { - /* For efficiency, only add one every 256 line numbers. */ - if ((linenum++ % 256) == 0) - add_lnum(linenum, pos); - pos = forw_raw_line(pos, (char **)NULL, (int *)NULL); - if (ABORT_SIGS()) - break; - } + POSITION pos = 0; + LINENUM linenum = 0; + + if (ch_seek(0)) + return; + ierror("Determining length of file", NULL_PARG); + while (pos != NULL_POSITION) + { + /* For efficiency, only add one every 256 line numbers. */ + if ((linenum++ % 256) == 0) + add_lnum(linenum, pos); + pos = forw_raw_line(pos, (char **)NULL, (int *)NULL); + if (ABORT_SIGS()) + break; + } } /* * Return a line number adjusted for display * (handles the --no-number-headers option). */ - public LINENUM + public LINENUM vlinenum(linenum) - LINENUM linenum; + LINENUM linenum; { - if (nonum_headers) - linenum = (linenum < header_lines) ? 0 : linenum - header_lines; - return linenum; + if (nonum_headers) + linenum = (linenum < header_lines) ? 0 : linenum - header_lines; + return linenum; } diff --git a/lsystem.c b/lsystem.c index d817369..a45a1a2 100644 --- a/lsystem.c +++ b/lsystem.c @@ -42,196 +42,196 @@ extern IFILE curr_ifile; * Pass the specified command to a shell to be executed. * Like plain "system()", but handles resetting terminal modes, etc. */ - public void + public void lsystem(cmd, donemsg) - char *cmd; - char *donemsg; + char *cmd; + char *donemsg; { - int inp; + int inp; #if HAVE_SHELL - char *shell; - char *p; + char *shell; + char *p; #endif - IFILE save_ifile; + IFILE save_ifile; #if MSDOS_COMPILER && MSDOS_COMPILER!=WIN32C - char cwd[FILENAME_MAX+1]; + char cwd[FILENAME_MAX+1]; #endif - /* - * Print the command which is to be executed, - * unless the command starts with a "-". - */ - if (cmd[0] == '-') - cmd++; - else - { - clear_bot(); - putstr("!"); - putstr(cmd); - putstr("\n"); - } + /* + * Print the command which is to be executed, + * unless the command starts with a "-". + */ + if (cmd[0] == '-') + cmd++; + else + { + clear_bot(); + putstr("!"); + putstr(cmd); + putstr("\n"); + } #if MSDOS_COMPILER #if MSDOS_COMPILER==WIN32C - if (*cmd == '\0') - cmd = getenv("COMSPEC"); + if (*cmd == '\0') + cmd = getenv("COMSPEC"); #else - /* - * Working directory is global on MSDOS. - * The child might change the working directory, so we - * must save and restore CWD across calls to "system", - * or else we won't find our file when we return and - * try to "reedit_ifile" it. - */ - getcwd(cwd, FILENAME_MAX); + /* + * Working directory is global on MSDOS. + * The child might change the working directory, so we + * must save and restore CWD across calls to "system", + * or else we won't find our file when we return and + * try to "reedit_ifile" it. + */ + getcwd(cwd, FILENAME_MAX); #endif #endif - /* - * Close the current input file. - */ - save_ifile = save_curr_ifile(); - (void) edit_ifile(NULL_IFILE); - - /* - * De-initialize the terminal and take out of raw mode. - */ - deinit(); - flush(); /* Make sure the deinit chars get out */ - raw_mode(0); + /* + * Close the current input file. + */ + save_ifile = save_curr_ifile(); + (void) edit_ifile(NULL_IFILE); + + /* + * De-initialize the terminal and take out of raw mode. + */ + deinit(); + flush(); /* Make sure the deinit chars get out */ + raw_mode(0); #if MSDOS_COMPILER==WIN32C - close_getchr(); + close_getchr(); #endif - /* - * Restore signals to their defaults. - */ - init_signals(0); + /* + * Restore signals to their defaults. + */ + init_signals(0); #if HAVE_DUP - /* - * Force standard input to be the user's terminal - * (the normal standard input), even if less's standard input - * is coming from a pipe. - */ - inp = dup(0); - close(0); + /* + * Force standard input to be the user's terminal + * (the normal standard input), even if less's standard input + * is coming from a pipe. + */ + inp = dup(0); + close(0); #if !MSDOS_COMPILER - if (open_tty() < 0) + if (open_tty() < 0) #endif - dup(inp); + dup(inp); #endif - /* - * Pass the command to the system to be executed. - * If we have a SHELL environment variable, use - * <$SHELL -c "command"> instead of just . - * If the command is empty, just invoke a shell. - */ + /* + * Pass the command to the system to be executed. + * If we have a SHELL environment variable, use + * <$SHELL -c "command"> instead of just . + * If the command is empty, just invoke a shell. + */ #if HAVE_SHELL - p = NULL; - if ((shell = lgetenv("SHELL")) != NULL && *shell != '\0') - { - if (*cmd == '\0') - p = save(shell); - else - { - char *esccmd = shell_quote(cmd); - if (esccmd != NULL) - { - int len = (int) (strlen(shell) + strlen(esccmd) + 5); - p = (char *) ecalloc(len, sizeof(char)); - SNPRINTF3(p, len, "%s %s %s", shell, shell_coption(), esccmd); - free(esccmd); - } - } - } - if (p == NULL) - { - if (*cmd == '\0') - p = save("sh"); - else - p = save(cmd); - } - system(p); - free(p); + p = NULL; + if ((shell = lgetenv("SHELL")) != NULL && *shell != '\0') + { + if (*cmd == '\0') + p = save(shell); + else + { + char *esccmd = shell_quote(cmd); + if (esccmd != NULL) + { + int len = (int) (strlen(shell) + strlen(esccmd) + 5); + p = (char *) ecalloc(len, sizeof(char)); + SNPRINTF3(p, len, "%s %s %s", shell, shell_coption(), esccmd); + free(esccmd); + } + } + } + if (p == NULL) + { + if (*cmd == '\0') + p = save("sh"); + else + p = save(cmd); + } + system(p); + free(p); #else #if MSDOS_COMPILER==DJGPPC - /* - * Make stdin of the child be in cooked mode. - */ - setmode(0, O_TEXT); - /* - * We don't need to catch signals of the child (it - * also makes trouble with some DPMI servers). - */ - __djgpp_exception_toggle(); - system(cmd); - __djgpp_exception_toggle(); + /* + * Make stdin of the child be in cooked mode. + */ + setmode(0, O_TEXT); + /* + * We don't need to catch signals of the child (it + * also makes trouble with some DPMI servers). + */ + __djgpp_exception_toggle(); + system(cmd); + __djgpp_exception_toggle(); #else - system(cmd); + system(cmd); #endif #endif #if HAVE_DUP - /* - * Restore standard input, reset signals, raw mode, etc. - */ - close(0); - dup(inp); - close(inp); + /* + * Restore standard input, reset signals, raw mode, etc. + */ + close(0); + dup(inp); + close(inp); #endif #if MSDOS_COMPILER==WIN32C - open_getchr(); + open_getchr(); #endif - init_signals(1); - raw_mode(1); - if (donemsg != NULL) - { - putstr(donemsg); - putstr(" (press RETURN)"); - get_return(); - putchr('\n'); - flush(); - } - init(); - screen_trashed = 1; + init_signals(1); + raw_mode(1); + if (donemsg != NULL) + { + putstr(donemsg); + putstr(" (press RETURN)"); + get_return(); + putchr('\n'); + flush(); + } + init(); + screen_trashed = 1; #if MSDOS_COMPILER && MSDOS_COMPILER!=WIN32C - /* - * Restore the previous directory (possibly - * changed by the child program we just ran). - */ - chdir(cwd); + /* + * Restore the previous directory (possibly + * changed by the child program we just ran). + */ + chdir(cwd); #if MSDOS_COMPILER != DJGPPC - /* - * Some versions of chdir() don't change to the drive - * which is part of CWD. (DJGPP does this in chdir.) - */ - if (cwd[1] == ':') - { - if (cwd[0] >= 'a' && cwd[0] <= 'z') - setdisk(cwd[0] - 'a'); - else if (cwd[0] >= 'A' && cwd[0] <= 'Z') - setdisk(cwd[0] - 'A'); - } + /* + * Some versions of chdir() don't change to the drive + * which is part of CWD. (DJGPP does this in chdir.) + */ + if (cwd[1] == ':') + { + if (cwd[0] >= 'a' && cwd[0] <= 'z') + setdisk(cwd[0] - 'a'); + else if (cwd[0] >= 'A' && cwd[0] <= 'Z') + setdisk(cwd[0] - 'A'); + } #endif #endif - /* - * Reopen the current input file. - */ - reedit_ifile(save_ifile); + /* + * Reopen the current input file. + */ + reedit_ifile(save_ifile); #if defined(SIGWINCH) || defined(SIGWIND) - /* - * Since we were ignoring window change signals while we executed - * the system command, we must assume the window changed. - * Warning: this leaves a signal pending (in "sigs"), - * so psignals() should be called soon after lsystem(). - */ - winch(0); + /* + * Since we were ignoring window change signals while we executed + * the system command, we must assume the window changed. + * Warning: this leaves a signal pending (in "sigs"), + * so psignals() should be called soon after lsystem(). + */ + winch(0); #endif } @@ -251,124 +251,124 @@ lsystem(cmd, donemsg) * If the mark is on the current screen, or if the mark is ".", * the whole current screen is piped. */ - public int + public int pipe_mark(c, cmd) - int c; - char *cmd; + int c; + char *cmd; { - POSITION mpos, tpos, bpos; - - /* - * mpos = the marked position. - * tpos = top of screen. - * bpos = bottom of screen. - */ - mpos = markpos(c); - if (mpos == NULL_POSITION) - return (-1); - tpos = position(TOP); - if (tpos == NULL_POSITION) - tpos = ch_zero(); - bpos = position(BOTTOM); - - if (c == '.') - return (pipe_data(cmd, tpos, bpos)); - else if (mpos <= tpos) - return (pipe_data(cmd, mpos, bpos)); - else if (bpos == NULL_POSITION) - return (pipe_data(cmd, tpos, bpos)); - else - return (pipe_data(cmd, tpos, mpos)); + POSITION mpos, tpos, bpos; + + /* + * mpos = the marked position. + * tpos = top of screen. + * bpos = bottom of screen. + */ + mpos = markpos(c); + if (mpos == NULL_POSITION) + return (-1); + tpos = position(TOP); + if (tpos == NULL_POSITION) + tpos = ch_zero(); + bpos = position(BOTTOM); + + if (c == '.') + return (pipe_data(cmd, tpos, bpos)); + else if (mpos <= tpos) + return (pipe_data(cmd, mpos, bpos)); + else if (bpos == NULL_POSITION) + return (pipe_data(cmd, tpos, bpos)); + else + return (pipe_data(cmd, tpos, mpos)); } /* * Create a pipe to the given shell command. * Feed it the file contents between the positions spos and epos. */ - public int + public int pipe_data(cmd, spos, epos) - char *cmd; - POSITION spos; - POSITION epos; + char *cmd; + POSITION spos; + POSITION epos; { - FILE *f; - int c; - - /* - * This is structured much like lsystem(). - * Since we're running a shell program, we must be careful - * to perform the necessary deinitialization before running - * the command, and reinitialization after it. - */ - if (ch_seek(spos) != 0) - { - error("Cannot seek to start position", NULL_PARG); - return (-1); - } - - if ((f = popen(cmd, "w")) == NULL) - { - error("Cannot create pipe", NULL_PARG); - return (-1); - } - clear_bot(); - putstr("!"); - putstr(cmd); - putstr("\n"); - - deinit(); - flush(); - raw_mode(0); - init_signals(0); + FILE *f; + int c; + + /* + * This is structured much like lsystem(). + * Since we're running a shell program, we must be careful + * to perform the necessary deinitialization before running + * the command, and reinitialization after it. + */ + if (ch_seek(spos) != 0) + { + error("Cannot seek to start position", NULL_PARG); + return (-1); + } + + if ((f = popen(cmd, "w")) == NULL) + { + error("Cannot create pipe", NULL_PARG); + return (-1); + } + clear_bot(); + putstr("!"); + putstr(cmd); + putstr("\n"); + + deinit(); + flush(); + raw_mode(0); + init_signals(0); #if MSDOS_COMPILER==WIN32C - close_getchr(); + close_getchr(); #endif #ifdef SIGPIPE - LSIGNAL(SIGPIPE, SIG_IGN); + LSIGNAL(SIGPIPE, SIG_IGN); #endif - c = EOI; - while (epos == NULL_POSITION || spos++ <= epos) - { - /* - * Read a character from the file and give it to the pipe. - */ - c = ch_forw_get(); - if (c == EOI) - break; - if (putc(c, f) == EOF) - break; - } - - /* - * Finish up the last line. - */ - while (c != '\n' && c != EOI ) - { - c = ch_forw_get(); - if (c == EOI) - break; - if (putc(c, f) == EOF) - break; - } - - pclose(f); + c = EOI; + while (epos == NULL_POSITION || spos++ <= epos) + { + /* + * Read a character from the file and give it to the pipe. + */ + c = ch_forw_get(); + if (c == EOI) + break; + if (putc(c, f) == EOF) + break; + } + + /* + * Finish up the last line. + */ + while (c != '\n' && c != EOI ) + { + c = ch_forw_get(); + if (c == EOI) + break; + if (putc(c, f) == EOF) + break; + } + + pclose(f); #ifdef SIGPIPE - LSIGNAL(SIGPIPE, SIG_DFL); + LSIGNAL(SIGPIPE, SIG_DFL); #endif #if MSDOS_COMPILER==WIN32C - open_getchr(); + open_getchr(); #endif - init_signals(1); - raw_mode(1); - init(); - screen_trashed = 1; + init_signals(1); + raw_mode(1); + init(); + screen_trashed = 1; #if defined(SIGWINCH) || defined(SIGWIND) - /* {{ Probably don't need this here. }} */ - winch(0); + /* {{ Probably don't need this here. }} */ + winch(0); #endif - return (0); + return (0); } #endif diff --git a/main.c b/main.c index b3ec9af..515c8d4 100644 --- a/main.c +++ b/main.c @@ -70,289 +70,289 @@ extern int first_time; */ int main(argc, argv) - int argc; - char *argv[]; + int argc; + char *argv[]; { - IFILE ifile; - char *s; + IFILE ifile; + char *s; #ifdef __EMX__ - _response(&argc, &argv); - _wildcard(&argc, &argv); + _response(&argc, &argv); + _wildcard(&argc, &argv); #endif - progname = *argv++; - argc--; + progname = *argv++; + argc--; #if SECURE - secure = 1; + secure = 1; #else - secure = 0; - s = lgetenv("LESSSECURE"); - if (!isnullenv(s)) - secure = 1; + secure = 0; + s = lgetenv("LESSSECURE"); + if (!isnullenv(s)) + secure = 1; #endif #ifdef WIN32 - if (getenv("HOME") == NULL) - { - /* - * If there is no HOME environment variable, - * try the concatenation of HOMEDRIVE + HOMEPATH. - */ - char *drive = getenv("HOMEDRIVE"); - char *path = getenv("HOMEPATH"); - if (drive != NULL && path != NULL) - { - char *env = (char *) ecalloc(strlen(drive) + - strlen(path) + 6, sizeof(char)); - strcpy(env, "HOME="); - strcat(env, drive); - strcat(env, path); - putenv(env); - } - } - GetConsoleTitle(consoleTitle, sizeof(consoleTitle)/sizeof(char)); + if (getenv("HOME") == NULL) + { + /* + * If there is no HOME environment variable, + * try the concatenation of HOMEDRIVE + HOMEPATH. + */ + char *drive = getenv("HOMEDRIVE"); + char *path = getenv("HOMEPATH"); + if (drive != NULL && path != NULL) + { + char *env = (char *) ecalloc(strlen(drive) + + strlen(path) + 6, sizeof(char)); + strcpy(env, "HOME="); + strcat(env, drive); + strcat(env, path); + putenv(env); + } + } + GetConsoleTitle(consoleTitle, sizeof(consoleTitle)/sizeof(char)); #endif /* WIN32 */ - /* - * Process command line arguments and LESS environment arguments. - * Command line arguments override environment arguments. - */ - is_tty = isatty(1); - init_mark(); - init_cmds(); - get_term(); - init_charset(); - init_line(); - init_cmdhist(); - init_option(); - init_search(); - - /* - * If the name of the executable program is "more", - * act like LESS_IS_MORE is set. - */ - s = last_component(progname); - if (strcmp(s, "more") == 0) - less_is_more = 1; - - init_prompt(); - - s = lgetenv(less_is_more ? "MORE" : "LESS"); - if (s != NULL) - scan_option(s); + /* + * Process command line arguments and LESS environment arguments. + * Command line arguments override environment arguments. + */ + is_tty = isatty(1); + init_mark(); + init_cmds(); + get_term(); + init_charset(); + init_line(); + init_cmdhist(); + init_option(); + init_search(); + + /* + * If the name of the executable program is "more", + * act like LESS_IS_MORE is set. + */ + s = last_component(progname); + if (strcmp(s, "more") == 0) + less_is_more = 1; + + init_prompt(); + + s = lgetenv(less_is_more ? "MORE" : "LESS"); + if (s != NULL) + scan_option(s); #define isoptstring(s) (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') - while (argc > 0 && (isoptstring(*argv) || isoptpending())) - { - s = *argv++; - argc--; - if (strcmp(s, "--") == 0) - break; - scan_option(s); - } + while (argc > 0 && (isoptstring(*argv) || isoptpending())) + { + s = *argv++; + argc--; + if (strcmp(s, "--") == 0) + break; + scan_option(s); + } #undef isoptstring - if (isoptpending()) - { - /* - * Last command line option was a flag requiring a - * following string, but there was no following string. - */ - nopendopt(); - quit(QUIT_OK); - } + if (isoptpending()) + { + /* + * Last command line option was a flag requiring a + * following string, but there was no following string. + */ + nopendopt(); + quit(QUIT_OK); + } - expand_cmd_tables(); + expand_cmd_tables(); #if EDITOR - editor = lgetenv("VISUAL"); - if (editor == NULL || *editor == '\0') - { - editor = lgetenv("EDITOR"); - if (isnullenv(editor)) - editor = EDIT_PGM; - } - editproto = lgetenv("LESSEDIT"); - if (isnullenv(editproto)) - editproto = "%E ?lm+%lm. %g"; + editor = lgetenv("VISUAL"); + if (editor == NULL || *editor == '\0') + { + editor = lgetenv("EDITOR"); + if (isnullenv(editor)) + editor = EDIT_PGM; + } + editproto = lgetenv("LESSEDIT"); + if (isnullenv(editproto)) + editproto = "%E ?lm+%lm. %g"; #endif - /* - * Call get_ifile with all the command line filenames - * to "register" them with the ifile system. - */ - ifile = NULL_IFILE; - if (dohelp) - ifile = get_ifile(FAKE_HELPFILE, ifile); - while (argc-- > 0) - { + /* + * Call get_ifile with all the command line filenames + * to "register" them with the ifile system. + */ + ifile = NULL_IFILE; + if (dohelp) + ifile = get_ifile(FAKE_HELPFILE, ifile); + while (argc-- > 0) + { #if (MSDOS_COMPILER && MSDOS_COMPILER != DJGPPC) - /* - * Because the "shell" doesn't expand filename patterns, - * treat each argument as a filename pattern rather than - * a single filename. - * Expand the pattern and iterate over the expanded list. - */ - struct textlist tlist; - char *filename; - char *gfilename; - char *qfilename; - - gfilename = lglob(*argv++); - init_textlist(&tlist, gfilename); - filename = NULL; - while ((filename = forw_textlist(&tlist, filename)) != NULL) - { - qfilename = shell_unquote(filename); - (void) get_ifile(qfilename, ifile); - free(qfilename); - ifile = prev_ifile(NULL_IFILE); - } - free(gfilename); + /* + * Because the "shell" doesn't expand filename patterns, + * treat each argument as a filename pattern rather than + * a single filename. + * Expand the pattern and iterate over the expanded list. + */ + struct textlist tlist; + char *filename; + char *gfilename; + char *qfilename; + + gfilename = lglob(*argv++); + init_textlist(&tlist, gfilename); + filename = NULL; + while ((filename = forw_textlist(&tlist, filename)) != NULL) + { + qfilename = shell_unquote(filename); + (void) get_ifile(qfilename, ifile); + free(qfilename); + ifile = prev_ifile(NULL_IFILE); + } + free(gfilename); #else - (void) get_ifile(*argv++, ifile); - ifile = prev_ifile(NULL_IFILE); + (void) get_ifile(*argv++, ifile); + ifile = prev_ifile(NULL_IFILE); #endif - } - /* - * Set up terminal, etc. - */ - if (!is_tty) - { - /* - * Output is not a tty. - * Just copy the input file(s) to output. - */ - set_output(1); /* write to stdout */ - SET_BINARY(1); - if (edit_first() == 0) - { - do { - cat_file(); - } while (edit_next(1) == 0); - } - quit(QUIT_OK); - } - - if (missing_cap && !know_dumb) - error("WARNING: terminal is not fully functional", NULL_PARG); - open_getchr(); - raw_mode(1); - init_signals(1); - - /* - * Select the first file to examine. - */ + } + /* + * Set up terminal, etc. + */ + if (!is_tty) + { + /* + * Output is not a tty. + * Just copy the input file(s) to output. + */ + set_output(1); /* write to stdout */ + SET_BINARY(1); + if (edit_first() == 0) + { + do { + cat_file(); + } while (edit_next(1) == 0); + } + quit(QUIT_OK); + } + + if (missing_cap && !know_dumb) + error("WARNING: terminal is not fully functional", NULL_PARG); + open_getchr(); + raw_mode(1); + init_signals(1); + + /* + * Select the first file to examine. + */ #if TAGS - if (tagoption != NULL || strcmp(tags, "-") == 0) - { - /* - * A -t option was given. - * Verify that no filenames were also given. - * Edit the file selected by the "tags" search, - * and search for the proper line in the file. - */ - if (nifile() > 0) - { - error("No filenames allowed with -t option", NULL_PARG); - quit(QUIT_ERROR); - } - findtag(tagoption); - if (edit_tagfile()) /* Edit file which contains the tag */ - quit(QUIT_ERROR); - /* - * Search for the line which contains the tag. - * Set up initial_scrpos so we display that line. - */ - initial_scrpos.pos = tagsearch(); - if (initial_scrpos.pos == NULL_POSITION) - quit(QUIT_ERROR); - initial_scrpos.ln = jump_sline; - } else + if (tagoption != NULL || strcmp(tags, "-") == 0) + { + /* + * A -t option was given. + * Verify that no filenames were also given. + * Edit the file selected by the "tags" search, + * and search for the proper line in the file. + */ + if (nifile() > 0) + { + error("No filenames allowed with -t option", NULL_PARG); + quit(QUIT_ERROR); + } + findtag(tagoption); + if (edit_tagfile()) /* Edit file which contains the tag */ + quit(QUIT_ERROR); + /* + * Search for the line which contains the tag. + * Set up initial_scrpos so we display that line. + */ + initial_scrpos.pos = tagsearch(); + if (initial_scrpos.pos == NULL_POSITION) + quit(QUIT_ERROR); + initial_scrpos.ln = jump_sline; + } else #endif - { - if (edit_first()) - quit(QUIT_ERROR); - /* - * See if file fits on one screen to decide whether - * to send terminal init. But don't need this - * if -X (no_init) overrides this (see init()). - */ - if (quit_if_one_screen) - { - if (nifile() > 1) /* If more than one file, -F cannot be used */ - quit_if_one_screen = FALSE; - else if (!no_init) - one_screen = get_one_screen(); - } - } - - if (errmsgs > 0) - { - /* - * We displayed some messages on error output - * (file descriptor 2; see flush()). - * Before erasing the screen contents, wait for a keystroke. - */ - less_printf("Press RETURN to continue ", NULL_PARG); - get_return(); - putchr('\n'); - } - set_output(1); - init(); - commands(); - quit(QUIT_OK); - /*NOTREACHED*/ - return (0); + { + if (edit_first()) + quit(QUIT_ERROR); + /* + * See if file fits on one screen to decide whether + * to send terminal init. But don't need this + * if -X (no_init) overrides this (see init()). + */ + if (quit_if_one_screen) + { + if (nifile() > 1) /* If more than one file, -F cannot be used */ + quit_if_one_screen = FALSE; + else if (!no_init) + one_screen = get_one_screen(); + } + } + + if (errmsgs > 0) + { + /* + * We displayed some messages on error output + * (file descriptor 2; see flush()). + * Before erasing the screen contents, wait for a keystroke. + */ + less_printf("Press RETURN to continue ", NULL_PARG); + get_return(); + putchr('\n'); + } + set_output(1); + init(); + commands(); + quit(QUIT_OK); + /*NOTREACHED*/ + return (0); } /* * Copy a string to a "safe" place * (that is, to a buffer allocated by calloc). */ - public char * + public char * save(s) - constant char *s; + constant char *s; { - char *p; + char *p; - p = (char *) ecalloc(strlen(s)+1, sizeof(char)); - strcpy(p, s); - return (p); + p = (char *) ecalloc(strlen(s)+1, sizeof(char)); + strcpy(p, s); + return (p); } /* * Allocate memory. * Like calloc(), but never returns an error (NULL). */ - public VOID_POINTER + public VOID_POINTER ecalloc(count, size) - int count; - unsigned int size; + int count; + unsigned int size; { - VOID_POINTER p; - - p = (VOID_POINTER) calloc(count, size); - if (p != NULL) - return (p); - error("Cannot allocate memory", NULL_PARG); - quit(QUIT_ERROR); - /*NOTREACHED*/ - return (NULL); + VOID_POINTER p; + + p = (VOID_POINTER) calloc(count, size); + if (p != NULL) + return (p); + error("Cannot allocate memory", NULL_PARG); + quit(QUIT_ERROR); + /*NOTREACHED*/ + return (NULL); } /* * Skip leading spaces in a string. */ - public char * + public char * skipsp(s) - char *s; + char *s; { - while (*s == ' ' || *s == '\t') - s++; - return (s); + while (*s == ' ' || *s == '\t') + s++; + return (s); } /* @@ -360,87 +360,87 @@ skipsp(s) * If uppercase is true, the first string must begin with an uppercase * character; the remainder of the first string may be either case. */ - public int + public int sprefix(ps, s, uppercase) - char *ps; - char *s; - int uppercase; + char *ps; + char *s; + int uppercase; { - int c; - int sc; - int len = 0; - - for ( ; *s != '\0'; s++, ps++) - { - c = *ps; - if (uppercase) - { - if (len == 0 && ASCII_IS_LOWER(c)) - return (-1); - if (ASCII_IS_UPPER(c)) - c = ASCII_TO_LOWER(c); - } - sc = *s; - if (len > 0 && ASCII_IS_UPPER(sc)) - sc = ASCII_TO_LOWER(sc); - if (c != sc) - break; - len++; - } - return (len); + int c; + int sc; + int len = 0; + + for ( ; *s != '\0'; s++, ps++) + { + c = *ps; + if (uppercase) + { + if (len == 0 && ASCII_IS_LOWER(c)) + return (-1); + if (ASCII_IS_UPPER(c)) + c = ASCII_TO_LOWER(c); + } + sc = *s; + if (len > 0 && ASCII_IS_UPPER(sc)) + sc = ASCII_TO_LOWER(sc); + if (c != sc) + break; + len++; + } + return (len); } /* * Exit the program. */ - public void + public void quit(status) - int status; + int status; { - static int save_status; - - /* - * Put cursor at bottom left corner, clear the line, - * reset the terminal modes, and exit. - */ - if (status < 0) - status = save_status; - else - save_status = status; + static int save_status; + + /* + * Put cursor at bottom left corner, clear the line, + * reset the terminal modes, and exit. + */ + if (status < 0) + status = save_status; + else + save_status = status; #if LESSTEST - rstat('Q'); + rstat('Q'); #endif /*LESSTEST*/ - quitting = 1; - if (interactive()) - clear_bot(); - deinit(); - flush(); - if (redraw_on_quit && term_init_done) - { - /* - * The last file text displayed might have been on an - * alternate screen, which now (since deinit) cannot be seen. - * redraw_on_quit tells us to redraw it on the main screen. - */ - first_time = 1; /* Don't print "skipping" or tildes */ - repaint(); - flush(); - } - edit((char*)NULL); - save_cmdhist(); - raw_mode(0); + quitting = 1; + if (interactive()) + clear_bot(); + deinit(); + flush(); + if (redraw_on_quit && term_init_done) + { + /* + * The last file text displayed might have been on an + * alternate screen, which now (since deinit) cannot be seen. + * redraw_on_quit tells us to redraw it on the main screen. + */ + first_time = 1; /* Don't print "skipping" or tildes */ + repaint(); + flush(); + } + edit((char*)NULL); + save_cmdhist(); + raw_mode(0); #if MSDOS_COMPILER && MSDOS_COMPILER != DJGPPC - /* - * If we don't close 2, we get some garbage from - * 2's buffer when it flushes automatically. - * I cannot track this one down RB - * The same bug shows up if we use ^C^C to abort. - */ - close(2); + /* + * If we don't close 2, we get some garbage from + * 2's buffer when it flushes automatically. + * I cannot track this one down RB + * The same bug shows up if we use ^C^C to abort. + */ + close(2); #endif #ifdef WIN32 - SetConsoleTitle(consoleTitle); + SetConsoleTitle(consoleTitle); #endif - close_getchr(); - exit(status); + close_getchr(); + exit(status); } diff --git a/mark.c b/mark.c index f3bf0c4..ecc3578 100644 --- a/mark.c +++ b/mark.c @@ -19,18 +19,18 @@ extern int perma_marks; /* * A mark is an ifile (input file) plus a position within the file. */ -struct mark +struct mark { - /* - * Normally m_ifile != IFILE_NULL and m_filename == NULL. - * For restored marks we set m_filename instead of m_ifile - * because we don't want to create an ifile until the - * user explicitly requests the file (by name or mark). - */ - char m_letter; /* Associated character */ - IFILE m_ifile; /* Input file being marked */ - char *m_filename; /* Name of the input file */ - struct scrpos m_scrpos; /* Position of the mark */ + /* + * Normally m_ifile != IFILE_NULL and m_filename == NULL. + * For restored marks we set m_filename instead of m_ifile + * because we don't want to create an ifile until the + * user explicitly requests the file (by name or mark). + */ + char m_letter; /* Associated character */ + IFILE m_ifile; /* Input file being marked */ + char *m_filename; /* Name of the input file */ + struct scrpos m_scrpos; /* Position of the mark */ }; /* @@ -49,88 +49,88 @@ public int marks_modified = 0; /* * Initialize a mark struct. */ - static void + static void cmark(m, ifile, pos, ln) - struct mark *m; - IFILE ifile; - POSITION pos; - int ln; + struct mark *m; + IFILE ifile; + POSITION pos; + int ln; { - m->m_ifile = ifile; - m->m_scrpos.pos = pos; - m->m_scrpos.ln = ln; - if (m->m_filename != NULL) - /* Normally should not happen but a corrupt lesshst file can do it. */ - free(m->m_filename); - m->m_filename = NULL; + m->m_ifile = ifile; + m->m_scrpos.pos = pos; + m->m_scrpos.ln = ln; + if (m->m_filename != NULL) + /* Normally should not happen but a corrupt lesshst file can do it. */ + free(m->m_filename); + m->m_filename = NULL; } /* * Initialize the mark table to show no marks are set. */ - public void + public void init_mark(VOID_PARAM) { - int i; - - for (i = 0; i < NMARKS; i++) - { - char letter; - switch (i) { - case MOUSEMARK: letter = '#'; break; - case LASTMARK: letter = '\''; break; - default: letter = (i < 26) ? 'a'+i : 'A'+i-26; break; - } - marks[i].m_letter = letter; - cmark(&marks[i], NULL_IFILE, NULL_POSITION, -1); - } + int i; + + for (i = 0; i < NMARKS; i++) + { + char letter; + switch (i) { + case MOUSEMARK: letter = '#'; break; + case LASTMARK: letter = '\''; break; + default: letter = (i < 26) ? 'a'+i : 'A'+i-26; break; + } + marks[i].m_letter = letter; + cmark(&marks[i], NULL_IFILE, NULL_POSITION, -1); + } } /* * Set m_ifile and clear m_filename. */ - static void + static void mark_set_ifile(m, ifile) - struct mark *m; - IFILE ifile; + struct mark *m; + IFILE ifile; { - m->m_ifile = ifile; - /* With m_ifile set, m_filename is no longer needed. */ - free(m->m_filename); - m->m_filename = NULL; + m->m_ifile = ifile; + /* With m_ifile set, m_filename is no longer needed. */ + free(m->m_filename); + m->m_filename = NULL; } /* * Populate the m_ifile member of a mark struct from m_filename. */ - static void + static void mark_get_ifile(m) - struct mark *m; + struct mark *m; { - if (m->m_ifile != NULL_IFILE) - return; /* m_ifile is already set */ - mark_set_ifile(m, get_ifile(m->m_filename, prev_ifile(NULL_IFILE))); + if (m->m_ifile != NULL_IFILE) + return; /* m_ifile is already set */ + mark_set_ifile(m, get_ifile(m->m_filename, prev_ifile(NULL_IFILE))); } /* * Return the user mark struct identified by a character. */ - static struct mark * + static struct mark * getumark(c) - int c; + int c; { - PARG parg; - if (c >= 'a' && c <= 'z') - return (&marks[c-'a']); - if (c >= 'A' && c <= 'Z') - return (&marks[c-'A'+26]); - if (c == '\'') - return (&marks[LASTMARK]); - if (c == '#') - return (&marks[MOUSEMARK]); - parg.p_char = (char) c; - error("Invalid mark letter %c", &parg); - return (NULL); + PARG parg; + if (c >= 'a' && c <= 'z') + return (&marks[c-'a']); + if (c >= 'A' && c <= 'Z') + return (&marks[c-'A'+26]); + if (c == '\'') + return (&marks[LASTMARK]); + if (c == '#') + return (&marks[MOUSEMARK]); + parg.p_char = (char) c; + error("Invalid mark letter %c", &parg); + return (NULL); } /* @@ -138,260 +138,260 @@ getumark(c) * The mark struct may either be in the mark table (user mark) * or may be constructed on the fly for certain characters like ^, $. */ - static struct mark * + static struct mark * getmark(c) - int c; + int c; { - struct mark *m; - static struct mark sm; - - switch (c) - { - case '^': - /* - * Beginning of the current file. - */ - m = &sm; - cmark(m, curr_ifile, ch_zero(), 0); - break; - case '$': - /* - * End of the current file. - */ - if (ch_end_seek()) - { - error("Cannot seek to end of file", NULL_PARG); - return (NULL); - } - m = &sm; - cmark(m, curr_ifile, ch_tell(), sc_height); - break; - case '.': - /* - * Current position in the current file. - */ - m = &sm; - get_scrpos(&m->m_scrpos, TOP); - cmark(m, curr_ifile, m->m_scrpos.pos, m->m_scrpos.ln); - break; - case '\'': - /* - * The "last mark". - */ - m = &marks[LASTMARK]; - break; - default: - /* - * Must be a user-defined mark. - */ - m = getumark(c); - if (m == NULL) - break; - if (m->m_scrpos.pos == NULL_POSITION) - { - error("Mark not set", NULL_PARG); - return (NULL); - } - break; - } - return (m); + struct mark *m; + static struct mark sm; + + switch (c) + { + case '^': + /* + * Beginning of the current file. + */ + m = &sm; + cmark(m, curr_ifile, ch_zero(), 0); + break; + case '$': + /* + * End of the current file. + */ + if (ch_end_seek()) + { + error("Cannot seek to end of file", NULL_PARG); + return (NULL); + } + m = &sm; + cmark(m, curr_ifile, ch_tell(), sc_height); + break; + case '.': + /* + * Current position in the current file. + */ + m = &sm; + get_scrpos(&m->m_scrpos, TOP); + cmark(m, curr_ifile, m->m_scrpos.pos, m->m_scrpos.ln); + break; + case '\'': + /* + * The "last mark". + */ + m = &marks[LASTMARK]; + break; + default: + /* + * Must be a user-defined mark. + */ + m = getumark(c); + if (m == NULL) + break; + if (m->m_scrpos.pos == NULL_POSITION) + { + error("Mark not set", NULL_PARG); + return (NULL); + } + break; + } + return (m); } /* * Is a mark letter invalid? */ - public int + public int badmark(c) - int c; + int c; { - return (getmark(c) == NULL); + return (getmark(c) == NULL); } /* * Set a user-defined mark. */ - public void + public void setmark(c, where) - int c; - int where; + int c; + int where; { - struct mark *m; - struct scrpos scrpos; - - m = getumark(c); - if (m == NULL) - return; - get_scrpos(&scrpos, where); - if (scrpos.pos == NULL_POSITION) - { - bell(); - return; - } - cmark(m, curr_ifile, scrpos.pos, scrpos.ln); - marks_modified = 1; + struct mark *m; + struct scrpos scrpos; + + m = getumark(c); + if (m == NULL) + return; + get_scrpos(&scrpos, where); + if (scrpos.pos == NULL_POSITION) + { + bell(); + return; + } + cmark(m, curr_ifile, scrpos.pos, scrpos.ln); + marks_modified = 1; } /* * Clear a user-defined mark. */ - public void + public void clrmark(c) - int c; + int c; { - struct mark *m; - - m = getumark(c); - if (m == NULL) - return; - if (m->m_scrpos.pos == NULL_POSITION) - { - bell(); - return; - } - m->m_scrpos.pos = NULL_POSITION; - marks_modified = 1; + struct mark *m; + + m = getumark(c); + if (m == NULL) + return; + if (m->m_scrpos.pos == NULL_POSITION) + { + bell(); + return; + } + m->m_scrpos.pos = NULL_POSITION; + marks_modified = 1; } /* * Set lmark (the mark named by the apostrophe). */ - public void + public void lastmark(VOID_PARAM) { - struct scrpos scrpos; - - if (ch_getflags() & CH_HELPFILE) - return; - get_scrpos(&scrpos, TOP); - if (scrpos.pos == NULL_POSITION) - return; - cmark(&marks[LASTMARK], curr_ifile, scrpos.pos, scrpos.ln); - marks_modified = 1; + struct scrpos scrpos; + + if (ch_getflags() & CH_HELPFILE) + return; + get_scrpos(&scrpos, TOP); + if (scrpos.pos == NULL_POSITION) + return; + cmark(&marks[LASTMARK], curr_ifile, scrpos.pos, scrpos.ln); + marks_modified = 1; } /* * Go to a mark. */ - public void + public void gomark(c) - int c; + int c; { - struct mark *m; - struct scrpos scrpos; - - m = getmark(c); - if (m == NULL) - return; - - /* - * If we're trying to go to the lastmark and - * it has not been set to anything yet, - * set it to the beginning of the current file. - * {{ Couldn't we instead set marks[LASTMARK] in edit()? }} - */ - if (m == &marks[LASTMARK] && m->m_scrpos.pos == NULL_POSITION) - cmark(m, curr_ifile, ch_zero(), jump_sline); - - mark_get_ifile(m); - - /* Save scrpos; if it's LASTMARK it could change in edit_ifile. */ - scrpos = m->m_scrpos; - if (m->m_ifile != curr_ifile) - { - /* - * Not in the current file; edit the correct file. - */ - if (edit_ifile(m->m_ifile)) - return; - } - - jump_loc(scrpos.pos, scrpos.ln); + struct mark *m; + struct scrpos scrpos; + + m = getmark(c); + if (m == NULL) + return; + + /* + * If we're trying to go to the lastmark and + * it has not been set to anything yet, + * set it to the beginning of the current file. + * {{ Couldn't we instead set marks[LASTMARK] in edit()? }} + */ + if (m == &marks[LASTMARK] && m->m_scrpos.pos == NULL_POSITION) + cmark(m, curr_ifile, ch_zero(), jump_sline); + + mark_get_ifile(m); + + /* Save scrpos; if it's LASTMARK it could change in edit_ifile. */ + scrpos = m->m_scrpos; + if (m->m_ifile != curr_ifile) + { + /* + * Not in the current file; edit the correct file. + */ + if (edit_ifile(m->m_ifile)) + return; + } + + jump_loc(scrpos.pos, scrpos.ln); } /* * Return the position associated with a given mark letter. * - * We don't return which screen line the position + * We don't return which screen line the position * is associated with, but this doesn't matter much, * because it's always the first non-blank line on the screen. */ - public POSITION + public POSITION markpos(c) - int c; + int c; { - struct mark *m; - - m = getmark(c); - if (m == NULL) - return (NULL_POSITION); - - if (m->m_ifile != curr_ifile) - { - error("Mark not in current file", NULL_PARG); - return (NULL_POSITION); - } - return (m->m_scrpos.pos); + struct mark *m; + + m = getmark(c); + if (m == NULL) + return (NULL_POSITION); + + if (m->m_ifile != curr_ifile) + { + error("Mark not in current file", NULL_PARG); + return (NULL_POSITION); + } + return (m->m_scrpos.pos); } /* * Return the mark associated with a given position, if any. */ - public char + public char posmark(pos) - POSITION pos; + POSITION pos; { - int i; - - /* Only user marks */ - for (i = 0; i < NUMARKS; i++) - { - if (marks[i].m_ifile == curr_ifile && marks[i].m_scrpos.pos == pos) - { - if (i < 26) return 'a' + i; - if (i < 26*2) return 'A' + (i - 26); - return '#'; - } - } - return 0; + int i; + + /* Only user marks */ + for (i = 0; i < NUMARKS; i++) + { + if (marks[i].m_ifile == curr_ifile && marks[i].m_scrpos.pos == pos) + { + if (i < 26) return 'a' + i; + if (i < 26*2) return 'A' + (i - 26); + return '#'; + } + } + return 0; } /* * Clear the marks associated with a specified ifile. */ - public void + public void unmark(ifile) - IFILE ifile; + IFILE ifile; { - int i; + int i; - for (i = 0; i < NMARKS; i++) - if (marks[i].m_ifile == ifile) - marks[i].m_scrpos.pos = NULL_POSITION; + for (i = 0; i < NMARKS; i++) + if (marks[i].m_ifile == ifile) + marks[i].m_scrpos.pos = NULL_POSITION; } /* * Check if any marks refer to a specified ifile vi m_filename * rather than m_ifile. */ - public void + public void mark_check_ifile(ifile) - IFILE ifile; + IFILE ifile; { - int i; - char *filename = get_real_filename(ifile); - - for (i = 0; i < NMARKS; i++) - { - struct mark *m = &marks[i]; - char *mark_filename = m->m_filename; - if (mark_filename != NULL) - { - mark_filename = lrealpath(mark_filename); - if (strcmp(filename, mark_filename) == 0) - mark_set_ifile(m, ifile); - free(mark_filename); - } - } + int i; + char *filename = get_real_filename(ifile); + + for (i = 0; i < NMARKS; i++) + { + struct mark *m = &marks[i]; + char *mark_filename = m->m_filename; + if (mark_filename != NULL) + { + mark_filename = lrealpath(mark_filename); + if (strcmp(filename, mark_filename) == 0) + mark_set_ifile(m, ifile); + free(mark_filename); + } + } } #if CMD_HISTORY @@ -399,63 +399,63 @@ mark_check_ifile(ifile) /* * Save marks to history file. */ - public void + public void save_marks(fout, hdr) - FILE *fout; - char *hdr; + FILE *fout; + char *hdr; { - int i; - - if (!perma_marks) - return; - - fprintf(fout, "%s\n", hdr); - for (i = 0; i < NMARKS; i++) - { - char *filename; - struct mark *m = &marks[i]; - char pos_str[INT_STRLEN_BOUND(m->m_scrpos.pos) + 2]; - if (m->m_scrpos.pos == NULL_POSITION) - continue; - postoa(m->m_scrpos.pos, pos_str); - filename = m->m_filename; - if (filename == NULL) - filename = get_real_filename(m->m_ifile); - if (strcmp(filename, "-") != 0) - fprintf(fout, "m %c %d %s %s\n", - m->m_letter, m->m_scrpos.ln, pos_str, filename); - } + int i; + + if (!perma_marks) + return; + + fprintf(fout, "%s\n", hdr); + for (i = 0; i < NMARKS; i++) + { + char *filename; + struct mark *m = &marks[i]; + char pos_str[INT_STRLEN_BOUND(m->m_scrpos.pos) + 2]; + if (m->m_scrpos.pos == NULL_POSITION) + continue; + postoa(m->m_scrpos.pos, pos_str); + filename = m->m_filename; + if (filename == NULL) + filename = get_real_filename(m->m_ifile); + if (strcmp(filename, "-") != 0) + fprintf(fout, "m %c %d %s %s\n", + m->m_letter, m->m_scrpos.ln, pos_str, filename); + } } /* * Restore one mark from the history file. */ - public void + public void restore_mark(line) - char *line; + char *line; { - struct mark *m; - int ln; - POSITION pos; + struct mark *m; + int ln; + POSITION pos; #define skip_whitespace while (*line == ' ') line++ - if (*line++ != 'm') - return; - skip_whitespace; - m = getumark(*line++); - if (m == NULL) - return; - skip_whitespace; - ln = lstrtoi(line, &line); - if (ln < 1) - ln = 1; - if (ln > sc_height) - ln = sc_height; - skip_whitespace; - pos = lstrtopos(line, &line); - skip_whitespace; - cmark(m, NULL_IFILE, pos, ln); - m->m_filename = save(line); + if (*line++ != 'm') + return; + skip_whitespace; + m = getumark(*line++); + if (m == NULL) + return; + skip_whitespace; + ln = lstrtoi(line, &line); + if (ln < 1) + ln = 1; + if (ln > sc_height) + ln = sc_height; + skip_whitespace; + pos = lstrtopos(line, &line); + skip_whitespace; + cmark(m, NULL_IFILE, pos, ln); + m->m_filename = save(line); } #endif /* CMD_HISTORY */ diff --git a/mkfuncs.pl b/mkfuncs.pl index 3541733..2d3e95d 100644 --- a/mkfuncs.pl +++ b/mkfuncs.pl @@ -6,22 +6,22 @@ my $params; while (<>) { - if (/^\tpublic\s+(.*)/) { - $def = "public $1"; - $state = 1; - $params = 0; - } elsif ($state == 1 and /(\w+)\s*\(/) { - $def .= " $1 LESSPARAMS (("; - $state = 2; - } elsif ($state == 2) { - if (/^{/) { - $def .= 'VOID_PARAM' if not $params; - print "$def));\n"; - $state = 0; - } elsif (/^\s*([^;]*)/) { - $def .= ', ' if substr($def,-1) ne '('; - $def .= $1; - $params = 1; - } - } + if (/^\tpublic\s+(.*)/) { + $def = "public $1"; + $state = 1; + $params = 0; + } elsif ($state == 1 and /(\w+)\s*\(/) { + $def .= " $1 LESSPARAMS (("; + $state = 2; + } elsif ($state == 2) { + if (/^{/) { + $def .= 'VOID_PARAM' if not $params; + print "$def));\n"; + $state = 0; + } elsif (/^\s*([^;]*)/) { + $def .= ', ' if substr($def,-1) ne '('; + $def .= $1; + $params = 1; + } + } } diff --git a/mkfuncs.py b/mkfuncs.py index 7a2da5a..0674d98 100644 --- a/mkfuncs.py +++ b/mkfuncs.py @@ -21,6 +21,6 @@ print(f'{definition}));') state = 0 elif test := re.search(r'^\s*([^;]*)', line): - if (definition[-1:] != '('): definition += ', ' - definition += test.group(1) + if (definition[-1:] != '('): definition += ', ' + definition += test.group(1) params = 1 diff --git a/mkhelp.pl b/mkhelp.pl index a826e20..ec3f51f 100644 --- a/mkhelp.pl +++ b/mkhelp.pl @@ -3,7 +3,7 @@ # Silly little program to generate the help.c source file # from the less.hlp text file. -# The output of this script is a C program defining a char array +# The output of this script is a C program defining a char array # whose content is the input to this script. { diff --git a/mkinstalldirs b/mkinstalldirs index 91f6d04..5b6d1ba 100644 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -7,7 +7,7 @@ errstatus=0 -for file in ${1+"$@"} ; do +for file in ${1+"$@"} ; do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift diff --git a/optfunc.c b/optfunc.c index 84333b7..c187c8a 100644 --- a/optfunc.c +++ b/optfunc.c @@ -96,235 +96,235 @@ extern int sgr_mode; /* * Handler for -o option. */ - public void + public void opt_o(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; - char *filename; + PARG parg; + char *filename; - if (secure) - { - error("log file support is not available", NULL_PARG); - return; - } - switch (type) - { - case INIT: - namelogfile = save(s); - break; - case TOGGLE: - if (ch_getflags() & CH_CANSEEK) - { - error("Input is not a pipe", NULL_PARG); - return; - } - if (logfile >= 0) - { - error("Log file is already in use", NULL_PARG); - return; - } - s = skipsp(s); - if (namelogfile != NULL) - free(namelogfile); - filename = lglob(s); - namelogfile = shell_unquote(filename); - free(filename); - use_logfile(namelogfile); - sync_logfile(); - break; - case QUERY: - if (logfile < 0) - error("No log file", NULL_PARG); - else - { - parg.p_string = namelogfile; - error("Log file \"%s\"", &parg); - } - break; - } + if (secure) + { + error("log file support is not available", NULL_PARG); + return; + } + switch (type) + { + case INIT: + namelogfile = save(s); + break; + case TOGGLE: + if (ch_getflags() & CH_CANSEEK) + { + error("Input is not a pipe", NULL_PARG); + return; + } + if (logfile >= 0) + { + error("Log file is already in use", NULL_PARG); + return; + } + s = skipsp(s); + if (namelogfile != NULL) + free(namelogfile); + filename = lglob(s); + namelogfile = shell_unquote(filename); + free(filename); + use_logfile(namelogfile); + sync_logfile(); + break; + case QUERY: + if (logfile < 0) + error("No log file", NULL_PARG); + else + { + parg.p_string = namelogfile; + error("Log file \"%s\"", &parg); + } + break; + } } /* * Handler for -O option. */ - public void + public void opt__O(type, s) - int type; - char *s; + int type; + char *s; { - force_logfile = TRUE; - opt_o(type, s); + force_logfile = TRUE; + opt_o(type, s); } #endif /* * Handlers for -j option. */ - public void + public void opt_j(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; - int len; - int err; + PARG parg; + int len; + int err; - switch (type) - { - case INIT: - case TOGGLE: - if (*s == '.') - { - s++; - jump_sline_fraction = getfraction(&s, "j", &err); - if (err) - error("Invalid line fraction", NULL_PARG); - else - calc_jump_sline(); - } else - { - int sline = getnum(&s, "j", &err); - if (err) - error("Invalid line number", NULL_PARG); - else - { - jump_sline = sline; - jump_sline_fraction = -1; - } - } - break; - case QUERY: - if (jump_sline_fraction < 0) - { - parg.p_int = jump_sline; - error("Position target at screen line %d", &parg); - } else - { - char buf[24]; - SNPRINTF1(buf, sizeof(buf), ".%06ld", jump_sline_fraction); - len = (int) strlen(buf); - while (len > 2 && buf[len-1] == '0') - len--; - buf[len] = '\0'; - parg.p_string = buf; - error("Position target at screen position %s", &parg); - } - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (*s == '.') + { + s++; + jump_sline_fraction = getfraction(&s, "j", &err); + if (err) + error("Invalid line fraction", NULL_PARG); + else + calc_jump_sline(); + } else + { + int sline = getnum(&s, "j", &err); + if (err) + error("Invalid line number", NULL_PARG); + else + { + jump_sline = sline; + jump_sline_fraction = -1; + } + } + break; + case QUERY: + if (jump_sline_fraction < 0) + { + parg.p_int = jump_sline; + error("Position target at screen line %d", &parg); + } else + { + char buf[24]; + SNPRINTF1(buf, sizeof(buf), ".%06ld", jump_sline_fraction); + len = (int) strlen(buf); + while (len > 2 && buf[len-1] == '0') + len--; + buf[len] = '\0'; + parg.p_string = buf; + error("Position target at screen position %s", &parg); + } + break; + } } - public void + public void calc_jump_sline(VOID_PARAM) { - if (jump_sline_fraction < 0) - return; - jump_sline = sc_height * jump_sline_fraction / NUM_FRAC_DENOM; + if (jump_sline_fraction < 0) + return; + jump_sline = sc_height * jump_sline_fraction / NUM_FRAC_DENOM; } /* * Handlers for -# option. */ - public void + public void opt_shift(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; - int len; - int err; + PARG parg; + int len; + int err; - switch (type) - { - case INIT: - case TOGGLE: - if (*s == '.') - { - s++; - shift_count_fraction = getfraction(&s, "#", &err); - if (err) - error("Invalid column fraction", NULL_PARG); - else - calc_shift_count(); - } else - { - int hs = getnum(&s, "#", &err); - if (err) - error("Invalid column number", NULL_PARG); - else - { - shift_count = hs; - shift_count_fraction = -1; - } - } - break; - case QUERY: - if (shift_count_fraction < 0) - { - parg.p_int = shift_count; - error("Horizontal shift %d columns", &parg); - } else - { - char buf[24]; - SNPRINTF1(buf, sizeof(buf), ".%06ld", shift_count_fraction); - len = (int) strlen(buf); - while (len > 2 && buf[len-1] == '0') - len--; - buf[len] = '\0'; - parg.p_string = buf; - error("Horizontal shift %s of screen width", &parg); - } - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (*s == '.') + { + s++; + shift_count_fraction = getfraction(&s, "#", &err); + if (err) + error("Invalid column fraction", NULL_PARG); + else + calc_shift_count(); + } else + { + int hs = getnum(&s, "#", &err); + if (err) + error("Invalid column number", NULL_PARG); + else + { + shift_count = hs; + shift_count_fraction = -1; + } + } + break; + case QUERY: + if (shift_count_fraction < 0) + { + parg.p_int = shift_count; + error("Horizontal shift %d columns", &parg); + } else + { + char buf[24]; + SNPRINTF1(buf, sizeof(buf), ".%06ld", shift_count_fraction); + len = (int) strlen(buf); + while (len > 2 && buf[len-1] == '0') + len--; + buf[len] = '\0'; + parg.p_string = buf; + error("Horizontal shift %s of screen width", &parg); + } + break; + } } - public void + public void calc_shift_count(VOID_PARAM) { - if (shift_count_fraction < 0) - return; - shift_count = sc_width * shift_count_fraction / NUM_FRAC_DENOM; + if (shift_count_fraction < 0) + return; + shift_count = sc_width * shift_count_fraction / NUM_FRAC_DENOM; } #if USERFILE - public void + public void opt_k(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; + PARG parg; - switch (type) - { - case INIT: - if (lesskey(s, 0)) - { - parg.p_string = s; - error("Cannot use lesskey file \"%s\"", &parg); - } - break; - } + switch (type) + { + case INIT: + if (lesskey(s, 0)) + { + parg.p_string = s; + error("Cannot use lesskey file \"%s\"", &parg); + } + break; + } } -#if HAVE_LESSKEYSRC - public void +#if HAVE_LESSKEYSRC + public void opt_ks(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; + PARG parg; - switch (type) - { - case INIT: - if (lesskey_src(s, 0)) - { - parg.p_string = s; - error("Cannot use lesskey source file \"%s\"", &parg); - } - break; - } + switch (type) + { + case INIT: + if (lesskey_src(s, 0)) + { + parg.p_string = s; + error("Cannot use lesskey source file \"%s\"", &parg); + } + break; + } } #endif /* HAVE_LESSKEYSRC */ #endif /* USERFILE */ @@ -333,818 +333,817 @@ opt_ks(type, s) /* * Handler for -t option. */ - public void + public void opt_t(type, s) - int type; - char *s; + int type; + char *s; { - IFILE save_ifile; - POSITION pos; + IFILE save_ifile; + POSITION pos; - switch (type) - { - case INIT: - tagoption = save(s); - /* Do the rest in main() */ - break; - case TOGGLE: - if (secure) - { - error("tags support is not available", NULL_PARG); - break; - } - findtag(skipsp(s)); - save_ifile = save_curr_ifile(); - /* - * Try to open the file containing the tag - * and search for the tag in that file. - */ - if (edit_tagfile() || (pos = tagsearch()) == NULL_POSITION) - { - /* Failed: reopen the old file. */ - reedit_ifile(save_ifile); - break; - } - unsave_ifile(save_ifile); - jump_loc(pos, jump_sline); - break; - } + switch (type) + { + case INIT: + tagoption = save(s); + /* Do the rest in main() */ + break; + case TOGGLE: + if (secure) + { + error("tags support is not available", NULL_PARG); + break; + } + findtag(skipsp(s)); + save_ifile = save_curr_ifile(); + /* + * Try to open the file containing the tag + * and search for the tag in that file. + */ + if (edit_tagfile() || (pos = tagsearch()) == NULL_POSITION) + { + /* Failed: reopen the old file. */ + reedit_ifile(save_ifile); + break; + } + unsave_ifile(save_ifile); + jump_loc(pos, jump_sline); + break; + } } /* * Handler for -T option. */ - public void + public void opt__T(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; - char *filename; + PARG parg; + char *filename; - switch (type) - { - case INIT: - tags = save(s); - break; - case TOGGLE: - s = skipsp(s); - if (tags != NULL && tags != ztags) - free(tags); - filename = lglob(s); - tags = shell_unquote(filename); - free(filename); - break; - case QUERY: - parg.p_string = tags; - error("Tags file \"%s\"", &parg); - break; - } + switch (type) + { + case INIT: + tags = save(s); + break; + case TOGGLE: + s = skipsp(s); + if (tags != NULL && tags != ztags) + free(tags); + filename = lglob(s); + tags = shell_unquote(filename); + free(filename); + break; + case QUERY: + parg.p_string = tags; + error("Tags file \"%s\"", &parg); + break; + } } #endif /* * Handler for -p option. */ - public void + public void opt_p(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case INIT: - /* - * Unget a command for the specified string. - */ - if (less_is_more) - { - /* - * In "more" mode, the -p argument is a command, - * not a search string, so we don't need a slash. - */ - every_first_cmd = save(s); - } else - { - plusoption = TRUE; - /* - * {{ This won't work if the "/" command is - * changed or invalidated by a .lesskey file. }} - */ - ungetsc("/"); - ungetsc(s); - ungetcc_back(CHAR_END_COMMAND); - } - break; - } + switch (type) + { + case INIT: + /* + * Unget a command for the specified string. + */ + if (less_is_more) + { + /* + * In "more" mode, the -p argument is a command, + * not a search string, so we don't need a slash. + */ + every_first_cmd = save(s); + } else + { + plusoption = TRUE; + /* + * {{ This won't work if the "/" command is + * changed or invalidated by a .lesskey file. }} + */ + ungetsc("/"); + ungetsc(s); + ungetcc_back(CHAR_END_COMMAND); + } + break; + } } /* * Handler for -P option. */ - public void + public void opt__P(type, s) - int type; - char *s; + int type; + char *s; { - char **proto; - PARG parg; + char **proto; + PARG parg; - switch (type) - { - case INIT: - case TOGGLE: - /* - * Figure out which prototype string should be changed. - */ - switch (*s) - { - case 's': proto = &prproto[PR_SHORT]; s++; break; - case 'm': proto = &prproto[PR_MEDIUM]; s++; break; - case 'M': proto = &prproto[PR_LONG]; s++; break; - case '=': proto = &eqproto; s++; break; - case 'h': proto = &hproto; s++; break; - case 'w': proto = &wproto; s++; break; - default: proto = &prproto[PR_SHORT]; break; - } - free(*proto); - *proto = save(s); - break; - case QUERY: - parg.p_string = prproto[pr_type]; - error("%s", &parg); - break; - } + switch (type) + { + case INIT: + case TOGGLE: + /* + * Figure out which prototype string should be changed. + */ + switch (*s) + { + case 's': proto = &prproto[PR_SHORT]; s++; break; + case 'm': proto = &prproto[PR_MEDIUM]; s++; break; + case 'M': proto = &prproto[PR_LONG]; s++; break; + case '=': proto = &eqproto; s++; break; + case 'h': proto = &hproto; s++; break; + case 'w': proto = &wproto; s++; break; + default: proto = &prproto[PR_SHORT]; break; + } + free(*proto); + *proto = save(s); + break; + case QUERY: + parg.p_string = prproto[pr_type]; + error("%s", &parg); + break; + } } /* * Handler for the -b option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_b(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case INIT: - case TOGGLE: - /* - * Set the new number of buffers. - */ - ch_setbufspace(bufspace); - break; - case QUERY: - break; - } + switch (type) + { + case INIT: + case TOGGLE: + /* + * Set the new number of buffers. + */ + ch_setbufspace(bufspace); + break; + case QUERY: + break; + } } /* * Handler for the -i option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_i(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case TOGGLE: - chg_caseless(); - break; - case QUERY: - case INIT: - break; - } + switch (type) + { + case TOGGLE: + chg_caseless(); + break; + case QUERY: + case INIT: + break; + } } /* * Handler for the -V option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt__V(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case TOGGLE: - case QUERY: - dispversion(); - break; - case INIT: - set_output(1); /* Force output to stdout per GNU standard for --version output. */ - putstr("less "); - putstr(version); - putstr(" ("); - putstr(pattern_lib_name()); - putstr(" regular expressions)\n"); - { - char constant *copyright = - "Copyright (C) 1984-2022 Mark Nudelman\n\n"; - putstr(copyright); - } - if (version[strlen(version)-1] == 'x') - { - putstr("** This is an EXPERIMENTAL build of the 'less' software,\n"); - putstr("** and may not function correctly.\n"); - putstr("** Obtain release builds from the web page below.\n\n"); - } - putstr("less comes with NO WARRANTY, to the extent permitted by law.\n"); - putstr("For information about the terms of redistribution,\n"); - putstr("see the file named README in the less distribution.\n"); - putstr("Home page: https://greenwoodsoftware.com/less\n"); - quit(QUIT_OK); - break; - } + switch (type) + { + case TOGGLE: + case QUERY: + dispversion(); + break; + case INIT: + set_output(1); /* Force output to stdout per GNU standard for --version output. */ + putstr("less "); + putstr(version); + putstr(" ("); + putstr(pattern_lib_name()); + putstr(" regular expressions)\n"); + { + char constant *copyright = + "Copyright (C) 1984-2022 Mark Nudelman\n\n"; + putstr(copyright); + } + if (version[strlen(version)-1] == 'x') + { + putstr("** This is an EXPERIMENTAL build of the 'less' software,\n"); + putstr("** and may not function correctly.\n"); + putstr("** Obtain release builds from the web page below.\n\n"); + } + putstr("less comes with NO WARRANTY, to the extent permitted by law.\n"); + putstr("For information about the terms of redistribution,\n"); + putstr("see the file named README in the less distribution.\n"); + putstr("Home page: https://greenwoodsoftware.com/less\n"); + quit(QUIT_OK); + break; + } } #if MSDOS_COMPILER /* * Parse an MSDOS color descriptor. */ - static void + static void colordesc(s, fg_color, bg_color) - char *s; - int *fg_color; - int *bg_color; + char *s; + int *fg_color; + int *bg_color; { - int fg, bg; + int fg, bg; #if MSDOS_COMPILER==WIN32C - int ul = 0; - - if (*s == 'u') - { - ul = COMMON_LVB_UNDERSCORE; - s++; - if (*s == '\0') - { - *fg_color = nm_fg_color | ul; - *bg_color = nm_bg_color; - return; - } - } + int ul = 0; + + if (*s == 'u') + { + ul = COMMON_LVB_UNDERSCORE; + s++; + if (*s == '\0') + { + *fg_color = nm_fg_color | ul; + *bg_color = nm_bg_color; + return; + } + } #endif - if (parse_color(s, &fg, &bg) == CT_NULL) - { - PARG p; - p.p_string = s; - error("Invalid color string \"%s\"", &p); - } else - { - if (fg == CV_NOCHANGE) - fg = nm_fg_color; - if (bg == CV_NOCHANGE) - bg = nm_bg_color; + if (parse_color(s, &fg, &bg) == CT_NULL) + { + PARG p; + p.p_string = s; + error("Invalid color string \"%s\"", &p); + } else + { + if (fg == CV_NOCHANGE) + fg = nm_fg_color; + if (bg == CV_NOCHANGE) + bg = nm_bg_color; #if MSDOS_COMPILER==WIN32C - fg |= ul; + fg |= ul; #endif - *fg_color = fg; - *bg_color = bg; - } + *fg_color = fg; + *bg_color = bg; + } } #endif - static int + static int color_from_namechar(namechar) - char namechar; + char namechar; { - switch (namechar) - { - case 'B': return AT_COLOR_BIN; - case 'C': return AT_COLOR_CTRL; - case 'E': return AT_COLOR_ERROR; - case 'H': return AT_COLOR_HEADER; - case 'M': return AT_COLOR_MARK; - case 'N': return AT_COLOR_LINENUM; - case 'P': return AT_COLOR_PROMPT; - case 'R': return AT_COLOR_RSCROLL; - case 'S': return AT_COLOR_SEARCH; - case 'W': case 'A': return AT_COLOR_ATTN; - case 'n': return AT_NORMAL; - case 's': return AT_STANDOUT; - case 'd': return AT_BOLD; - case 'u': return AT_UNDERLINE; - case 'k': return AT_BLINK; - default: return -1; - } + switch (namechar) + { + case 'B': return AT_COLOR_BIN; + case 'C': return AT_COLOR_CTRL; + case 'E': return AT_COLOR_ERROR; + case 'H': return AT_COLOR_HEADER; + case 'M': return AT_COLOR_MARK; + case 'N': return AT_COLOR_LINENUM; + case 'P': return AT_COLOR_PROMPT; + case 'R': return AT_COLOR_RSCROLL; + case 'S': return AT_COLOR_SEARCH; + case 'W': case 'A': return AT_COLOR_ATTN; + case 'n': return AT_NORMAL; + case 's': return AT_STANDOUT; + case 'd': return AT_BOLD; + case 'u': return AT_UNDERLINE; + case 'k': return AT_BLINK; + default: return -1; + } } /* * Handler for the -D option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_D(type, s) - int type; - char *s; + int type; + char *s; { - PARG p; - int attr; + PARG p; + int attr; - switch (type) - { - case INIT: - case TOGGLE: + switch (type) + { + case INIT: + case TOGGLE: #if MSDOS_COMPILER - if (*s == 'a') - { - sgr_mode = !sgr_mode; - break; - } + if (*s == 'a') + { + sgr_mode = !sgr_mode; + break; + } #endif - attr = color_from_namechar(s[0]); - if (attr < 0) - { - p.p_char = s[0]; - error("Invalid color specifier '%c'", &p); - return; - } - if (!use_color && (attr & AT_COLOR)) - { - error("Set --use-color before changing colors", NULL_PARG); - return; - } - s++; + attr = color_from_namechar(s[0]); + if (attr < 0) + { + p.p_char = s[0]; + error("Invalid color specifier '%c'", &p); + return; + } + if (!use_color && (attr & AT_COLOR)) + { + error("Set --use-color before changing colors", NULL_PARG); + return; + } + s++; #if MSDOS_COMPILER - if (!(attr & AT_COLOR)) - { - switch (attr) - { - case AT_NORMAL: - colordesc(s, &nm_fg_color, &nm_bg_color); - break; - case AT_BOLD: - colordesc(s, &bo_fg_color, &bo_bg_color); - break; - case AT_UNDERLINE: - colordesc(s, &ul_fg_color, &ul_bg_color); - break; - case AT_BLINK: - colordesc(s, &bl_fg_color, &bl_bg_color); - break; - case AT_STANDOUT: - colordesc(s, &so_fg_color, &so_bg_color); - break; - } - if (type == TOGGLE) - { - at_enter(AT_STANDOUT); - at_exit(); - } - } else + if (!(attr & AT_COLOR)) + { + switch (attr) + { + case AT_NORMAL: + colordesc(s, &nm_fg_color, &nm_bg_color); + break; + case AT_BOLD: + colordesc(s, &bo_fg_color, &bo_bg_color); + break; + case AT_UNDERLINE: + colordesc(s, &ul_fg_color, &ul_bg_color); + break; + case AT_BLINK: + colordesc(s, &bl_fg_color, &bl_bg_color); + break; + case AT_STANDOUT: + colordesc(s, &so_fg_color, &so_bg_color); + break; + } + if (type == TOGGLE) + { + at_enter(AT_STANDOUT); + at_exit(); + } + } else #endif - if (set_color_map(attr, s) < 0) - { - p.p_string = s; - error("Invalid color string \"%s\"", &p); - return; - } - break; + if (set_color_map(attr, s) < 0) + { + p.p_string = s; + error("Invalid color string \"%s\"", &p); + return; + } + break; #if MSDOS_COMPILER - case QUERY: - p.p_string = (sgr_mode) ? "on" : "off"; - error("SGR mode is %s", &p); - break; + case QUERY: + p.p_string = (sgr_mode) ? "on" : "off"; + error("SGR mode is %s", &p); + break; #endif - } + } } /* * Handler for the -x option. */ - public void + public void opt_x(type, s) - int type; - char *s; + int type; + char *s; { - extern int tabstops[]; - extern int ntabstops; - extern int tabdefault; - char msg[60+((INT_STRLEN_BOUND(int)+1)*TABSTOP_MAX)]; - int i; - PARG p; + extern int tabstops[]; + extern int ntabstops; + extern int tabdefault; + char msg[60+((INT_STRLEN_BOUND(int)+1)*TABSTOP_MAX)]; + int i; + PARG p; - switch (type) - { - case INIT: - case TOGGLE: - /* Start at 1 because tabstops[0] is always zero. */ - for (i = 1; i < TABSTOP_MAX; ) - { - int n = 0; - s = skipsp(s); - while (*s >= '0' && *s <= '9') - n = (10 * n) + (*s++ - '0'); - if (n > tabstops[i-1]) - tabstops[i++] = n; - s = skipsp(s); - if (*s++ != ',') - break; - } - if (i < 2) - return; - ntabstops = i; - tabdefault = tabstops[ntabstops-1] - tabstops[ntabstops-2]; - break; - case QUERY: - strcpy(msg, "Tab stops "); - if (ntabstops > 2) - { - for (i = 1; i < ntabstops; i++) - { - if (i > 1) - strcat(msg, ","); - sprintf(msg+strlen(msg), "%d", tabstops[i]); - } - sprintf(msg+strlen(msg), " and then "); - } - sprintf(msg+strlen(msg), "every %d spaces", - tabdefault); - p.p_string = msg; - error("%s", &p); - break; - } + switch (type) + { + case INIT: + case TOGGLE: + /* Start at 1 because tabstops[0] is always zero. */ + for (i = 1; i < TABSTOP_MAX; ) + { + int n = 0; + s = skipsp(s); + while (*s >= '0' && *s <= '9') + n = (10 * n) + (*s++ - '0'); + if (n > tabstops[i-1]) + tabstops[i++] = n; + s = skipsp(s); + if (*s++ != ',') + break; + } + if (i < 2) + return; + ntabstops = i; + tabdefault = tabstops[ntabstops-1] - tabstops[ntabstops-2]; + break; + case QUERY: + strcpy(msg, "Tab stops "); + if (ntabstops > 2) + { + for (i = 1; i < ntabstops; i++) + { + if (i > 1) + strcat(msg, ","); + sprintf(msg+strlen(msg), "%d", tabstops[i]); + } + sprintf(msg+strlen(msg), " and then "); + } + sprintf(msg+strlen(msg), "every %d spaces", + tabdefault); + p.p_string = msg; + error("%s", &p); + break; + } } /* * Handler for the -" option. */ - public void + public void opt_quote(type, s) - int type; - char *s; + int type; + char *s; { - char buf[3]; - PARG parg; + char buf[3]; + PARG parg; - switch (type) - { - case INIT: - case TOGGLE: - if (s[0] == '\0') - { - openquote = closequote = '\0'; - break; - } - if (s[1] != '\0' && s[2] != '\0') - { - error("-\" must be followed by 1 or 2 chars", NULL_PARG); - return; - } - openquote = s[0]; - if (s[1] == '\0') - closequote = openquote; - else - closequote = s[1]; - break; - case QUERY: - buf[0] = openquote; - buf[1] = closequote; - buf[2] = '\0'; - parg.p_string = buf; - error("quotes %s", &parg); - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (s[0] == '\0') + { + openquote = closequote = '\0'; + break; + } + if (s[1] != '\0' && s[2] != '\0') + { + error("-\" must be followed by 1 or 2 chars", NULL_PARG); + return; + } + openquote = s[0]; + if (s[1] == '\0') + closequote = openquote; + else + closequote = s[1]; + break; + case QUERY: + buf[0] = openquote; + buf[1] = closequote; + buf[2] = '\0'; + parg.p_string = buf; + error("quotes %s", &parg); + break; + } } /* * Handler for the --rscroll option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_rscroll(type, s) - int type; - char *s; + int type; + char *s; { - PARG p; + PARG p; - switch (type) - { - case INIT: - case TOGGLE: { - char *fmt; - int attr = AT_STANDOUT; - setfmt(s, &fmt, &attr, "*s>"); - if (strcmp(fmt, "-") == 0) - { - rscroll_char = 0; - } else - { - rscroll_char = *fmt ? *fmt : '>'; - rscroll_attr = attr|AT_COLOR_RSCROLL; - } - break; } - case QUERY: { - p.p_string = rscroll_char ? prchar(rscroll_char) : "-"; - error("rscroll char is %s", &p); - break; } - } + switch (type) + { + case INIT: + case TOGGLE: { + char *fmt; + int attr = AT_STANDOUT; + setfmt(s, &fmt, &attr, "*s>"); + if (strcmp(fmt, "-") == 0) + { + rscroll_char = 0; + } else + { + rscroll_char = *fmt ? *fmt : '>'; + rscroll_attr = attr|AT_COLOR_RSCROLL; + } + break; } + case QUERY: { + p.p_string = rscroll_char ? prchar(rscroll_char) : "-"; + error("rscroll char is %s", &p); + break; } + } } /* * "-?" means display a help message. * If from the command line, exit immediately. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_query(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case QUERY: - case TOGGLE: - error("Use \"h\" for help", NULL_PARG); - break; - case INIT: - dohelp = 1; - } + switch (type) + { + case QUERY: + case TOGGLE: + error("Use \"h\" for help", NULL_PARG); + break; + case INIT: + dohelp = 1; + } } /* * Handler for the --mouse option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_mousecap(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case TOGGLE: - if (mousecap == OPT_OFF) - deinit_mouse(); - else - init_mouse(); - break; - case INIT: - case QUERY: - break; - } + switch (type) + { + case TOGGLE: + if (mousecap == OPT_OFF) + deinit_mouse(); + else + init_mouse(); + break; + case INIT: + case QUERY: + break; + } } /* * Handler for the --wheel-lines option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_wheel_lines(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case INIT: - case TOGGLE: - if (wheel_lines <= 0) - wheel_lines = default_wheel_lines(); - break; - case QUERY: - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (wheel_lines <= 0) + wheel_lines = default_wheel_lines(); + break; + case QUERY: + break; + } } /* * Handler for the --line-number-width option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_linenum_width(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; + PARG parg; - switch (type) - { - case INIT: - case TOGGLE: - if (linenum_width > MAX_LINENUM_WIDTH) - { - parg.p_int = MAX_LINENUM_WIDTH; - error("Line number width must not be larger than %d", &parg); - linenum_width = MIN_LINENUM_WIDTH; - } - break; - case QUERY: - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (linenum_width > MAX_LINENUM_WIDTH) + { + parg.p_int = MAX_LINENUM_WIDTH; + error("Line number width must not be larger than %d", &parg); + linenum_width = MIN_LINENUM_WIDTH; + } + break; + case QUERY: + break; + } } /* * Handler for the --status-column-width option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_status_col_width(type, s) - int type; - char *s; + int type; + char *s; { - PARG parg; + PARG parg; - switch (type) - { - case INIT: - case TOGGLE: - if (status_col_width > MAX_STATUSCOL_WIDTH) - { - parg.p_int = MAX_STATUSCOL_WIDTH; - error("Status column width must not be larger than %d", &parg); - status_col_width = 2; - } - break; - case QUERY: - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (status_col_width > MAX_STATUSCOL_WIDTH) + { + parg.p_int = MAX_STATUSCOL_WIDTH; + error("Status column width must not be larger than %d", &parg); + status_col_width = 2; + } + break; + case QUERY: + break; + } } /* * Handler for the --file-size option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_filesize(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case INIT: - case TOGGLE: - if (want_filesize && curr_ifile != NULL && ch_length() == NULL_POSITION) - scan_eof(); - break; - case QUERY: - break; - } + switch (type) + { + case INIT: + case TOGGLE: + if (want_filesize && curr_ifile != NULL && ch_length() == NULL_POSITION) + scan_eof(); + break; + case QUERY: + break; + } } /* * Handler for the --header option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_header(type, s) - int type; - char *s; + int type; + char *s; { - int err; - int n; + int err; + int n; - switch (type) - { - case INIT: - case TOGGLE: - n = getnum(&s, "header", &err); - if (err) - error("invalid number of lines", NULL_PARG); - else - { - header_lines = n; - header_cols = 0; - if (*s == ',') - { - ++s; - n = getnum(&s, "header", &err); - if (err) - error("invalid number of columns", NULL_PARG); - else - header_cols = n; - } - } - break; - case QUERY: - { - char buf[2*INT_STRLEN_BOUND(int)+2]; - PARG parg; - SNPRINTF2(buf, sizeof(buf), "%d,%d", header_lines, header_cols); - parg.p_string = buf; - error("header (lines,columns) is %s", &parg); - } - break; - } + switch (type) + { + case INIT: + case TOGGLE: + n = getnum(&s, "header", &err); + if (err) + error("invalid number of lines", NULL_PARG); + else + { + header_lines = n; + header_cols = 0; + if (*s == ',') + { + ++s; + n = getnum(&s, "header", &err); + if (err) + error("invalid number of columns", NULL_PARG); + else + header_cols = n; + } + } + break; + case QUERY: + { + char buf[2*INT_STRLEN_BOUND(int)+2]; + PARG parg; + SNPRINTF2(buf, sizeof(buf), "%d,%d", header_lines, header_cols); + parg.p_string = buf; + error("header (lines,columns) is %s", &parg); + } + break; + } } /* * Handler for the --search-options option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_search_type(type, s) - int type; - char *s; + int type; + char *s; { - int st; - PARG parg; - char buf[16]; - char *bp; + int st; + PARG parg; + char buf[16]; + char *bp; - switch (type) - { - case INIT: - case TOGGLE: - st = 0; - for (; *s != '\0'; s++) - { - switch (*s) - { - case 'E': case 'e': case CONTROL('E'): st |= SRCH_PAST_EOF; break; - case 'F': case 'f': case CONTROL('F'): st |= SRCH_FIRST_FILE; break; - case 'K': case 'k': case CONTROL('K'): st |= SRCH_NO_MOVE; break; - case 'N': case 'n': case CONTROL('N'): st |= SRCH_NO_MATCH; break; - case 'R': case 'r': case CONTROL('R'): st |= SRCH_NO_REGEX; break; - case 'W': case 'w': case CONTROL('W'): st |= SRCH_WRAP; break; - case '-': st = 0; break; - case '^': break; - default: - parg.p_char = *s; - error("invalid search option '%c'", &parg); - return; - } - } - def_search_type = norm_search_type(st); - break; - case QUERY: - bp = buf; - if (def_search_type & SRCH_PAST_EOF) *bp++ = 'E'; - if (def_search_type & SRCH_FIRST_FILE) *bp++ = 'F'; - if (def_search_type & SRCH_NO_MOVE) *bp++ = 'K'; - if (def_search_type & SRCH_NO_MATCH) *bp++ = 'N'; - if (def_search_type & SRCH_NO_REGEX) *bp++ = 'R'; - if (def_search_type & SRCH_WRAP) *bp++ = 'W'; - if (bp == buf) - *bp++ = '-'; - *bp = '\0'; - parg.p_string = buf; - error("search options: %s", &parg); - break; - } + switch (type) + { + case INIT: + case TOGGLE: + st = 0; + for (; *s != '\0'; s++) + { + switch (*s) + { + case 'E': case 'e': case CONTROL('E'): st |= SRCH_PAST_EOF; break; + case 'F': case 'f': case CONTROL('F'): st |= SRCH_FIRST_FILE; break; + case 'K': case 'k': case CONTROL('K'): st |= SRCH_NO_MOVE; break; + case 'N': case 'n': case CONTROL('N'): st |= SRCH_NO_MATCH; break; + case 'R': case 'r': case CONTROL('R'): st |= SRCH_NO_REGEX; break; + case 'W': case 'w': case CONTROL('W'): st |= SRCH_WRAP; break; + case '-': st = 0; break; + case '^': break; + default: + parg.p_char = *s; + error("invalid search option '%c'", &parg); + return; + } + } + def_search_type = norm_search_type(st); + break; + case QUERY: + bp = buf; + if (def_search_type & SRCH_PAST_EOF) *bp++ = 'E'; + if (def_search_type & SRCH_FIRST_FILE) *bp++ = 'F'; + if (def_search_type & SRCH_NO_MOVE) *bp++ = 'K'; + if (def_search_type & SRCH_NO_MATCH) *bp++ = 'N'; + if (def_search_type & SRCH_NO_REGEX) *bp++ = 'R'; + if (def_search_type & SRCH_WRAP) *bp++ = 'W'; + if (bp == buf) + *bp++ = '-'; + *bp = '\0'; + parg.p_string = buf; + error("search options: %s", &parg); + break; + } } #if LESSTEST /* * Handler for the --tty option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_ttyin_name(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case INIT: - ttyin_name = s; - is_tty = 1; - break; - } + switch (type) + { + case INIT: + ttyin_name = s; + is_tty = 1; + break; + } } /* * Handler for the --rstat option. */ - /*ARGSUSED*/ - public void + /*ARGSUSED*/ + public void opt_rstat(type, s) - int type; - char *s; + int type; + char *s; { - switch (type) - { - case INIT: - rstat_file = open(s, O_WRONLY|O_CREAT, 0664); - if (rstat_file < 0) - { - PARG parg; - parg.p_string = s; - error("Cannot create rstat file \"%s\"", &parg); - } - break; - } + switch (type) + { + case INIT: + rstat_file = open(s, O_WRONLY|O_CREAT, 0664); + if (rstat_file < 0) + { + PARG parg; + parg.p_string = s; + error("Cannot create rstat file \"%s\"", &parg); + } + break; + } } #endif /*LESSTEST*/ - public int + public int chop_line(VOID_PARAM) { - return (chopline || header_cols > 0 || header_lines > 0); + return (chopline || header_cols > 0 || header_lines > 0); } /* * Get the "screen window" size. */ - public int + public int get_swindow(VOID_PARAM) { - if (swindow > 0) - return (swindow); - return (sc_height - header_lines + swindow); + if (swindow > 0) + return (swindow); + return (sc_height - header_lines + swindow); } - diff --git a/option.c b/option.c index c4a496e..1b47a6a 100644 --- a/option.c +++ b/option.c @@ -13,7 +13,7 @@ * * Each option is a single letter which controls a program variable. * The options have defaults which may be changed via - * the command line option, toggled via the "-" command, + * the command line option, toggled via the "-" command, * or queried via the "_" command. */ @@ -35,261 +35,261 @@ extern int opt_use_backslash; /* * Return a printable description of an option. */ - static char * + static char * opt_desc(o) - struct loption *o; + struct loption *o; { - static char buf[OPTNAME_MAX + 10]; - if (o->oletter == OLETTER_NONE) - SNPRINTF1(buf, sizeof(buf), "--%s", o->onames->oname); - else - SNPRINTF2(buf, sizeof(buf), "-%c (--%s)", o->oletter, o->onames->oname); - return (buf); + static char buf[OPTNAME_MAX + 10]; + if (o->oletter == OLETTER_NONE) + SNPRINTF1(buf, sizeof(buf), "--%s", o->onames->oname); + else + SNPRINTF2(buf, sizeof(buf), "-%c (--%s)", o->oletter, o->onames->oname); + return (buf); } /* * Return a string suitable for printing as the "name" of an option. * For example, if the option letter is 'x', just return "-x". */ - public char * + public char * propt(c) - int c; + int c; { - static char buf[MAX_PRCHAR_LEN+2]; + static char buf[MAX_PRCHAR_LEN+2]; - sprintf(buf, "-%s", prchar(c)); - return (buf); + sprintf(buf, "-%s", prchar(c)); + return (buf); } -/* - * Scan an argument (either from the command line or from the +/* + * Scan an argument (either from the command line or from the * LESS environment variable) and process it. */ - public void + public void scan_option(s) - char *s; + char *s; { - struct loption *o; - int optc; - char *optname; - char *printopt; - char *str; - int set_default; - int lc; - int err; - PARG parg; - - if (s == NULL) - return; - - /* - * If we have a pending option which requires an argument, - * handle it now. - * This happens if the previous option was, for example, "-P" - * without a following string. In that case, the current - * option is simply the argument for the previous option. - */ - if (pendopt != NULL) - { - switch (pendopt->otype & OTYPE) - { - case STRING: - (*pendopt->ofunc)(INIT, s); - break; - case NUMBER: - printopt = opt_desc(pendopt); - *(pendopt->ovar) = getnum(&s, printopt, (int*)NULL); - break; - } - pendopt = NULL; - return; - } - - set_default = FALSE; - optname = NULL; - - while (*s != '\0') - { - /* - * Check some special cases first. - */ - switch (optc = *s++) - { - case ' ': - case '\t': - case END_OPTION_STRING: - continue; - case '-': - /* - * "--" indicates an option name instead of a letter. - */ - if (*s == '-') - { - optname = ++s; - break; - } - /* - * "-+" means set these options back to their defaults. - * (They may have been set otherwise by previous - * options.) - */ - set_default = (*s == '+'); - if (set_default) - s++; - continue; - case '+': - /* - * An option prefixed by a "+" is ungotten, so - * that it is interpreted as less commands - * processed at the start of the first input file. - * "++" means process the commands at the start of - * EVERY input file. - */ - plusoption = TRUE; - s = optstring(s, &str, propt('+'), NULL); - if (s == NULL) - return; - if (*str == '+') - { - if (every_first_cmd != NULL) - free(every_first_cmd); - every_first_cmd = save(str+1); - } else - { - ungetsc(str); - ungetcc_back(CHAR_END_COMMAND); - } - free(str); - continue; - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - /* - * Special "more" compatibility form "-" - * instead of -z to set the scrolling - * window size. - */ - s--; - optc = 'z'; - break; - case 'n': - if (less_is_more) - optc = 'z'; - break; - } - - /* - * Not a special case. - * Look up the option letter in the option table. - */ - err = 0; - if (optname == NULL) - { - printopt = propt(optc); - lc = ASCII_IS_LOWER(optc); - o = findopt(optc); - } else - { - printopt = optname; - lc = ASCII_IS_LOWER(optname[0]); - o = findopt_name(&optname, NULL, &err); - s = optname; - optname = NULL; - if (*s == '\0' || *s == ' ') - { - /* - * The option name matches exactly. - */ - ; - } else if (*s == '=') - { - /* - * The option name is followed by "=value". - */ - if (o != NULL && - (o->otype & OTYPE) != STRING && - (o->otype & OTYPE) != NUMBER) - { - parg.p_string = printopt; - error("The %s option should not be followed by =", - &parg); - return; - } - s++; - } else - { - /* - * The specified name is longer than the - * real option name. - */ - o = NULL; - } - } - if (o == NULL) - { - parg.p_string = printopt; - if (err == OPT_AMBIG) - error("%s is an ambiguous abbreviation (\"less --help\" for help)", - &parg); - else - error("There is no %s option (\"less --help\" for help)", - &parg); - return; - } - - str = NULL; - switch (o->otype & OTYPE) - { - case BOOL: - if (set_default) - *(o->ovar) = o->odefault; - else - *(o->ovar) = ! o->odefault; - break; - case TRIPLE: - if (set_default) - *(o->ovar) = o->odefault; - else - *(o->ovar) = flip_triple(o->odefault, lc); - break; - case STRING: - if (*s == '\0') - { - /* - * Set pendopt and return. - * We will get the string next time - * scan_option is called. - */ - pendopt = o; - return; - } - /* - * Don't do anything here. - * All processing of STRING options is done by - * the handling function. - */ - while (*s == ' ') - s++; - s = optstring(s, &str, printopt, o->odesc[1]); - if (s == NULL) - return; - break; - case NUMBER: - if (*s == '\0') - { - pendopt = o; - return; - } - *(o->ovar) = getnum(&s, printopt, (int*)NULL); - break; - } - /* - * If the option has a handling function, call it. - */ - if (o->ofunc != NULL) - (*o->ofunc)(INIT, str); - if (str != NULL) - free(str); - } + struct loption *o; + int optc; + char *optname; + char *printopt; + char *str; + int set_default; + int lc; + int err; + PARG parg; + + if (s == NULL) + return; + + /* + * If we have a pending option which requires an argument, + * handle it now. + * This happens if the previous option was, for example, "-P" + * without a following string. In that case, the current + * option is simply the argument for the previous option. + */ + if (pendopt != NULL) + { + switch (pendopt->otype & OTYPE) + { + case STRING: + (*pendopt->ofunc)(INIT, s); + break; + case NUMBER: + printopt = opt_desc(pendopt); + *(pendopt->ovar) = getnum(&s, printopt, (int*)NULL); + break; + } + pendopt = NULL; + return; + } + + set_default = FALSE; + optname = NULL; + + while (*s != '\0') + { + /* + * Check some special cases first. + */ + switch (optc = *s++) + { + case ' ': + case '\t': + case END_OPTION_STRING: + continue; + case '-': + /* + * "--" indicates an option name instead of a letter. + */ + if (*s == '-') + { + optname = ++s; + break; + } + /* + * "-+" means set these options back to their defaults. + * (They may have been set otherwise by previous + * options.) + */ + set_default = (*s == '+'); + if (set_default) + s++; + continue; + case '+': + /* + * An option prefixed by a "+" is ungotten, so + * that it is interpreted as less commands + * processed at the start of the first input file. + * "++" means process the commands at the start of + * EVERY input file. + */ + plusoption = TRUE; + s = optstring(s, &str, propt('+'), NULL); + if (s == NULL) + return; + if (*str == '+') + { + if (every_first_cmd != NULL) + free(every_first_cmd); + every_first_cmd = save(str+1); + } else + { + ungetsc(str); + ungetcc_back(CHAR_END_COMMAND); + } + free(str); + continue; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + /* + * Special "more" compatibility form "-" + * instead of -z to set the scrolling + * window size. + */ + s--; + optc = 'z'; + break; + case 'n': + if (less_is_more) + optc = 'z'; + break; + } + + /* + * Not a special case. + * Look up the option letter in the option table. + */ + err = 0; + if (optname == NULL) + { + printopt = propt(optc); + lc = ASCII_IS_LOWER(optc); + o = findopt(optc); + } else + { + printopt = optname; + lc = ASCII_IS_LOWER(optname[0]); + o = findopt_name(&optname, NULL, &err); + s = optname; + optname = NULL; + if (*s == '\0' || *s == ' ') + { + /* + * The option name matches exactly. + */ + ; + } else if (*s == '=') + { + /* + * The option name is followed by "=value". + */ + if (o != NULL && + (o->otype & OTYPE) != STRING && + (o->otype & OTYPE) != NUMBER) + { + parg.p_string = printopt; + error("The %s option should not be followed by =", + &parg); + return; + } + s++; + } else + { + /* + * The specified name is longer than the + * real option name. + */ + o = NULL; + } + } + if (o == NULL) + { + parg.p_string = printopt; + if (err == OPT_AMBIG) + error("%s is an ambiguous abbreviation (\"less --help\" for help)", + &parg); + else + error("There is no %s option (\"less --help\" for help)", + &parg); + return; + } + + str = NULL; + switch (o->otype & OTYPE) + { + case BOOL: + if (set_default) + *(o->ovar) = o->odefault; + else + *(o->ovar) = ! o->odefault; + break; + case TRIPLE: + if (set_default) + *(o->ovar) = o->odefault; + else + *(o->ovar) = flip_triple(o->odefault, lc); + break; + case STRING: + if (*s == '\0') + { + /* + * Set pendopt and return. + * We will get the string next time + * scan_option is called. + */ + pendopt = o; + return; + } + /* + * Don't do anything here. + * All processing of STRING options is done by + * the handling function. + */ + while (*s == ' ') + s++; + s = optstring(s, &str, printopt, o->odesc[1]); + if (s == NULL) + return; + break; + case NUMBER: + if (*s == '\0') + { + pendopt = o; + return; + } + *(o->ovar) = getnum(&s, printopt, (int*)NULL); + break; + } + /* + * If the option has a handling function, call it. + */ + if (o->ofunc != NULL) + (*o->ofunc)(INIT, str); + if (str != NULL) + free(str); + } } /* @@ -301,280 +301,280 @@ scan_option(s) * OPT_UNSET set to the default value * OPT_SET set to the inverse of the default value */ - public void + public void toggle_option(o, lower, s, how_toggle) - struct loption *o; - int lower; - char *s; - int how_toggle; + struct loption *o; + int lower; + char *s; + int how_toggle; { - int num; - int no_prompt; - int err; - PARG parg; - - no_prompt = (how_toggle & OPT_NO_PROMPT); - how_toggle &= ~OPT_NO_PROMPT; - - if (o == NULL) - { - error("No such option", NULL_PARG); - return; - } - - if (how_toggle == OPT_TOGGLE && (o->otype & NO_TOGGLE)) - { - parg.p_string = opt_desc(o); - error("Cannot change the %s option", &parg); - return; - } - - if (how_toggle == OPT_NO_TOGGLE && (o->otype & NO_QUERY)) - { - parg.p_string = opt_desc(o); - error("Cannot query the %s option", &parg); - return; - } - - /* - * Check for something which appears to be a do_toggle - * (because the "-" command was used), but really is not. - * This could be a string option with no string, or - * a number option with no number. - */ - switch (o->otype & OTYPE) - { - case STRING: - case NUMBER: - if (how_toggle == OPT_TOGGLE && *s == '\0') - how_toggle = OPT_NO_TOGGLE; - break; - } + int num; + int no_prompt; + int err; + PARG parg; + + no_prompt = (how_toggle & OPT_NO_PROMPT); + how_toggle &= ~OPT_NO_PROMPT; + + if (o == NULL) + { + error("No such option", NULL_PARG); + return; + } + + if (how_toggle == OPT_TOGGLE && (o->otype & NO_TOGGLE)) + { + parg.p_string = opt_desc(o); + error("Cannot change the %s option", &parg); + return; + } + + if (how_toggle == OPT_NO_TOGGLE && (o->otype & NO_QUERY)) + { + parg.p_string = opt_desc(o); + error("Cannot query the %s option", &parg); + return; + } + + /* + * Check for something which appears to be a do_toggle + * (because the "-" command was used), but really is not. + * This could be a string option with no string, or + * a number option with no number. + */ + switch (o->otype & OTYPE) + { + case STRING: + case NUMBER: + if (how_toggle == OPT_TOGGLE && *s == '\0') + how_toggle = OPT_NO_TOGGLE; + break; + } #if HILITE_SEARCH - if (how_toggle != OPT_NO_TOGGLE && (o->otype & HL_REPAINT)) - repaint_hilite(0); + if (how_toggle != OPT_NO_TOGGLE && (o->otype & HL_REPAINT)) + repaint_hilite(0); #endif - /* - * Now actually toggle (change) the variable. - */ - if (how_toggle != OPT_NO_TOGGLE) - { - switch (o->otype & OTYPE) - { - case BOOL: - /* - * Boolean. - */ - switch (how_toggle) - { - case OPT_TOGGLE: - *(o->ovar) = ! *(o->ovar); - break; - case OPT_UNSET: - *(o->ovar) = o->odefault; - break; - case OPT_SET: - *(o->ovar) = ! o->odefault; - break; - } - break; - case TRIPLE: - /* - * Triple: - * If user gave the lower case letter, then switch - * to 1 unless already 1, in which case make it 0. - * If user gave the upper case letter, then switch - * to 2 unless already 2, in which case make it 0. - */ - switch (how_toggle) - { - case OPT_TOGGLE: - *(o->ovar) = flip_triple(*(o->ovar), lower); - break; - case OPT_UNSET: - *(o->ovar) = o->odefault; - break; - case OPT_SET: - *(o->ovar) = flip_triple(o->odefault, lower); - break; - } - break; - case STRING: - /* - * String: don't do anything here. - * The handling function will do everything. - */ - switch (how_toggle) - { - case OPT_SET: - case OPT_UNSET: - error("Cannot use \"-+\" or \"--\" for a string option", - NULL_PARG); - return; - } - break; - case NUMBER: - /* - * Number: set the variable to the given number. - */ - switch (how_toggle) - { - case OPT_TOGGLE: - num = getnum(&s, NULL, &err); - if (!err) - *(o->ovar) = num; - break; - case OPT_UNSET: - *(o->ovar) = o->odefault; - break; - case OPT_SET: - error("Can't use \"-!\" for a numeric option", - NULL_PARG); - return; - } - break; - } - } - - /* - * Call the handling function for any special action - * specific to this option. - */ - if (o->ofunc != NULL) - (*o->ofunc)((how_toggle==OPT_NO_TOGGLE) ? QUERY : TOGGLE, s); + /* + * Now actually toggle (change) the variable. + */ + if (how_toggle != OPT_NO_TOGGLE) + { + switch (o->otype & OTYPE) + { + case BOOL: + /* + * Boolean. + */ + switch (how_toggle) + { + case OPT_TOGGLE: + *(o->ovar) = ! *(o->ovar); + break; + case OPT_UNSET: + *(o->ovar) = o->odefault; + break; + case OPT_SET: + *(o->ovar) = ! o->odefault; + break; + } + break; + case TRIPLE: + /* + * Triple: + * If user gave the lower case letter, then switch + * to 1 unless already 1, in which case make it 0. + * If user gave the upper case letter, then switch + * to 2 unless already 2, in which case make it 0. + */ + switch (how_toggle) + { + case OPT_TOGGLE: + *(o->ovar) = flip_triple(*(o->ovar), lower); + break; + case OPT_UNSET: + *(o->ovar) = o->odefault; + break; + case OPT_SET: + *(o->ovar) = flip_triple(o->odefault, lower); + break; + } + break; + case STRING: + /* + * String: don't do anything here. + * The handling function will do everything. + */ + switch (how_toggle) + { + case OPT_SET: + case OPT_UNSET: + error("Cannot use \"-+\" or \"--\" for a string option", + NULL_PARG); + return; + } + break; + case NUMBER: + /* + * Number: set the variable to the given number. + */ + switch (how_toggle) + { + case OPT_TOGGLE: + num = getnum(&s, NULL, &err); + if (!err) + *(o->ovar) = num; + break; + case OPT_UNSET: + *(o->ovar) = o->odefault; + break; + case OPT_SET: + error("Can't use \"-!\" for a numeric option", + NULL_PARG); + return; + } + break; + } + } + + /* + * Call the handling function for any special action + * specific to this option. + */ + if (o->ofunc != NULL) + (*o->ofunc)((how_toggle==OPT_NO_TOGGLE) ? QUERY : TOGGLE, s); #if HILITE_SEARCH - if (how_toggle != OPT_NO_TOGGLE && (o->otype & HL_REPAINT)) - chg_hilite(); + if (how_toggle != OPT_NO_TOGGLE && (o->otype & HL_REPAINT)) + chg_hilite(); #endif - if (!no_prompt) - { - /* - * Print a message describing the new setting. - */ - switch (o->otype & OTYPE) - { - case BOOL: - case TRIPLE: - /* - * Print the odesc message. - */ - error(o->odesc[*(o->ovar)], NULL_PARG); - break; - case NUMBER: - /* - * The message is in odesc[1] and has a %d for - * the value of the variable. - */ - parg.p_int = *(o->ovar); - error(o->odesc[1], &parg); - break; - case STRING: - /* - * Message was already printed by the handling function. - */ - break; - } - } - - if (how_toggle != OPT_NO_TOGGLE && (o->otype & REPAINT)) - screen_trashed = TRUE; + if (!no_prompt) + { + /* + * Print a message describing the new setting. + */ + switch (o->otype & OTYPE) + { + case BOOL: + case TRIPLE: + /* + * Print the odesc message. + */ + error(o->odesc[*(o->ovar)], NULL_PARG); + break; + case NUMBER: + /* + * The message is in odesc[1] and has a %d for + * the value of the variable. + */ + parg.p_int = *(o->ovar); + error(o->odesc[1], &parg); + break; + case STRING: + /* + * Message was already printed by the handling function. + */ + break; + } + } + + if (how_toggle != OPT_NO_TOGGLE && (o->otype & REPAINT)) + screen_trashed = TRUE; } /* * "Toggle" a triple-valued option. */ - static int + static int flip_triple(val, lc) - int val; - int lc; + int val; + int lc; { - if (lc) - return ((val == OPT_ON) ? OPT_OFF : OPT_ON); - else - return ((val == OPT_ONPLUS) ? OPT_OFF : OPT_ONPLUS); + if (lc) + return ((val == OPT_ON) ? OPT_OFF : OPT_ON); + else + return ((val == OPT_ONPLUS) ? OPT_OFF : OPT_ONPLUS); } /* * Determine if an option takes a parameter. */ - public int + public int opt_has_param(o) - struct loption *o; + struct loption *o; { - if (o == NULL) - return (0); - if (o->otype & (BOOL|TRIPLE|NOVAR|NO_TOGGLE)) - return (0); - return (1); + if (o == NULL) + return (0); + if (o->otype & (BOOL|TRIPLE|NOVAR|NO_TOGGLE)) + return (0); + return (1); } /* * Return the prompt to be used for a given option letter. * Only string and number valued options have prompts. */ - public char * + public char * opt_prompt(o) - struct loption *o; + struct loption *o; { - if (o == NULL || (o->otype & (STRING|NUMBER)) == 0) - return ("?"); - return (o->odesc[0]); + if (o == NULL || (o->otype & (STRING|NUMBER)) == 0) + return ("?"); + return (o->odesc[0]); } /* * If the specified option can be toggled, return NULL. * Otherwise return an appropriate error message. */ - public char * + public char * opt_toggle_disallowed(c) - int c; + int c; { - switch (c) - { - case 'o': - if (ch_getflags() & CH_CANSEEK) - return "Input is not a pipe"; - break; - } - return NULL; + switch (c) + { + case 'o': + if (ch_getflags() & CH_CANSEEK) + return "Input is not a pipe"; + break; + } + return NULL; } /* * Return whether or not there is a string option pending; - * that is, if the previous option was a string-valued option letter + * that is, if the previous option was a string-valued option letter * (like -P) without a following string. * In that case, the current option is taken to be the string for * the previous option. */ - public int + public int isoptpending(VOID_PARAM) { - return (pendopt != NULL); + return (pendopt != NULL); } /* * Print error message about missing string. */ - static void + static void nostring(printopt) - char *printopt; + char *printopt; { - PARG parg; - parg.p_string = printopt; - error("Value is required after %s", &parg); + PARG parg; + parg.p_string = printopt; + error("Value is required after %s", &parg); } /* * Print error message if a STRING type option is not followed by a string. */ - public void + public void nopendopt(VOID_PARAM) { - nostring(opt_desc(pendopt)); + nostring(opt_desc(pendopt)); } /* @@ -582,64 +582,64 @@ nopendopt(VOID_PARAM) * In the latter case, replace the char with a null char. * Return a pointer to the remainder of the string, if any. */ - static char * + static char * optstring(s, p_str, printopt, validchars) - char *s; - char **p_str; - char *printopt; - char *validchars; + char *s; + char **p_str; + char *printopt; + char *validchars; { - char *p; - char *out; - - if (*s == '\0') - { - nostring(printopt); - return (NULL); - } - /* Alloc could be more than needed, but not worth trimming. */ - *p_str = (char *) ecalloc(strlen(s)+1, sizeof(char)); - out = *p_str; - - for (p = s; *p != '\0'; p++) - { - if (opt_use_backslash && *p == '\\' && p[1] != '\0') - { - /* Take next char literally. */ - ++p; - } else - { - if (*p == END_OPTION_STRING || - (validchars != NULL && strchr(validchars, *p) == NULL)) - /* End of option string. */ - break; - } - *out++ = *p; - } - *out = '\0'; - return (p); + char *p; + char *out; + + if (*s == '\0') + { + nostring(printopt); + return (NULL); + } + /* Alloc could be more than needed, but not worth trimming. */ + *p_str = (char *) ecalloc(strlen(s)+1, sizeof(char)); + out = *p_str; + + for (p = s; *p != '\0'; p++) + { + if (opt_use_backslash && *p == '\\' && p[1] != '\0') + { + /* Take next char literally. */ + ++p; + } else + { + if (*p == END_OPTION_STRING || + (validchars != NULL && strchr(validchars, *p) == NULL)) + /* End of option string. */ + break; + } + *out++ = *p; + } + *out = '\0'; + return (p); } /* */ - static int + static int num_error(printopt, errp) - char *printopt; - int *errp; + char *printopt; + int *errp; { - PARG parg; - - if (errp != NULL) - { - *errp = TRUE; - return (-1); - } - if (printopt != NULL) - { - parg.p_string = printopt; - error("Number is required after %s", &parg); - } - return (-1); + PARG parg; + + if (errp != NULL) + { + *errp = TRUE; + return (-1); + } + if (printopt != NULL) + { + parg.p_string = printopt; + error("Number is required after %s", &parg); + } + return (-1); } /* @@ -647,35 +647,35 @@ num_error(printopt, errp) * Like atoi(), but takes a pointer to a char *, and updates * the char * to point after the translated number. */ - public int + public int getnum(sp, printopt, errp) - char **sp; - char *printopt; - int *errp; + char **sp; + char *printopt; + int *errp; { - char *s; - int n; - int neg; - - s = skipsp(*sp); - neg = FALSE; - if (*s == '-') - { - neg = TRUE; - s++; - } - if (*s < '0' || *s > '9') - return (num_error(printopt, errp)); - - n = 0; - while (*s >= '0' && *s <= '9') - n = 10 * n + *s++ - '0'; - *sp = s; - if (errp != NULL) - *errp = FALSE; - if (neg) - n = -n; - return (n); + char *s; + int n; + int neg; + + s = skipsp(*sp); + neg = FALSE; + if (*s == '-') + { + neg = TRUE; + s++; + } + if (*s < '0' || *s > '9') + return (num_error(printopt, errp)); + + n = 0; + while (*s >= '0' && *s <= '9') + n = 10 * n + *s++ - '0'; + *sp = s; + if (errp != NULL) + *errp = FALSE; + if (neg) + n = -n; + return (n); } /* @@ -684,46 +684,46 @@ getnum(sp, printopt, errp) * The value of the fraction is returned as parts per NUM_FRAC_DENOM. * That is, if "n" is returned, the fraction intended is n/NUM_FRAC_DENOM. */ - public long + public long getfraction(sp, printopt, errp) - char **sp; - char *printopt; - int *errp; + char **sp; + char *printopt; + int *errp; { - char *s; - long frac = 0; - int fraclen = 0; - - s = skipsp(*sp); - if (*s < '0' || *s > '9') - return (num_error(printopt, errp)); - - for ( ; *s >= '0' && *s <= '9'; s++) - { - frac = (frac * 10) + (*s - '0'); - fraclen++; - } - if (fraclen > NUM_LOG_FRAC_DENOM) - while (fraclen-- > NUM_LOG_FRAC_DENOM) - frac /= 10; - else - while (fraclen++ < NUM_LOG_FRAC_DENOM) - frac *= 10; - *sp = s; - if (errp != NULL) - *errp = FALSE; - return (frac); + char *s; + long frac = 0; + int fraclen = 0; + + s = skipsp(*sp); + if (*s < '0' || *s > '9') + return (num_error(printopt, errp)); + + for ( ; *s >= '0' && *s <= '9'; s++) + { + frac = (frac * 10) + (*s - '0'); + fraclen++; + } + if (fraclen > NUM_LOG_FRAC_DENOM) + while (fraclen-- > NUM_LOG_FRAC_DENOM) + frac /= 10; + else + while (fraclen++ < NUM_LOG_FRAC_DENOM) + frac *= 10; + *sp = s; + if (errp != NULL) + *errp = FALSE; + return (frac); } /* * Get the value of the -e flag. */ - public int + public int get_quit_at_eof(VOID_PARAM) { - if (!less_is_more) - return quit_at_eof; - /* When less_is_more is set, the -e flag semantics are different. */ - return quit_at_eof ? OPT_ONPLUS : OPT_ON; + if (!less_is_more) + return quit_at_eof; + /* When less_is_more is set, the -e flag semantics are different. */ + return quit_at_eof ? OPT_ONPLUS : OPT_ON; } diff --git a/option.h b/option.h index 2ed2383..12d8bf7 100644 --- a/option.h +++ b/option.h @@ -63,4 +63,3 @@ struct loption void (*ofunc) LESSPARAMS ((int, char*)); /* Pointer to special handling function */ char *odesc[3]; /* Description of each value */ }; - diff --git a/opttbl.c b/opttbl.c index 6da2b30..9a1ec7f 100644 --- a/opttbl.c +++ b/opttbl.c @@ -98,7 +98,7 @@ static struct optname j_optname = { "jump-target", NULL }; static struct optname J__optname = { "status-column", NULL }; #if USERFILE static struct optname k_optname = { "lesskey-file", NULL }; -#if HAVE_LESSKEYSRC +#if HAVE_LESSKEYSRC static struct optname ks_optname = { "lesskey-src", NULL }; #endif /* HAVE_LESSKEYSRC */ #endif @@ -164,7 +164,7 @@ static struct optname rstat_optname = { "rstat", NULL }; * For BOOL and TRIPLE options, odesc[0], odesc[1], odesc[2] are * the description of the option when set to 0, 1 or 2, respectively. * For NUMBER options, odesc[0] is the prompt to use when entering - * a new value, and odesc[1] is the description, which should contain + * a new value, and odesc[1] is the description, which should contain * one %d which is replaced by the value of the number. * For STRING options, odesc[0] is the prompt to use when entering * a new value, and odesc[1], if not NULL, is the set of characters @@ -172,537 +172,537 @@ static struct optname rstat_optname = { "rstat", NULL }; */ static struct loption option[] = { - { 'a', &a_optname, - TRIPLE, OPT_ONPLUS, &how_search, NULL, - { - "Search includes displayed screen", - "Search skips displayed screen", - "Search includes all of displayed screen" - } - }, + { 'a', &a_optname, + TRIPLE, OPT_ONPLUS, &how_search, NULL, + { + "Search includes displayed screen", + "Search skips displayed screen", + "Search includes all of displayed screen" + } + }, - { 'b', &b_optname, - NUMBER|INIT_HANDLER, 64, &bufspace, opt_b, - { - "Max buffer space per file (K): ", - "Max buffer space per file: %dK", - NULL - } - }, - { 'B', &B__optname, - BOOL, OPT_ON, &autobuf, NULL, - { - "Don't automatically allocate buffers", - "Automatically allocate buffers when needed", - NULL - } - }, - { 'c', &c_optname, - TRIPLE, OPT_OFF, &top_scroll, NULL, - { - "Repaint by scrolling from bottom of screen", - "Repaint by painting from top of screen", - "Repaint by painting from top of screen" - } - }, - { 'd', &d_optname, - BOOL|NO_TOGGLE, OPT_OFF, &know_dumb, NULL, - { - "Assume intelligent terminal", - "Assume dumb terminal", - NULL - } - }, - { 'D', &D__optname, - STRING|REPAINT|NO_QUERY, 0, NULL, opt_D, - { - "color desc: ", - NULL, - NULL - } - }, - { 'e', &e_optname, - TRIPLE, OPT_OFF, &quit_at_eof, NULL, - { - "Don't quit at end-of-file", - "Quit at end-of-file", - "Quit immediately at end-of-file" - } - }, - { 'f', &f_optname, - BOOL, OPT_OFF, &force_open, NULL, - { - "Open only regular files", - "Open even non-regular files", - NULL - } - }, - { 'F', &F__optname, - BOOL, OPT_OFF, &quit_if_one_screen, NULL, - { - "Don't quit if end-of-file on first screen", - "Quit if end-of-file on first screen", - NULL - } - }, + { 'b', &b_optname, + NUMBER|INIT_HANDLER, 64, &bufspace, opt_b, + { + "Max buffer space per file (K): ", + "Max buffer space per file: %dK", + NULL + } + }, + { 'B', &B__optname, + BOOL, OPT_ON, &autobuf, NULL, + { + "Don't automatically allocate buffers", + "Automatically allocate buffers when needed", + NULL + } + }, + { 'c', &c_optname, + TRIPLE, OPT_OFF, &top_scroll, NULL, + { + "Repaint by scrolling from bottom of screen", + "Repaint by painting from top of screen", + "Repaint by painting from top of screen" + } + }, + { 'd', &d_optname, + BOOL|NO_TOGGLE, OPT_OFF, &know_dumb, NULL, + { + "Assume intelligent terminal", + "Assume dumb terminal", + NULL + } + }, + { 'D', &D__optname, + STRING|REPAINT|NO_QUERY, 0, NULL, opt_D, + { + "color desc: ", + NULL, + NULL + } + }, + { 'e', &e_optname, + TRIPLE, OPT_OFF, &quit_at_eof, NULL, + { + "Don't quit at end-of-file", + "Quit at end-of-file", + "Quit immediately at end-of-file" + } + }, + { 'f', &f_optname, + BOOL, OPT_OFF, &force_open, NULL, + { + "Open only regular files", + "Open even non-regular files", + NULL + } + }, + { 'F', &F__optname, + BOOL, OPT_OFF, &quit_if_one_screen, NULL, + { + "Don't quit if end-of-file on first screen", + "Quit if end-of-file on first screen", + NULL + } + }, #if HILITE_SEARCH - { 'g', &g_optname, - TRIPLE|HL_REPAINT, OPT_ONPLUS, &hilite_search, NULL, - { - "Don't highlight search matches", - "Highlight matches for previous search only", - "Highlight all matches for previous search pattern", - } - }, + { 'g', &g_optname, + TRIPLE|HL_REPAINT, OPT_ONPLUS, &hilite_search, NULL, + { + "Don't highlight search matches", + "Highlight matches for previous search only", + "Highlight all matches for previous search pattern", + } + }, #endif - { 'h', &h_optname, - NUMBER, -1, &back_scroll, NULL, - { - "Backwards scroll limit: ", - "Backwards scroll limit is %d lines", - NULL - } - }, - { 'i', &i_optname, - TRIPLE|HL_REPAINT, OPT_OFF, &caseless, opt_i, - { - "Case is significant in searches", - "Ignore case in searches", - "Ignore case in searches and in patterns" - } - }, - { 'j', &j_optname, - STRING, 0, NULL, opt_j, - { - "Target line: ", - "0123456789.-", - NULL - } - }, - { 'J', &J__optname, - BOOL|REPAINT, OPT_OFF, &status_col, NULL, - { - "Don't display a status column", - "Display a status column", - NULL - } - }, + { 'h', &h_optname, + NUMBER, -1, &back_scroll, NULL, + { + "Backwards scroll limit: ", + "Backwards scroll limit is %d lines", + NULL + } + }, + { 'i', &i_optname, + TRIPLE|HL_REPAINT, OPT_OFF, &caseless, opt_i, + { + "Case is significant in searches", + "Ignore case in searches", + "Ignore case in searches and in patterns" + } + }, + { 'j', &j_optname, + STRING, 0, NULL, opt_j, + { + "Target line: ", + "0123456789.-", + NULL + } + }, + { 'J', &J__optname, + BOOL|REPAINT, OPT_OFF, &status_col, NULL, + { + "Don't display a status column", + "Display a status column", + NULL + } + }, #if USERFILE - { 'k', &k_optname, - STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_k, - { NULL, NULL, NULL } - }, -#if HAVE_LESSKEYSRC - { OLETTER_NONE, &ks_optname, - STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_ks, - { NULL, NULL, NULL } - }, + { 'k', &k_optname, + STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_k, + { NULL, NULL, NULL } + }, +#if HAVE_LESSKEYSRC + { OLETTER_NONE, &ks_optname, + STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_ks, + { NULL, NULL, NULL } + }, #endif /* HAVE_LESSKEYSRC */ #endif - { 'K', &K__optname, - BOOL, OPT_OFF, &quit_on_intr, NULL, - { - "Interrupt (ctrl-C) returns to prompt", - "Interrupt (ctrl-C) exits less", - NULL - } - }, - { 'L', &L__optname, - BOOL, OPT_ON, &use_lessopen, NULL, - { - "Don't use the LESSOPEN filter", - "Use the LESSOPEN filter", - NULL - } - }, - { 'm', &m_optname, - TRIPLE, OPT_OFF, &pr_type, NULL, - { - "Short prompt", - "Medium prompt", - "Long prompt" - } - }, - { 'n', &n_optname, - TRIPLE|REPAINT, OPT_ON, &linenums, NULL, - { - "Don't use line numbers", - "Use line numbers", - "Constantly display line numbers" - } - }, + { 'K', &K__optname, + BOOL, OPT_OFF, &quit_on_intr, NULL, + { + "Interrupt (ctrl-C) returns to prompt", + "Interrupt (ctrl-C) exits less", + NULL + } + }, + { 'L', &L__optname, + BOOL, OPT_ON, &use_lessopen, NULL, + { + "Don't use the LESSOPEN filter", + "Use the LESSOPEN filter", + NULL + } + }, + { 'm', &m_optname, + TRIPLE, OPT_OFF, &pr_type, NULL, + { + "Short prompt", + "Medium prompt", + "Long prompt" + } + }, + { 'n', &n_optname, + TRIPLE|REPAINT, OPT_ON, &linenums, NULL, + { + "Don't use line numbers", + "Use line numbers", + "Constantly display line numbers" + } + }, #if LOGFILE - { 'o', &o_optname, - STRING, 0, NULL, opt_o, - { "log file: ", NULL, NULL } - }, - { 'O', &O__optname, - STRING, 0, NULL, opt__O, - { "Log file: ", NULL, NULL } - }, + { 'o', &o_optname, + STRING, 0, NULL, opt_o, + { "log file: ", NULL, NULL } + }, + { 'O', &O__optname, + STRING, 0, NULL, opt__O, + { "Log file: ", NULL, NULL } + }, #endif - { 'p', &p_optname, - STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_p, - { NULL, NULL, NULL } - }, - { 'P', &P__optname, - STRING, 0, NULL, opt__P, - { "prompt: ", NULL, NULL } - }, - { 'q', &q_optname, - TRIPLE, OPT_OFF, &quiet, NULL, - { - "Ring the bell for errors AND at eof/bof", - "Ring the bell for errors but not at eof/bof", - "Never ring the bell" - } - }, - { 'r', &r_optname, - TRIPLE|REPAINT, OPT_OFF, &ctldisp, NULL, - { - "Display control characters as ^X", - "Display control characters directly (not recommended)", - "Display ANSI sequences directly, other control characters as ^X" - } - }, - { 's', &s_optname, - BOOL|REPAINT, OPT_OFF, &squeeze, NULL, - { - "Display all blank lines", - "Squeeze multiple blank lines", - NULL - } - }, - { 'S', &S__optname, - BOOL|REPAINT, OPT_OFF, &chopline, NULL, - { - "Fold long lines", - "Chop long lines", - NULL - } - }, + { 'p', &p_optname, + STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_p, + { NULL, NULL, NULL } + }, + { 'P', &P__optname, + STRING, 0, NULL, opt__P, + { "prompt: ", NULL, NULL } + }, + { 'q', &q_optname, + TRIPLE, OPT_OFF, &quiet, NULL, + { + "Ring the bell for errors AND at eof/bof", + "Ring the bell for errors but not at eof/bof", + "Never ring the bell" + } + }, + { 'r', &r_optname, + TRIPLE|REPAINT, OPT_OFF, &ctldisp, NULL, + { + "Display control characters as ^X", + "Display control characters directly (not recommended)", + "Display ANSI sequences directly, other control characters as ^X" + } + }, + { 's', &s_optname, + BOOL|REPAINT, OPT_OFF, &squeeze, NULL, + { + "Display all blank lines", + "Squeeze multiple blank lines", + NULL + } + }, + { 'S', &S__optname, + BOOL|REPAINT, OPT_OFF, &chopline, NULL, + { + "Fold long lines", + "Chop long lines", + NULL + } + }, #if TAGS - { 't', &t_optname, - STRING|NO_QUERY, 0, NULL, opt_t, - { "tag: ", NULL, NULL } - }, - { 'T', &T__optname, - STRING, 0, NULL, opt__T, - { "tags file: ", NULL, NULL } - }, + { 't', &t_optname, + STRING|NO_QUERY, 0, NULL, opt_t, + { "tag: ", NULL, NULL } + }, + { 'T', &T__optname, + STRING, 0, NULL, opt__T, + { "tags file: ", NULL, NULL } + }, #endif - { 'u', &u_optname, - TRIPLE|REPAINT, OPT_OFF, &bs_mode, NULL, - { - "Display underlined text in underline mode", - "Backspaces cause overstrike", - "Print backspace as ^H" - } - }, - { 'V', &V__optname, - NOVAR, 0, NULL, opt__V, - { NULL, NULL, NULL } - }, - { 'w', &w_optname, - TRIPLE|REPAINT, OPT_OFF, &show_attn, NULL, - { - "Don't highlight first unread line", - "Highlight first unread line after forward-screen", - "Highlight first unread line after any forward movement", - } - }, - { 'x', &x_optname, - STRING|REPAINT, 0, NULL, opt_x, - { - "Tab stops: ", - "0123456789,", - NULL - } - }, - { 'X', &X__optname, - BOOL|NO_TOGGLE, OPT_OFF, &no_init, NULL, - { - "Send init/deinit strings to terminal", - "Don't use init/deinit strings", - NULL - } - }, - { 'y', &y_optname, - NUMBER, -1, &forw_scroll, NULL, - { - "Forward scroll limit: ", - "Forward scroll limit is %d lines", - NULL - } - }, - { 'z', &z_optname, - NUMBER, -1, &swindow, NULL, - { - "Scroll window size: ", - "Scroll window size is %d lines", - NULL - } - }, - { '"', "e_optname, - STRING, 0, NULL, opt_quote, - { "quotes: ", NULL, NULL } - }, - { '~', &tilde_optname, - BOOL|REPAINT, OPT_ON, &twiddle, NULL, - { - "Don't show tildes after end of file", - "Show tildes after end of file", - NULL - } - }, - { '?', &query_optname, - NOVAR, 0, NULL, opt_query, - { NULL, NULL, NULL } - }, - { '#', £_optname, - STRING, 0, NULL, opt_shift, - { - "Horizontal shift: ", - "0123456789.", - NULL - } - }, - { OLETTER_NONE, &keypad_optname, - BOOL|NO_TOGGLE, OPT_OFF, &no_keypad, NULL, - { - "Use keypad mode", - "Don't use keypad mode", - NULL - } - }, - { OLETTER_NONE, &oldbot_optname, - BOOL, OPT_OFF, &oldbot, NULL, - { - "Use new bottom of screen behavior", - "Use old bottom of screen behavior", - NULL - } - }, - { OLETTER_NONE, &follow_optname, - BOOL, FOLLOW_DESC, &follow_mode, NULL, - { - "F command follows file descriptor", - "F command follows file name", - NULL - } - }, - { OLETTER_NONE, &use_backslash_optname, - BOOL, OPT_OFF, &opt_use_backslash, NULL, - { - "Use backslash escaping in command line parameters", - "Don't use backslash escaping in command line parameters", - NULL - } - }, - { OLETTER_NONE, &rscroll_optname, - STRING|REPAINT|INIT_HANDLER, 0, NULL, opt_rscroll, - { "right scroll character: ", NULL, NULL } - }, - { OLETTER_NONE, &nohistdups_optname, - BOOL, OPT_OFF, &no_hist_dups, NULL, - { - "Allow duplicates in history list", - "Remove duplicates from history list", - NULL - } - }, - { OLETTER_NONE, &mousecap_optname, - TRIPLE, OPT_OFF, &mousecap, opt_mousecap, - { - "Ignore mouse input", - "Use the mouse for scrolling", - "Use the mouse for scrolling (reverse)" - } - }, - { OLETTER_NONE, &wheel_lines_optname, - NUMBER|INIT_HANDLER, 0, &wheel_lines, opt_wheel_lines, - { - "Lines to scroll on mouse wheel: ", - "Scroll %d line(s) on mouse wheel", - NULL - } - }, - { OLETTER_NONE, &perma_marks_optname, - BOOL, OPT_OFF, &perma_marks, NULL, - { - "Don't save marks in history file", - "Save marks in history file", - NULL - } - }, - { OLETTER_NONE, &linenum_width_optname, - NUMBER|REPAINT, MIN_LINENUM_WIDTH, &linenum_width, opt_linenum_width, - { - "Line number width: ", - "Line number width is %d chars", - NULL - } - }, - { OLETTER_NONE, &status_col_width_optname, - NUMBER|REPAINT, 2, &status_col_width, opt_status_col_width, - { - "Status column width: ", - "Status column width is %d chars", - NULL - } - }, - { OLETTER_NONE, &incr_search_optname, - BOOL, OPT_OFF, &incr_search, NULL, - { - "Incremental search is off", - "Incremental search is on", - NULL - } - }, - { OLETTER_NONE, &use_color_optname, - BOOL|REPAINT, OPT_OFF, &use_color, NULL, - { - "Don't use color", - "Use color", - NULL - } - }, - { OLETTER_NONE, &want_filesize_optname, - BOOL|REPAINT, OPT_OFF, &want_filesize, opt_filesize, - { - "Don't get size of each file", - "Get size of each file", - NULL - } - }, - { OLETTER_NONE, &status_line_optname, - BOOL|REPAINT, OPT_OFF, &status_line, NULL, - { - "Don't color each line with its status column color", - "Color each line with its status column color", - NULL - } - }, - { OLETTER_NONE, &header_optname, - STRING|REPAINT, 0, NULL, opt_header, - { - "Header lines: ", - NULL, - NULL - } - }, - { OLETTER_NONE, &nonum_headers_optname, - BOOL|REPAINT, 0, &nonum_headers, NULL, - { - "Number header lines", - "Don't number header lines", - NULL - } - }, - { OLETTER_NONE, &redraw_on_quit_optname, - BOOL, OPT_OFF, &redraw_on_quit, NULL, - { - "Don't redraw screen when quitting", - "Redraw last screen when quitting", - NULL - } - }, - { OLETTER_NONE, &search_type_optname, - STRING, 0, NULL, opt_search_type, - { - "Search options: ", - NULL, - NULL - } - }, - { OLETTER_NONE, &exit_F_on_close_optname, - BOOL, OPT_OFF, &exit_F_on_close, NULL, - { - "Don't exit F command when input closes", - "Exit F command when input closes", - NULL - } - }, + { 'u', &u_optname, + TRIPLE|REPAINT, OPT_OFF, &bs_mode, NULL, + { + "Display underlined text in underline mode", + "Backspaces cause overstrike", + "Print backspace as ^H" + } + }, + { 'V', &V__optname, + NOVAR, 0, NULL, opt__V, + { NULL, NULL, NULL } + }, + { 'w', &w_optname, + TRIPLE|REPAINT, OPT_OFF, &show_attn, NULL, + { + "Don't highlight first unread line", + "Highlight first unread line after forward-screen", + "Highlight first unread line after any forward movement", + } + }, + { 'x', &x_optname, + STRING|REPAINT, 0, NULL, opt_x, + { + "Tab stops: ", + "0123456789,", + NULL + } + }, + { 'X', &X__optname, + BOOL|NO_TOGGLE, OPT_OFF, &no_init, NULL, + { + "Send init/deinit strings to terminal", + "Don't use init/deinit strings", + NULL + } + }, + { 'y', &y_optname, + NUMBER, -1, &forw_scroll, NULL, + { + "Forward scroll limit: ", + "Forward scroll limit is %d lines", + NULL + } + }, + { 'z', &z_optname, + NUMBER, -1, &swindow, NULL, + { + "Scroll window size: ", + "Scroll window size is %d lines", + NULL + } + }, + { '"', "e_optname, + STRING, 0, NULL, opt_quote, + { "quotes: ", NULL, NULL } + }, + { '~', &tilde_optname, + BOOL|REPAINT, OPT_ON, &twiddle, NULL, + { + "Don't show tildes after end of file", + "Show tildes after end of file", + NULL + } + }, + { '?', &query_optname, + NOVAR, 0, NULL, opt_query, + { NULL, NULL, NULL } + }, + { '#', £_optname, + STRING, 0, NULL, opt_shift, + { + "Horizontal shift: ", + "0123456789.", + NULL + } + }, + { OLETTER_NONE, &keypad_optname, + BOOL|NO_TOGGLE, OPT_OFF, &no_keypad, NULL, + { + "Use keypad mode", + "Don't use keypad mode", + NULL + } + }, + { OLETTER_NONE, &oldbot_optname, + BOOL, OPT_OFF, &oldbot, NULL, + { + "Use new bottom of screen behavior", + "Use old bottom of screen behavior", + NULL + } + }, + { OLETTER_NONE, &follow_optname, + BOOL, FOLLOW_DESC, &follow_mode, NULL, + { + "F command follows file descriptor", + "F command follows file name", + NULL + } + }, + { OLETTER_NONE, &use_backslash_optname, + BOOL, OPT_OFF, &opt_use_backslash, NULL, + { + "Use backslash escaping in command line parameters", + "Don't use backslash escaping in command line parameters", + NULL + } + }, + { OLETTER_NONE, &rscroll_optname, + STRING|REPAINT|INIT_HANDLER, 0, NULL, opt_rscroll, + { "right scroll character: ", NULL, NULL } + }, + { OLETTER_NONE, &nohistdups_optname, + BOOL, OPT_OFF, &no_hist_dups, NULL, + { + "Allow duplicates in history list", + "Remove duplicates from history list", + NULL + } + }, + { OLETTER_NONE, &mousecap_optname, + TRIPLE, OPT_OFF, &mousecap, opt_mousecap, + { + "Ignore mouse input", + "Use the mouse for scrolling", + "Use the mouse for scrolling (reverse)" + } + }, + { OLETTER_NONE, &wheel_lines_optname, + NUMBER|INIT_HANDLER, 0, &wheel_lines, opt_wheel_lines, + { + "Lines to scroll on mouse wheel: ", + "Scroll %d line(s) on mouse wheel", + NULL + } + }, + { OLETTER_NONE, &perma_marks_optname, + BOOL, OPT_OFF, &perma_marks, NULL, + { + "Don't save marks in history file", + "Save marks in history file", + NULL + } + }, + { OLETTER_NONE, &linenum_width_optname, + NUMBER|REPAINT, MIN_LINENUM_WIDTH, &linenum_width, opt_linenum_width, + { + "Line number width: ", + "Line number width is %d chars", + NULL + } + }, + { OLETTER_NONE, &status_col_width_optname, + NUMBER|REPAINT, 2, &status_col_width, opt_status_col_width, + { + "Status column width: ", + "Status column width is %d chars", + NULL + } + }, + { OLETTER_NONE, &incr_search_optname, + BOOL, OPT_OFF, &incr_search, NULL, + { + "Incremental search is off", + "Incremental search is on", + NULL + } + }, + { OLETTER_NONE, &use_color_optname, + BOOL|REPAINT, OPT_OFF, &use_color, NULL, + { + "Don't use color", + "Use color", + NULL + } + }, + { OLETTER_NONE, &want_filesize_optname, + BOOL|REPAINT, OPT_OFF, &want_filesize, opt_filesize, + { + "Don't get size of each file", + "Get size of each file", + NULL + } + }, + { OLETTER_NONE, &status_line_optname, + BOOL|REPAINT, OPT_OFF, &status_line, NULL, + { + "Don't color each line with its status column color", + "Color each line with its status column color", + NULL + } + }, + { OLETTER_NONE, &header_optname, + STRING|REPAINT, 0, NULL, opt_header, + { + "Header lines: ", + NULL, + NULL + } + }, + { OLETTER_NONE, &nonum_headers_optname, + BOOL|REPAINT, 0, &nonum_headers, NULL, + { + "Number header lines", + "Don't number header lines", + NULL + } + }, + { OLETTER_NONE, &redraw_on_quit_optname, + BOOL, OPT_OFF, &redraw_on_quit, NULL, + { + "Don't redraw screen when quitting", + "Redraw last screen when quitting", + NULL + } + }, + { OLETTER_NONE, &search_type_optname, + STRING, 0, NULL, opt_search_type, + { + "Search options: ", + NULL, + NULL + } + }, + { OLETTER_NONE, &exit_F_on_close_optname, + BOOL, OPT_OFF, &exit_F_on_close, NULL, + { + "Don't exit F command when input closes", + "Exit F command when input closes", + NULL + } + }, #if LESSTEST - { OLETTER_NONE, &ttyin_name_optname, - STRING|NO_TOGGLE, 0, NULL, opt_ttyin_name, - { - NULL, - NULL, - NULL - } - }, - { OLETTER_NONE, &rstat_optname, - STRING|NO_TOGGLE, 0, NULL, opt_rstat, - { - NULL, - NULL, - NULL - } - }, + { OLETTER_NONE, &ttyin_name_optname, + STRING|NO_TOGGLE, 0, NULL, opt_ttyin_name, + { + NULL, + NULL, + NULL + } + }, + { OLETTER_NONE, &rstat_optname, + STRING|NO_TOGGLE, 0, NULL, opt_rstat, + { + NULL, + NULL, + NULL + } + }, #endif /*LESSTEST*/ - { '\0', NULL, NOVAR, 0, NULL, NULL, { NULL, NULL, NULL } } + { '\0', NULL, NOVAR, 0, NULL, NULL, { NULL, NULL, NULL } } }; /* * Initialize each option to its default value. */ - public void + public void init_option(VOID_PARAM) { - struct loption *o; - char *p; + struct loption *o; + char *p; - p = lgetenv("LESS_IS_MORE"); - if (!isnullenv(p)) - less_is_more = 1; + p = lgetenv("LESS_IS_MORE"); + if (!isnullenv(p)) + less_is_more = 1; - for (o = option; o->oletter != '\0'; o++) - { - /* - * Set each variable to its default. - */ - if (o->ovar != NULL) - *(o->ovar) = o->odefault; - if (o->otype & INIT_HANDLER) - (*(o->ofunc))(INIT, (char *) NULL); - } + for (o = option; o->oletter != '\0'; o++) + { + /* + * Set each variable to its default. + */ + if (o->ovar != NULL) + *(o->ovar) = o->odefault; + if (o->otype & INIT_HANDLER) + (*(o->ofunc))(INIT, (char *) NULL); + } } /* * Find an option in the option table, given its option letter. */ - public struct loption * + public struct loption * findopt(c) - int c; + int c; { - struct loption *o; + struct loption *o; - for (o = option; o->oletter != '\0'; o++) - { - if (o->oletter == c) - return (o); - if ((o->otype & TRIPLE) && ASCII_TO_UPPER(o->oletter) == c) - return (o); - } - return (NULL); + for (o = option; o->oletter != '\0'; o++) + { + if (o->oletter == c) + return (o); + if ((o->otype & TRIPLE) && ASCII_TO_UPPER(o->oletter) == c) + return (o); + } + return (NULL); } /* * */ - static int + static int is_optchar(c) - char c; + char c; { - if (ASCII_IS_UPPER(c)) - return 1; - if (ASCII_IS_LOWER(c)) - return 1; - if (c == '-') - return 1; - return 0; + if (ASCII_IS_UPPER(c)) + return 1; + if (ASCII_IS_LOWER(c)) + return 1; + if (c == '-') + return 1; + return 0; } /* @@ -711,83 +711,83 @@ is_optchar(c) * is updated to point after the matched name. * p_oname if non-NULL is set to point to the full option name. */ - public struct loption * + public struct loption * findopt_name(p_optname, p_oname, p_err) - char **p_optname; - char **p_oname; - int *p_err; + char **p_optname; + char **p_oname; + int *p_err; { - char *optname = *p_optname; - struct loption *o; - struct optname *oname; - int len; - int uppercase; - struct loption *maxo = NULL; - struct optname *maxoname = NULL; - int maxlen = 0; - int ambig = 0; - int exact = 0; + char *optname = *p_optname; + struct loption *o; + struct optname *oname; + int len; + int uppercase; + struct loption *maxo = NULL; + struct optname *maxoname = NULL; + int maxlen = 0; + int ambig = 0; + int exact = 0; - /* - * Check all options. - */ - for (o = option; o->oletter != '\0'; o++) - { - /* - * Check all names for this option. - */ - for (oname = o->onames; oname != NULL; oname = oname->onext) - { - /* - * Try normal match first (uppercase == 0), - * then, then if it's a TRIPLE option, - * try uppercase match (uppercase == 1). - */ - for (uppercase = 0; uppercase <= 1; uppercase++) - { - len = sprefix(optname, oname->oname, uppercase); - if (len <= 0 || is_optchar(optname[len])) - { - /* - * We didn't use all of the option name. - */ - continue; - } - if (!exact && len == maxlen) - /* - * Already had a partial match, - * and now there's another one that - * matches the same length. - */ - ambig = 1; - else if (len > maxlen) - { - /* - * Found a better match than - * the one we had. - */ - maxo = o; - maxoname = oname; - maxlen = len; - ambig = 0; - exact = (len == (int)strlen(oname->oname)); - } - if (!(o->otype & TRIPLE)) - break; - } - } - } - if (ambig) - { - /* - * Name matched more than one option. - */ - if (p_err != NULL) - *p_err = OPT_AMBIG; - return (NULL); - } - *p_optname = optname + maxlen; - if (p_oname != NULL) - *p_oname = maxoname == NULL ? NULL : maxoname->oname; - return (maxo); + /* + * Check all options. + */ + for (o = option; o->oletter != '\0'; o++) + { + /* + * Check all names for this option. + */ + for (oname = o->onames; oname != NULL; oname = oname->onext) + { + /* + * Try normal match first (uppercase == 0), + * then, then if it's a TRIPLE option, + * try uppercase match (uppercase == 1). + */ + for (uppercase = 0; uppercase <= 1; uppercase++) + { + len = sprefix(optname, oname->oname, uppercase); + if (len <= 0 || is_optchar(optname[len])) + { + /* + * We didn't use all of the option name. + */ + continue; + } + if (!exact && len == maxlen) + /* + * Already had a partial match, + * and now there's another one that + * matches the same length. + */ + ambig = 1; + else if (len > maxlen) + { + /* + * Found a better match than + * the one we had. + */ + maxo = o; + maxoname = oname; + maxlen = len; + ambig = 0; + exact = (len == (int)strlen(oname->oname)); + } + if (!(o->otype & TRIPLE)) + break; + } + } + } + if (ambig) + { + /* + * Name matched more than one option. + */ + if (p_err != NULL) + *p_err = OPT_AMBIG; + return (NULL); + } + *p_optname = optname + maxlen; + if (p_oname != NULL) + *p_oname = maxoname == NULL ? NULL : maxoname->oname; + return (maxo); } diff --git a/os.c b/os.c index 22b97de..1763586 100644 --- a/os.c +++ b/os.c @@ -76,16 +76,16 @@ extern int tty; /* * Return true if one of the events has occurred on the specified file. */ - static int + static int poll_events(fd, events) - int fd; - int events; + int fd; + int events; { - struct pollfd poller = { fd, events, 0 }; - int n = poll(&poller, 1, 0); - if (n <= 0) - return 0; - return (poller.revents & events); + struct pollfd poller = { fd, events, 0 }; + int n = poll(&poller, 1, 0); + if (n <= 0) + return 0; + return (poller.revents & events); } #endif @@ -94,167 +94,167 @@ poll_events(fd, events) * A call to intread() from a signal handler will interrupt * any pending iread(). */ - public int + public int iread(fd, buf, len) - int fd; - unsigned char *buf; - unsigned int len; + int fd; + unsigned char *buf; + unsigned int len; { - int n; + int n; start: #if MSDOS_COMPILER==WIN32C - if (ABORT_SIGS()) - return (READ_INTR); + if (ABORT_SIGS()) + return (READ_INTR); #else #if MSDOS_COMPILER && MSDOS_COMPILER != DJGPPC - if (kbhit()) - { - int c; - - c = getch(); - if (c == '\003') - return (READ_INTR); - ungetch(c); - } -#endif -#endif - if (SET_JUMP(read_label)) - { - /* - * We jumped here from intread. - */ - reading = 0; + if (kbhit()) + { + int c; + + c = getch(); + if (c == '\003') + return (READ_INTR); + ungetch(c); + } +#endif +#endif + if (SET_JUMP(read_label)) + { + /* + * We jumped here from intread. + */ + reading = 0; #if HAVE_SIGPROCMASK - { - sigset_t mask; - sigemptyset(&mask); - sigprocmask(SIG_SETMASK, &mask, NULL); - } + { + sigset_t mask; + sigemptyset(&mask); + sigprocmask(SIG_SETMASK, &mask, NULL); + } #else #if HAVE_SIGSETMASK - sigsetmask(0); + sigsetmask(0); #else #ifdef _OSK - sigmask(~0); + sigmask(~0); #endif #endif #endif - return (READ_INTR); - } + return (READ_INTR); + } - flush(); - reading = 1; + flush(); + reading = 1; #if MSDOS_COMPILER==DJGPPC - if (isatty(fd)) - { - /* - * Don't try reading from a TTY until a character is - * available, because that makes some background programs - * believe DOS is busy in a way that prevents those - * programs from working while "less" waits. - */ - fd_set readfds; - - FD_ZERO(&readfds); - FD_SET(fd, &readfds); - if (select(fd+1, &readfds, 0, 0, 0) == -1) - { - reading = 0; - return (-1); - } - } + if (isatty(fd)) + { + /* + * Don't try reading from a TTY until a character is + * available, because that makes some background programs + * believe DOS is busy in a way that prevents those + * programs from working while "less" waits. + */ + fd_set readfds; + + FD_ZERO(&readfds); + FD_SET(fd, &readfds); + if (select(fd+1, &readfds, 0, 0, 0) == -1) + { + reading = 0; + return (-1); + } + } #endif #if USE_POLL - if (ignore_eoi && fd != tty) - { - int close_events = exit_F_on_close ? POLLERR|POLLHUP : POLLERR; - if (poll_events(tty, POLLIN) && getchr() == CONTROL('X')) - { - sigs |= S_INTERRUPT; - reading = 0; - return (READ_INTR); - } - if (poll_events(fd, close_events)) - { - sigs |= S_INTERRUPT; - reading = 0; - return (READ_INTR); - } - } + if (ignore_eoi && fd != tty) + { + int close_events = exit_F_on_close ? POLLERR|POLLHUP : POLLERR; + if (poll_events(tty, POLLIN) && getchr() == CONTROL('X')) + { + sigs |= S_INTERRUPT; + reading = 0; + return (READ_INTR); + } + if (poll_events(fd, close_events)) + { + sigs |= S_INTERRUPT; + reading = 0; + return (READ_INTR); + } + } #else #if MSDOS_COMPILER==WIN32C - if (win32_kbhit() && WIN32getch() == CONTROL('X')) - { - sigs |= S_INTERRUPT; - reading = 0; - return (READ_INTR); - } + if (win32_kbhit() && WIN32getch() == CONTROL('X')) + { + sigs |= S_INTERRUPT; + reading = 0; + return (READ_INTR); + } #endif #endif - n = read(fd, buf, len); - reading = 0; + n = read(fd, buf, len); + reading = 0; #if 1 - /* - * This is a kludge to workaround a problem on some systems - * where terminating a remote tty connection causes read() to - * start returning 0 forever, instead of -1. - */ - { - if (!ignore_eoi) - { - if (n == 0) - consecutive_nulls++; - else - consecutive_nulls = 0; - if (consecutive_nulls > 20) - quit(QUIT_ERROR); - } - } -#endif - if (n < 0) - { + /* + * This is a kludge to workaround a problem on some systems + * where terminating a remote tty connection causes read() to + * start returning 0 forever, instead of -1. + */ + { + if (!ignore_eoi) + { + if (n == 0) + consecutive_nulls++; + else + consecutive_nulls = 0; + if (consecutive_nulls > 20) + quit(QUIT_ERROR); + } + } +#endif + if (n < 0) + { #if HAVE_ERRNO - /* - * Certain values of errno indicate we should just retry the read. - */ + /* + * Certain values of errno indicate we should just retry the read. + */ #if MUST_DEFINE_ERRNO - extern int errno; + extern int errno; #endif #ifdef EINTR - if (errno == EINTR) - goto start; + if (errno == EINTR) + goto start; #endif #ifdef EAGAIN - if (errno == EAGAIN) - goto start; + if (errno == EAGAIN) + goto start; #endif #endif - return (-1); - } - return (n); + return (-1); + } + return (n); } /* * Interrupt a pending iread(). */ - public void + public void intread(VOID_PARAM) { - LONG_JUMP(read_label, 1); + LONG_JUMP(read_label, 1); } /* * Return the current time. */ #if HAVE_TIME - public time_type + public time_type get_time(VOID_PARAM) { - time_type t; + time_type t; - time(&t); - return (t); + time(&t); + return (t); } #endif @@ -263,66 +263,66 @@ get_time(VOID_PARAM) /* * Local version of strerror, if not available from the system. */ - static char * + static char * strerror(err) - int err; + int err; { - static char buf[INT_STRLEN_BOUND(int)+12]; + static char buf[INT_STRLEN_BOUND(int)+12]; #if HAVE_SYS_ERRLIST - extern char *sys_errlist[]; - extern int sys_nerr; - - if (err < sys_nerr) - return sys_errlist[err]; -#endif - sprintf(buf, "Error %d", err); - return buf; + extern char *sys_errlist[]; + extern int sys_nerr; + + if (err < sys_nerr) + return sys_errlist[err]; +#endif + sprintf(buf, "Error %d", err); + return buf; } #endif /* * errno_message: Return an error message based on the value of "errno". */ - public char * + public char * errno_message(filename) - char *filename; + char *filename; { - char *p; - char *m; - int len; + char *p; + char *m; + int len; #if HAVE_ERRNO #if MUST_DEFINE_ERRNO - extern int errno; + extern int errno; #endif - p = strerror(errno); + p = strerror(errno); #else - p = "cannot open"; + p = "cannot open"; #endif - len = (int) (strlen(filename) + strlen(p) + 3); - m = (char *) ecalloc(len, sizeof(char)); - SNPRINTF2(m, len, "%s: %s", filename, p); - return (m); + len = (int) (strlen(filename) + strlen(p) + 3); + m = (char *) ecalloc(len, sizeof(char)); + SNPRINTF2(m, len, "%s: %s", filename, p); + return (m); } /* #define HAVE_FLOAT 0 */ - static POSITION + static POSITION muldiv(val, num, den) - POSITION val, num, den; + POSITION val, num, den; { #if HAVE_FLOAT - double v = (((double) val) * num) / den; - return ((POSITION) (v + 0.5)); + double v = (((double) val) * num) / den; + return ((POSITION) (v + 0.5)); #else - POSITION v = ((POSITION) val) * num; + POSITION v = ((POSITION) val) * num; - if (v / num == val) - /* No overflow */ - return (POSITION) (v / den); - else - /* Above calculation overflows; - * use a method that is less precise but won't overflow. */ - return (POSITION) (val / (den / num)); + if (v / num == val) + /* No overflow */ + return (POSITION) (v / den); + else + /* Above calculation overflows; + * use a method that is less precise but won't overflow. */ + return (POSITION) (val / (den / num)); #endif } @@ -330,63 +330,63 @@ muldiv(val, num, den) * Return the ratio of two POSITIONS, as a percentage. * {{ Assumes a POSITION is a long int. }} */ - public int + public int percentage(num, den) - POSITION num; - POSITION den; + POSITION num; + POSITION den; { - return (int) muldiv(num, (POSITION) 100, den); + return (int) muldiv(num, (POSITION) 100, den); } /* * Return the specified percentage of a POSITION. */ - public POSITION + public POSITION percent_pos(pos, percent, fraction) - POSITION pos; - int percent; - long fraction; + POSITION pos; + int percent; + long fraction; { - /* Change percent (parts per 100) to perden (parts per NUM_FRAC_DENOM). */ - POSITION perden = (percent * (NUM_FRAC_DENOM / 100)) + (fraction / 100); + /* Change percent (parts per 100) to perden (parts per NUM_FRAC_DENOM). */ + POSITION perden = (percent * (NUM_FRAC_DENOM / 100)) + (fraction / 100); - if (perden == 0) - return (0); - return (POSITION) muldiv(pos, perden, (POSITION) NUM_FRAC_DENOM); + if (perden == 0) + return (0); + return (POSITION) muldiv(pos, perden, (POSITION) NUM_FRAC_DENOM); } #if !HAVE_STRCHR /* * strchr is used by regexp.c. */ - char * + char * strchr(s, c) - char *s; - int c; + char *s; + int c; { - for ( ; *s != '\0'; s++) - if (*s == c) - return (s); - if (c == '\0') - return (s); - return (NULL); + for ( ; *s != '\0'; s++) + if (*s == c) + return (s); + if (c == '\0') + return (s); + return (NULL); } #endif #if !HAVE_MEMCPY - VOID_POINTER + VOID_POINTER memcpy(dst, src, len) - VOID_POINTER dst; - VOID_POINTER src; - int len; + VOID_POINTER dst; + VOID_POINTER src; + int len; { - char *dstp = (char *) dst; - char *srcp = (char *) src; - int i; + char *dstp = (char *) dst; + char *srcp = (char *) src; + int i; - for (i = 0; i < len; i++) - dstp[i] = srcp[i]; - return (dst); + for (i = 0; i < len; i++) + dstp[i] = srcp[i]; + return (dst); } #endif @@ -395,45 +395,45 @@ memcpy(dst, src, len) /* * This implements an ANSI-style intercept setup for Microware C 3.2 */ - public int + public int os9_signal(type, handler) - int type; - RETSIGTYPE (*handler)(); + int type; + RETSIGTYPE (*handler)(); { - intercept(handler); + intercept(handler); } #include - int + int isatty(f) - int f; + int f; { - struct sgbuf sgbuf; + struct sgbuf sgbuf; - if (_gs_opt(f, &sgbuf) < 0) - return -1; - return (sgbuf.sg_class == 0); + if (_gs_opt(f, &sgbuf) < 0) + return -1; + return (sgbuf.sg_class == 0); } - + #endif - public void + public void sleep_ms(ms) - int ms; + int ms; { #if MSDOS_COMPILER==WIN32C - Sleep(ms); + Sleep(ms); #else #if HAVE_NANOSLEEP - int sec = ms / 1000; - struct timespec t = { sec, (ms - sec*1000) * 1000000 }; - nanosleep(&t, NULL); + int sec = ms / 1000; + struct timespec t = { sec, (ms - sec*1000) * 1000000 }; + nanosleep(&t, NULL); #else #if HAVE_USLEEP - usleep(ms); + usleep(ms); #else - sleep((ms+999) / 1000); + sleep((ms+999) / 1000); #endif #endif #endif diff --git a/output.c b/output.c index 3fed3df..0b4ecd5 100644 --- a/output.c +++ b/output.c @@ -48,35 +48,35 @@ extern int vt_enabled; /* * Display the line which is in the line buffer. */ - public void + public void put_line(VOID_PARAM) { - int c; - int i; - int a; - - if (ABORT_SIGS()) - { - /* - * Don't output if a signal is pending. - */ - screen_trashed = 1; - return; - } - - final_attr = AT_NORMAL; - - for (i = 0; (c = gline(i, &a)) != '\0'; i++) - { - at_switch(a); - final_attr = a; - if (c == '\b') - putbs(); - else - putchr(c); - } - - at_exit(); + int c; + int i; + int a; + + if (ABORT_SIGS()) + { + /* + * Don't output if a signal is pending. + */ + screen_trashed = 1; + return; + } + + final_attr = AT_NORMAL; + + for (i = 0; (c = gline(i, &a)) != '\0'; i++) + { + at_switch(a); + final_attr = a; + if (c == '\b') + putbs(); + else + putchr(c); + } + + at_exit(); } static char obuf[OUTBUF_SIZE]; @@ -84,264 +84,264 @@ static char *ob = obuf; static int outfd = 2; /* stderr */ #if MSDOS_COMPILER==WIN32C || MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - static void + static void win_flush(VOID_PARAM) { - if (ctldisp != OPT_ONPLUS || (vt_enabled && sgr_mode)) - WIN32textout(obuf, ob - obuf); - else - { - /* - * Look for SGR escape sequences, and convert them - * to color commands. Replace bold, underline, - * and italic escapes into colors specified via - * the -D command-line option. - */ - char *anchor, *p, *p_next; - static int fg, fgi, bg, bgi; - static int at; - int f, b; + if (ctldisp != OPT_ONPLUS || (vt_enabled && sgr_mode)) + WIN32textout(obuf, ob - obuf); + else + { + /* + * Look for SGR escape sequences, and convert them + * to color commands. Replace bold, underline, + * and italic escapes into colors specified via + * the -D command-line option. + */ + char *anchor, *p, *p_next; + static int fg, fgi, bg, bgi; + static int at; + int f, b; #if MSDOS_COMPILER==WIN32C - /* Screen colors used by 3x and 4x SGR commands. */ - static unsigned char screen_color[] = { - 0, /* BLACK */ - FOREGROUND_RED, - FOREGROUND_GREEN, - FOREGROUND_RED|FOREGROUND_GREEN, - FOREGROUND_BLUE, - FOREGROUND_BLUE|FOREGROUND_RED, - FOREGROUND_BLUE|FOREGROUND_GREEN, - FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED - }; + /* Screen colors used by 3x and 4x SGR commands. */ + static unsigned char screen_color[] = { + 0, /* BLACK */ + FOREGROUND_RED, + FOREGROUND_GREEN, + FOREGROUND_RED|FOREGROUND_GREEN, + FOREGROUND_BLUE, + FOREGROUND_BLUE|FOREGROUND_RED, + FOREGROUND_BLUE|FOREGROUND_GREEN, + FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED + }; #else - static enum COLORS screen_color[] = { - BLACK, RED, GREEN, BROWN, - BLUE, MAGENTA, CYAN, LIGHTGRAY - }; + static enum COLORS screen_color[] = { + BLACK, RED, GREEN, BROWN, + BLUE, MAGENTA, CYAN, LIGHTGRAY + }; #endif - if (fg == 0 && bg == 0) - { - fg = nm_fg_color & 7; - fgi = nm_fg_color & 8; - bg = nm_bg_color & 7; - bgi = nm_bg_color & 8; - } - for (anchor = p_next = obuf; - (p_next = memchr(p_next, ESC, ob - p_next)) != NULL; ) - { - p = p_next; - if (p[1] == '[') /* "ESC-[" sequence */ - { - if (p > anchor) - { - /* - * If some chars seen since - * the last escape sequence, - * write them out to the screen. - */ - WIN32textout(anchor, p-anchor); - anchor = p; - } - p += 2; /* Skip the "ESC-[" */ - if (is_ansi_end(*p)) - { - /* - * Handle null escape sequence - * "ESC[m", which restores - * the normal color. - */ - p++; - anchor = p_next = p; - fg = nm_fg_color & 7; - fgi = nm_fg_color & 8; - bg = nm_bg_color & 7; - bgi = nm_bg_color & 8; - at = 0; - WIN32setcolors(nm_fg_color, nm_bg_color); - continue; - } - p_next = p; - at &= ~32; - - /* - * Select foreground/background colors - * based on the escape sequence. - */ - while (!is_ansi_end(*p)) - { - char *q; - long code = strtol(p, &q, 10); - - if (*q == '\0') - { - /* - * Incomplete sequence. - * Leave it unprocessed - * in the buffer. - */ - int slop = (int) (q - anchor); - /* {{ strcpy args overlap! }} */ - strcpy(obuf, anchor); - ob = &obuf[slop]; - return; - } - - if (q == p || - code > 49 || code < 0 || - (!is_ansi_end(*q) && *q != ';')) - { - p_next = q; - break; - } - if (*q == ';') - { - q++; - at |= 32; - } - - switch (code) - { - default: - /* case 0: all attrs off */ - fg = nm_fg_color & 7; - bg = nm_bg_color & 7; - at &= 32; - /* - * \e[0m use normal - * intensities, but - * \e[0;...m resets them - */ - if (at & 32) - { - fgi = 0; - bgi = 0; - } else - { - fgi = nm_fg_color & 8; - bgi = nm_bg_color & 8; - } - break; - case 1: /* bold on */ - fgi = 8; - at |= 1; - break; - case 3: /* italic on */ - case 7: /* inverse on */ - at |= 2; - break; - case 4: /* underline on */ - bgi = 8; - at |= 4; - break; - case 5: /* slow blink on */ - case 6: /* fast blink on */ - bgi = 8; - at |= 8; - break; - case 8: /* concealed on */ - at |= 16; - break; - case 22: /* bold off */ - fgi = 0; - at &= ~1; - break; - case 23: /* italic off */ - case 27: /* inverse off */ - at &= ~2; - break; - case 24: /* underline off */ - bgi = 0; - at &= ~4; - break; - case 28: /* concealed off */ - at &= ~16; - break; - case 30: case 31: case 32: - case 33: case 34: case 35: - case 36: case 37: - fg = screen_color[code - 30]; - at |= 32; - break; - case 39: /* default fg */ - fg = nm_fg_color & 7; - at |= 32; - break; - case 40: case 41: case 42: - case 43: case 44: case 45: - case 46: case 47: - bg = screen_color[code - 40]; - at |= 32; - break; - case 49: /* default bg */ - bg = nm_bg_color & 7; - at |= 32; - break; - } - p = q; - } - if (!is_ansi_end(*p) || p == p_next) - break; - /* - * In SGR mode, the ANSI sequence is - * always honored; otherwise if an attr - * is used by itself ("\e[1m" versus - * "\e[1;33m", for example), set the - * color assigned to that attribute. - */ - if (sgr_mode || (at & 32)) - { - if (at & 2) - { - f = bg | bgi; - b = fg | fgi; - } else - { - f = fg | fgi; - b = bg | bgi; - } - } else - { - if (at & 1) - { - f = bo_fg_color; - b = bo_bg_color; - } else if (at & 2) - { - f = so_fg_color; - b = so_bg_color; - } else if (at & 4) - { - f = ul_fg_color; - b = ul_bg_color; - } else if (at & 8) - { - f = bl_fg_color; - b = bl_bg_color; - } else - { - f = nm_fg_color; - b = nm_bg_color; - } - } - if (at & 16) - f = b ^ 8; + if (fg == 0 && bg == 0) + { + fg = nm_fg_color & 7; + fgi = nm_fg_color & 8; + bg = nm_bg_color & 7; + bgi = nm_bg_color & 8; + } + for (anchor = p_next = obuf; + (p_next = memchr(p_next, ESC, ob - p_next)) != NULL; ) + { + p = p_next; + if (p[1] == '[') /* "ESC-[" sequence */ + { + if (p > anchor) + { + /* + * If some chars seen since + * the last escape sequence, + * write them out to the screen. + */ + WIN32textout(anchor, p-anchor); + anchor = p; + } + p += 2; /* Skip the "ESC-[" */ + if (is_ansi_end(*p)) + { + /* + * Handle null escape sequence + * "ESC[m", which restores + * the normal color. + */ + p++; + anchor = p_next = p; + fg = nm_fg_color & 7; + fgi = nm_fg_color & 8; + bg = nm_bg_color & 7; + bgi = nm_bg_color & 8; + at = 0; + WIN32setcolors(nm_fg_color, nm_bg_color); + continue; + } + p_next = p; + at &= ~32; + + /* + * Select foreground/background colors + * based on the escape sequence. + */ + while (!is_ansi_end(*p)) + { + char *q; + long code = strtol(p, &q, 10); + + if (*q == '\0') + { + /* + * Incomplete sequence. + * Leave it unprocessed + * in the buffer. + */ + int slop = (int) (q - anchor); + /* {{ strcpy args overlap! }} */ + strcpy(obuf, anchor); + ob = &obuf[slop]; + return; + } + + if (q == p || + code > 49 || code < 0 || + (!is_ansi_end(*q) && *q != ';')) + { + p_next = q; + break; + } + if (*q == ';') + { + q++; + at |= 32; + } + + switch (code) + { + default: + /* case 0: all attrs off */ + fg = nm_fg_color & 7; + bg = nm_bg_color & 7; + at &= 32; + /* + * \e[0m use normal + * intensities, but + * \e[0;...m resets them + */ + if (at & 32) + { + fgi = 0; + bgi = 0; + } else + { + fgi = nm_fg_color & 8; + bgi = nm_bg_color & 8; + } + break; + case 1: /* bold on */ + fgi = 8; + at |= 1; + break; + case 3: /* italic on */ + case 7: /* inverse on */ + at |= 2; + break; + case 4: /* underline on */ + bgi = 8; + at |= 4; + break; + case 5: /* slow blink on */ + case 6: /* fast blink on */ + bgi = 8; + at |= 8; + break; + case 8: /* concealed on */ + at |= 16; + break; + case 22: /* bold off */ + fgi = 0; + at &= ~1; + break; + case 23: /* italic off */ + case 27: /* inverse off */ + at &= ~2; + break; + case 24: /* underline off */ + bgi = 0; + at &= ~4; + break; + case 28: /* concealed off */ + at &= ~16; + break; + case 30: case 31: case 32: + case 33: case 34: case 35: + case 36: case 37: + fg = screen_color[code - 30]; + at |= 32; + break; + case 39: /* default fg */ + fg = nm_fg_color & 7; + at |= 32; + break; + case 40: case 41: case 42: + case 43: case 44: case 45: + case 46: case 47: + bg = screen_color[code - 40]; + at |= 32; + break; + case 49: /* default bg */ + bg = nm_bg_color & 7; + at |= 32; + break; + } + p = q; + } + if (!is_ansi_end(*p) || p == p_next) + break; + /* + * In SGR mode, the ANSI sequence is + * always honored; otherwise if an attr + * is used by itself ("\e[1m" versus + * "\e[1;33m", for example), set the + * color assigned to that attribute. + */ + if (sgr_mode || (at & 32)) + { + if (at & 2) + { + f = bg | bgi; + b = fg | fgi; + } else + { + f = fg | fgi; + b = bg | bgi; + } + } else + { + if (at & 1) + { + f = bo_fg_color; + b = bo_bg_color; + } else if (at & 2) + { + f = so_fg_color; + b = so_bg_color; + } else if (at & 4) + { + f = ul_fg_color; + b = ul_bg_color; + } else if (at & 8) + { + f = bl_fg_color; + b = bl_bg_color; + } else + { + f = nm_fg_color; + b = nm_bg_color; + } + } + if (at & 16) + f = b ^ 8; #if MSDOS_COMPILER==WIN32C - f &= 0xf | COMMON_LVB_UNDERSCORE; + f &= 0xf | COMMON_LVB_UNDERSCORE; #else - f &= 0xf; + f &= 0xf; #endif - b &= 0xf; - WIN32setcolors(f, b); - p_next = anchor = p + 1; - } else - p_next++; - } - - /* Output what's left in the buffer. */ - WIN32textout(anchor, ob - anchor); - } - ob = obuf; + b &= 0xf; + WIN32setcolors(f, b); + p_next = anchor = p + 1; + } else + p_next++; + } + + /* Output what's left in the buffer. */ + WIN32textout(anchor, ob - anchor); + } + ob = obuf; } #endif @@ -361,118 +361,118 @@ win_flush(VOID_PARAM) * sure these messages can be seen before they are * overwritten or scrolled away. */ - public void + public void flush(VOID_PARAM) { - int n; + int n; - n = (int) (ob - obuf); - if (n == 0) - return; - ob = obuf; + n = (int) (ob - obuf); + if (n == 0) + return; + ob = obuf; #if MSDOS_COMPILER==MSOFTC - if (interactive()) - { - obuf[n] = '\0'; - _outtext(obuf); - return; - } + if (interactive()) + { + obuf[n] = '\0'; + _outtext(obuf); + return; + } #else #if MSDOS_COMPILER==WIN32C || MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - if (interactive()) - { - ob = obuf + n; - *ob = '\0'; - win_flush(); - return; - } + if (interactive()) + { + ob = obuf + n; + *ob = '\0'; + win_flush(); + return; + } #endif #endif - if (write(outfd, obuf, n) != n) - screen_trashed = 1; + if (write(outfd, obuf, n) != n) + screen_trashed = 1; } /* * Set the output file descriptor (1=stdout or 2=stderr). */ - public void + public void set_output(fd) - int fd; + int fd; { - flush(); - outfd = fd; + flush(); + outfd = fd; } /* * Output a character. */ - public int + public int putchr(c) - int c; + int c; { #if 0 /* fake UTF-8 output for testing */ - extern int utf_mode; - if (utf_mode) - { - static char ubuf[MAX_UTF_CHAR_LEN]; - static int ubuf_len = 0; - static int ubuf_index = 0; - if (ubuf_len == 0) - { - ubuf_len = utf_len(c); - ubuf_index = 0; - } - ubuf[ubuf_index++] = c; - if (ubuf_index < ubuf_len) - return c; - c = get_wchar(ubuf) & 0xFF; - ubuf_len = 0; - } + extern int utf_mode; + if (utf_mode) + { + static char ubuf[MAX_UTF_CHAR_LEN]; + static int ubuf_len = 0; + static int ubuf_index = 0; + if (ubuf_len == 0) + { + ubuf_len = utf_len(c); + ubuf_index = 0; + } + ubuf[ubuf_index++] = c; + if (ubuf_index < ubuf_len) + return c; + c = get_wchar(ubuf) & 0xFF; + ubuf_len = 0; + } #endif - clear_bot_if_needed(); + clear_bot_if_needed(); #if MSDOS_COMPILER - if (c == '\n' && is_tty) - { - /* remove_top(1); */ - putchr('\r'); - } + if (c == '\n' && is_tty) + { + /* remove_top(1); */ + putchr('\r'); + } #else #ifdef _OSK - if (c == '\n' && is_tty) /* In OS-9, '\n' == 0x0D */ - putchr(0x0A); + if (c == '\n' && is_tty) /* In OS-9, '\n' == 0x0D */ + putchr(0x0A); #endif #endif - /* - * Some versions of flush() write to *ob, so we must flush - * when we are still one char from the end of obuf. - */ - if (ob >= &obuf[sizeof(obuf)-1]) - flush(); - *ob++ = c; - at_prompt = 0; - return (c); + /* + * Some versions of flush() write to *ob, so we must flush + * when we are still one char from the end of obuf. + */ + if (ob >= &obuf[sizeof(obuf)-1]) + flush(); + *ob++ = c; + at_prompt = 0; + return (c); } - public void + public void clear_bot_if_needed(VOID_PARAM) { - if (!need_clr) - return; - need_clr = 0; - clear_bot(); + if (!need_clr) + return; + need_clr = 0; + clear_bot(); } /* * Output a string. */ - public void + public void putstr(s) - constant char *s; + constant char *s; { - while (*s != '\0') - putchr(*s++); + while (*s != '\0') + putchr(*s++); } @@ -481,19 +481,19 @@ putstr(s) */ #define TYPE_TO_A_FUNC(funcname, type) \ void funcname(num, buf) \ - type num; \ - char *buf; \ + type num; \ + char *buf; \ { \ - int neg = (num < 0); \ - char tbuf[INT_STRLEN_BOUND(num)+2]; \ - char *s = tbuf + sizeof(tbuf); \ - if (neg) num = -num; \ - *--s = '\0'; \ - do { \ - *--s = (num % 10) + '0'; \ - } while ((num /= 10) != 0); \ - if (neg) *--s = '-'; \ - strcpy(buf, s); \ + int neg = (num < 0); \ + char tbuf[INT_STRLEN_BOUND(num)+2]; \ + char *s = tbuf + sizeof(tbuf); \ + if (neg) num = -num; \ + *--s = '\0'; \ + do { \ + *--s = (num % 10) + '0'; \ + } while ((num /= 10) != 0); \ + if (neg) *--s = '-'; \ + strcpy(buf, s); \ } TYPE_TO_A_FUNC(postoa, POSITION) @@ -505,17 +505,17 @@ TYPE_TO_A_FUNC(inttoa, int) */ #define STR_TO_TYPE_FUNC(funcname, type) \ type funcname(buf, ebuf) \ - char *buf; \ - char **ebuf; \ + char *buf; \ + char **ebuf; \ { \ - type val = 0; \ - for (;; buf++) { \ - char c = *buf; \ - if (c < '0' || c > '9') break; \ - val = 10 * val + c - '0'; \ - } \ - if (ebuf != NULL) *ebuf = buf; \ - return val; \ + type val = 0; \ + for (;; buf++) { \ + char c = *buf; \ + if (c < '0' || c > '9') break; \ + val = 10 * val + c - '0'; \ + } \ + if (ebuf != NULL) *ebuf = buf; \ + return val; \ } STR_TO_TYPE_FUNC(lstrtopos, POSITION) @@ -524,29 +524,29 @@ STR_TO_TYPE_FUNC(lstrtoi, int) /* * Output an integer in a given radix. */ - static int + static int iprint_int(num) - int num; + int num; { - char buf[INT_STRLEN_BOUND(num)]; + char buf[INT_STRLEN_BOUND(num)]; - inttoa(num, buf); - putstr(buf); - return ((int) strlen(buf)); + inttoa(num, buf); + putstr(buf); + return ((int) strlen(buf)); } /* * Output a line number in a given radix. */ - static int + static int iprint_linenum(num) - LINENUM num; + LINENUM num; { - char buf[INT_STRLEN_BOUND(num)]; + char buf[INT_STRLEN_BOUND(num)]; - linenumtoa(num, buf); - putstr(buf); - return ((int) strlen(buf)); + linenumtoa(num, buf); + putstr(buf); + return ((int) strlen(buf)); } /* @@ -556,59 +556,59 @@ iprint_linenum(num) * {{ This paranoia about the portability of printf dates from experiences * with systems in the 1980s and is of course no longer necessary. }} */ - public int + public int less_printf(fmt, parg) - char *fmt; - PARG *parg; + char *fmt; + PARG *parg; { - char *s; - int col; - - col = 0; - while (*fmt != '\0') - { - if (*fmt != '%') - { - putchr(*fmt++); - col++; - } else - { - ++fmt; - switch (*fmt++) - { - case 's': - s = parg->p_string; - parg++; - while (*s != '\0') - { - putchr(*s++); - col++; - } - break; - case 'd': - col += iprint_int(parg->p_int); - parg++; - break; - case 'n': - col += iprint_linenum(parg->p_linenum); - parg++; - break; - case 'c': - s = prchar(parg->p_char); - parg++; - while (*s != '\0') - { - putchr(*s++); - col++; - } - break; - case '%': - putchr('%'); - break; - } - } - } - return (col); + char *s; + int col; + + col = 0; + while (*fmt != '\0') + { + if (*fmt != '%') + { + putchr(*fmt++); + col++; + } else + { + ++fmt; + switch (*fmt++) + { + case 's': + s = parg->p_string; + parg++; + while (*s != '\0') + { + putchr(*s++); + col++; + } + break; + case 'd': + col += iprint_int(parg->p_int); + parg++; + break; + case 'n': + col += iprint_linenum(parg->p_linenum); + parg++; + break; + case 'c': + s = prchar(parg->p_char); + parg++; + while (*s != '\0') + { + putchr(*s++); + col++; + } + break; + case '%': + putchr('%'); + break; + } + } + } + return (col); } /* @@ -616,18 +616,18 @@ less_printf(fmt, parg) * If some other non-trivial char is pressed, unget it, so it will * become the next command. */ - public void + public void get_return(VOID_PARAM) { - int c; + int c; #if ONLY_RETURN - while ((c = getchr()) != '\n' && c != '\r') - bell(); + while ((c = getchr()) != '\n' && c != '\r') + bell(); #else - c = getchr(); - if (c != '\n' && c != '\r' && c != ' ' && c != READ_INTR) - ungetcc(c); + c = getchr(); + if (c != '\n' && c != '\r' && c != ' ' && c != READ_INTR) + ungetcc(c); #endif } @@ -635,47 +635,47 @@ get_return(VOID_PARAM) * Output a message in the lower left corner of the screen * and wait for carriage return. */ - public void + public void error(fmt, parg) - char *fmt; - PARG *parg; + char *fmt; + PARG *parg; { - int col = 0; - static char return_to_continue[] = " (press RETURN)"; - - errmsgs++; - - if (!interactive()) - { - less_printf(fmt, parg); - putchr('\n'); - return; - } - - if (!oldbot) - squish_check(); - at_exit(); - clear_bot(); - at_enter(AT_STANDOUT|AT_COLOR_ERROR); - col += so_s_width; - col += less_printf(fmt, parg); - putstr(return_to_continue); - at_exit(); - col += sizeof(return_to_continue) + so_e_width; - - get_return(); - lower_left(); - clear_eol(); - - if (col >= sc_width) - /* - * Printing the message has probably scrolled the screen. - * {{ Unless the terminal doesn't have auto margins, - * in which case we just hammered on the right margin. }} - */ - screen_trashed = 1; - - flush(); + int col = 0; + static char return_to_continue[] = " (press RETURN)"; + + errmsgs++; + + if (!interactive()) + { + less_printf(fmt, parg); + putchr('\n'); + return; + } + + if (!oldbot) + squish_check(); + at_exit(); + clear_bot(); + at_enter(AT_STANDOUT|AT_COLOR_ERROR); + col += so_s_width; + col += less_printf(fmt, parg); + putstr(return_to_continue); + at_exit(); + col += sizeof(return_to_continue) + so_e_width; + + get_return(); + lower_left(); + clear_eol(); + + if (col >= sc_width) + /* + * Printing the message has probably scrolled the screen. + * {{ Unless the terminal doesn't have auto margins, + * in which case we just hammered on the right margin. }} + */ + screen_trashed = 1; + + flush(); } static char intr_to_abort[] = "... (interrupt to abort)"; @@ -686,51 +686,51 @@ static char intr_to_abort[] = "... (interrupt to abort)"; * Usually used to warn that we are beginning a potentially * time-consuming operation. */ - public void + public void ierror(fmt, parg) - char *fmt; - PARG *parg; + char *fmt; + PARG *parg; { - at_exit(); - clear_bot(); - at_enter(AT_STANDOUT|AT_COLOR_ERROR); - (void) less_printf(fmt, parg); - putstr(intr_to_abort); - at_exit(); - flush(); - need_clr = 1; + at_exit(); + clear_bot(); + at_enter(AT_STANDOUT|AT_COLOR_ERROR); + (void) less_printf(fmt, parg); + putstr(intr_to_abort); + at_exit(); + flush(); + need_clr = 1; } /* * Output a message in the lower left corner of the screen * and return a single-character response. */ - public int + public int query(fmt, parg) - char *fmt; - PARG *parg; + char *fmt; + PARG *parg; { - int c; - int col = 0; - - if (interactive()) - clear_bot(); - - (void) less_printf(fmt, parg); - c = getchr(); - - if (interactive()) - { - lower_left(); - if (col >= sc_width) - screen_trashed = 1; - flush(); - } else - { - putchr('\n'); - } - - if (c == 'Q') - quit(QUIT_OK); - return (c); + int c; + int col = 0; + + if (interactive()) + clear_bot(); + + (void) less_printf(fmt, parg); + c = getchr(); + + if (interactive()) + { + lower_left(); + if (col >= sc_width) + screen_trashed = 1; + flush(); + } else + { + putchr('\n'); + } + + if (c == 'Q') + quit(QUIT_OK); + return (c); } diff --git a/pattern.c b/pattern.c index bed36df..f0118b9 100644 --- a/pattern.c +++ b/pattern.c @@ -20,201 +20,201 @@ extern int utf_mode; /* * Compile a search pattern, for future use by match_pattern. */ - static int + static int compile_pattern2(pattern, search_type, comp_pattern, show_error) - char *pattern; - int search_type; - PATTERN_TYPE *comp_pattern; - int show_error; + char *pattern; + int search_type; + PATTERN_TYPE *comp_pattern; + int show_error; { - if (search_type & SRCH_NO_REGEX) - return (0); + if (search_type & SRCH_NO_REGEX) + return (0); { #if HAVE_GNU_REGEX - struct re_pattern_buffer *comp = (struct re_pattern_buffer *) - ecalloc(1, sizeof(struct re_pattern_buffer)); - re_set_syntax(RE_SYNTAX_POSIX_EXTENDED); - if (re_compile_pattern(pattern, strlen(pattern), comp)) - { - free(comp); - if (show_error) - error("Invalid pattern", NULL_PARG); - return (-1); - } - if (*comp_pattern != NULL) - { - regfree(*comp_pattern); - free(*comp_pattern); - } - *comp_pattern = comp; + struct re_pattern_buffer *comp = (struct re_pattern_buffer *) + ecalloc(1, sizeof(struct re_pattern_buffer)); + re_set_syntax(RE_SYNTAX_POSIX_EXTENDED); + if (re_compile_pattern(pattern, strlen(pattern), comp)) + { + free(comp); + if (show_error) + error("Invalid pattern", NULL_PARG); + return (-1); + } + if (*comp_pattern != NULL) + { + regfree(*comp_pattern); + free(*comp_pattern); + } + *comp_pattern = comp; #endif #if HAVE_POSIX_REGCOMP - regex_t *comp = (regex_t *) ecalloc(1, sizeof(regex_t)); - if (regcomp(comp, pattern, REGCOMP_FLAG | (is_caseless ? REG_ICASE : 0))) - { - free(comp); - if (show_error) - error("Invalid pattern", NULL_PARG); - return (-1); - } - if (*comp_pattern != NULL) - { - regfree(*comp_pattern); - free(*comp_pattern); - } - *comp_pattern = comp; + regex_t *comp = (regex_t *) ecalloc(1, sizeof(regex_t)); + if (regcomp(comp, pattern, REGCOMP_FLAG | (is_caseless ? REG_ICASE : 0))) + { + free(comp); + if (show_error) + error("Invalid pattern", NULL_PARG); + return (-1); + } + if (*comp_pattern != NULL) + { + regfree(*comp_pattern); + free(*comp_pattern); + } + *comp_pattern = comp; #endif #if HAVE_PCRE - constant char *errstring; - int erroffset; - PARG parg; - pcre *comp = pcre_compile(pattern, - ((utf_mode) ? PCRE_UTF8 | PCRE_NO_UTF8_CHECK : 0) | - (is_caseless ? PCRE_CASELESS : 0), - &errstring, &erroffset, NULL); - if (comp == NULL) - { - parg.p_string = (char *) errstring; - if (show_error) - error("%s", &parg); - return (-1); - } - *comp_pattern = comp; + constant char *errstring; + int erroffset; + PARG parg; + pcre *comp = pcre_compile(pattern, + ((utf_mode) ? PCRE_UTF8 | PCRE_NO_UTF8_CHECK : 0) | + (is_caseless ? PCRE_CASELESS : 0), + &errstring, &erroffset, NULL); + if (comp == NULL) + { + parg.p_string = (char *) errstring; + if (show_error) + error("%s", &parg); + return (-1); + } + *comp_pattern = comp; #endif #if HAVE_PCRE2 - int errcode; - PCRE2_SIZE erroffset; - PARG parg; - pcre2_code *comp = pcre2_compile((PCRE2_SPTR)pattern, strlen(pattern), - (is_caseless ? PCRE2_CASELESS : 0), - &errcode, &erroffset, NULL); - if (comp == NULL) - { - if (show_error) - { - char msg[160]; - pcre2_get_error_message(errcode, (PCRE2_UCHAR*)msg, sizeof(msg)); - parg.p_string = msg; - error("%s", &parg); - } - return (-1); - } - *comp_pattern = comp; + int errcode; + PCRE2_SIZE erroffset; + PARG parg; + pcre2_code *comp = pcre2_compile((PCRE2_SPTR)pattern, strlen(pattern), + (is_caseless ? PCRE2_CASELESS : 0), + &errcode, &erroffset, NULL); + if (comp == NULL) + { + if (show_error) + { + char msg[160]; + pcre2_get_error_message(errcode, (PCRE2_UCHAR*)msg, sizeof(msg)); + parg.p_string = msg; + error("%s", &parg); + } + return (-1); + } + *comp_pattern = comp; #endif #if HAVE_RE_COMP - PARG parg; - if ((parg.p_string = re_comp(pattern)) != NULL) - { - if (show_error) - error("%s", &parg); - return (-1); - } - *comp_pattern = 1; + PARG parg; + if ((parg.p_string = re_comp(pattern)) != NULL) + { + if (show_error) + error("%s", &parg); + return (-1); + } + *comp_pattern = 1; #endif #if HAVE_REGCMP - char *comp; - if ((comp = regcmp(pattern, 0)) == NULL) - { - if (show_error) - error("Invalid pattern", NULL_PARG); - return (-1); - } - if (comp_pattern != NULL) - free(*comp_pattern); - *comp_pattern = comp; + char *comp; + if ((comp = regcmp(pattern, 0)) == NULL) + { + if (show_error) + error("Invalid pattern", NULL_PARG); + return (-1); + } + if (comp_pattern != NULL) + free(*comp_pattern); + *comp_pattern = comp; #endif #if HAVE_V8_REGCOMP - struct regexp *comp; - reg_show_error = show_error; - comp = regcomp(pattern); - reg_show_error = 1; - if (comp == NULL) - { - /* - * regcomp has already printed an error message - * via regerror(). - */ - return (-1); - } - if (*comp_pattern != NULL) - free(*comp_pattern); - *comp_pattern = comp; + struct regexp *comp; + reg_show_error = show_error; + comp = regcomp(pattern); + reg_show_error = 1; + if (comp == NULL) + { + /* + * regcomp has already printed an error message + * via regerror(). + */ + return (-1); + } + if (*comp_pattern != NULL) + free(*comp_pattern); + *comp_pattern = comp; #endif } - return (0); + return (0); } /* * Like compile_pattern2, but convert the pattern to lowercase if necessary. */ - public int + public int compile_pattern(pattern, search_type, show_error, comp_pattern) - char *pattern; - int search_type; - int show_error; - PATTERN_TYPE *comp_pattern; + char *pattern; + int search_type; + int show_error; + PATTERN_TYPE *comp_pattern; { - char *cvt_pattern; - int result; + char *cvt_pattern; + int result; - if (caseless != OPT_ONPLUS || re_handles_caseless) - cvt_pattern = pattern; - else - { - cvt_pattern = (char*) ecalloc(1, cvt_length(strlen(pattern), CVT_TO_LC)); - cvt_text(cvt_pattern, pattern, (int *)NULL, (int *)NULL, CVT_TO_LC); - } - result = compile_pattern2(cvt_pattern, search_type, comp_pattern, show_error); - if (cvt_pattern != pattern) - free(cvt_pattern); - return (result); + if (caseless != OPT_ONPLUS || re_handles_caseless) + cvt_pattern = pattern; + else + { + cvt_pattern = (char*) ecalloc(1, cvt_length(strlen(pattern), CVT_TO_LC)); + cvt_text(cvt_pattern, pattern, (int *)NULL, (int *)NULL, CVT_TO_LC); + } + result = compile_pattern2(cvt_pattern, search_type, comp_pattern, show_error); + if (cvt_pattern != pattern) + free(cvt_pattern); + return (result); } /* * Forget that we have a compiled pattern. */ - public void + public void uncompile_pattern(pattern) - PATTERN_TYPE *pattern; + PATTERN_TYPE *pattern; { #if HAVE_GNU_REGEX - if (*pattern != NULL) - { - regfree(*pattern); - free(*pattern); - } - *pattern = NULL; + if (*pattern != NULL) + { + regfree(*pattern); + free(*pattern); + } + *pattern = NULL; #endif #if HAVE_POSIX_REGCOMP - if (*pattern != NULL) - { - regfree(*pattern); - free(*pattern); - } - *pattern = NULL; + if (*pattern != NULL) + { + regfree(*pattern); + free(*pattern); + } + *pattern = NULL; #endif #if HAVE_PCRE - if (*pattern != NULL) - pcre_free(*pattern); - *pattern = NULL; + if (*pattern != NULL) + pcre_free(*pattern); + *pattern = NULL; #endif #if HAVE_PCRE2 - if (*pattern != NULL) - pcre2_code_free(*pattern); - *pattern = NULL; + if (*pattern != NULL) + pcre2_code_free(*pattern); + *pattern = NULL; #endif #if HAVE_RE_COMP - *pattern = 0; + *pattern = 0; #endif #if HAVE_REGCMP - if (*pattern != NULL) - free(*pattern); - *pattern = NULL; + if (*pattern != NULL) + free(*pattern); + *pattern = NULL; #endif #if HAVE_V8_REGCOMP - if (*pattern != NULL) - free(*pattern); - *pattern = NULL; + if (*pattern != NULL) + free(*pattern); + *pattern = NULL; #endif } @@ -222,52 +222,52 @@ uncompile_pattern(pattern) /* * Can a pattern be successfully compiled? */ - public int + public int valid_pattern(pattern) - char *pattern; + char *pattern; { - PATTERN_TYPE comp_pattern; - int result; + PATTERN_TYPE comp_pattern; + int result; - SET_NULL_PATTERN(comp_pattern); - result = compile_pattern2(pattern, 0, &comp_pattern, 0); - if (result != 0) - return (0); - uncompile_pattern(&comp_pattern); - return (1); + SET_NULL_PATTERN(comp_pattern); + result = compile_pattern2(pattern, 0, &comp_pattern, 0); + if (result != 0) + return (0); + uncompile_pattern(&comp_pattern); + return (1); } #endif /* * Is a compiled pattern null? */ - public int + public int is_null_pattern(pattern) - PATTERN_TYPE pattern; + PATTERN_TYPE pattern; { #if HAVE_GNU_REGEX - return (pattern == NULL); + return (pattern == NULL); #endif #if HAVE_POSIX_REGCOMP - return (pattern == NULL); + return (pattern == NULL); #endif #if HAVE_PCRE - return (pattern == NULL); + return (pattern == NULL); #endif #if HAVE_PCRE2 - return (pattern == NULL); + return (pattern == NULL); #endif #if HAVE_RE_COMP - return (pattern == 0); + return (pattern == 0); #endif #if HAVE_REGCMP - return (pattern == NULL); + return (pattern == NULL); #endif #if HAVE_V8_REGCOMP - return (pattern == NULL); + return (pattern == NULL); #endif #if NO_REGEX - return (pattern == NULL); + return (pattern == NULL); #endif } @@ -275,190 +275,190 @@ is_null_pattern(pattern) * Simple pattern matching function. * It supports no metacharacters like *, etc. */ - static int + static int match(pattern, pattern_len, buf, buf_len, pfound, pend) - char *pattern; - int pattern_len; - char *buf; - int buf_len; - char **pfound, **pend; + char *pattern; + int pattern_len; + char *buf; + int buf_len; + char **pfound, **pend; { - char *pp, *lp; - char *pattern_end = pattern + pattern_len; - char *buf_end = buf + buf_len; + char *pp, *lp; + char *pattern_end = pattern + pattern_len; + char *buf_end = buf + buf_len; - for ( ; buf < buf_end; buf++) - { - for (pp = pattern, lp = buf; ; pp++, lp++) - { - char cp = *pp; - char cl = *lp; - if (caseless == OPT_ONPLUS && ASCII_IS_UPPER(cp)) - cp = ASCII_TO_LOWER(cp); - if (cp != cl) - break; - if (pp == pattern_end || lp == buf_end) - break; - } - if (pp == pattern_end) - { - if (pfound != NULL) - *pfound = buf; - if (pend != NULL) - *pend = lp; - return (1); - } - } - return (0); + for ( ; buf < buf_end; buf++) + { + for (pp = pattern, lp = buf; ; pp++, lp++) + { + char cp = *pp; + char cl = *lp; + if (caseless == OPT_ONPLUS && ASCII_IS_UPPER(cp)) + cp = ASCII_TO_LOWER(cp); + if (cp != cl) + break; + if (pp == pattern_end || lp == buf_end) + break; + } + if (pp == pattern_end) + { + if (pfound != NULL) + *pfound = buf; + if (pend != NULL) + *pend = lp; + return (1); + } + } + return (0); } /* * Perform a pattern match with the previously compiled pattern. * Set sp and ep to the start and end of the matched string. */ - public int + public int match_pattern(pattern, tpattern, line, line_len, sp, ep, notbol, search_type) - PATTERN_TYPE pattern; - char *tpattern; - char *line; - int line_len; - char **sp; - char **ep; - int notbol; - int search_type; + PATTERN_TYPE pattern; + char *tpattern; + char *line; + int line_len; + char **sp; + char **ep; + int notbol; + int search_type; { - int matched; + int matched; - *sp = *ep = NULL; + *sp = *ep = NULL; #if NO_REGEX - search_type |= SRCH_NO_REGEX; + search_type |= SRCH_NO_REGEX; #endif - if (search_type & SRCH_NO_REGEX) - matched = match(tpattern, strlen(tpattern), line, line_len, sp, ep); - else - { + if (search_type & SRCH_NO_REGEX) + matched = match(tpattern, strlen(tpattern), line, line_len, sp, ep); + else + { #if HAVE_GNU_REGEX - { - struct re_registers search_regs; - pattern->not_bol = notbol; - pattern->regs_allocated = REGS_UNALLOCATED; - matched = re_search(pattern, line, line_len, 0, line_len, &search_regs) >= 0; - if (matched) - { - *sp = line + search_regs.start[0]; - *ep = line + search_regs.end[0]; - } - } + { + struct re_registers search_regs; + pattern->not_bol = notbol; + pattern->regs_allocated = REGS_UNALLOCATED; + matched = re_search(pattern, line, line_len, 0, line_len, &search_regs) >= 0; + if (matched) + { + *sp = line + search_regs.start[0]; + *ep = line + search_regs.end[0]; + } + } #endif #if HAVE_POSIX_REGCOMP - { - regmatch_t rm; - int flags = (notbol) ? REG_NOTBOL : 0; + { + regmatch_t rm; + int flags = (notbol) ? REG_NOTBOL : 0; #ifdef REG_STARTEND - flags |= REG_STARTEND; - rm.rm_so = 0; - rm.rm_eo = line_len; + flags |= REG_STARTEND; + rm.rm_so = 0; + rm.rm_eo = line_len; #endif - matched = !regexec(pattern, line, 1, &rm, flags); - if (matched) - { + matched = !regexec(pattern, line, 1, &rm, flags); + if (matched) + { #ifndef __WATCOMC__ - *sp = line + rm.rm_so; - *ep = line + rm.rm_eo; + *sp = line + rm.rm_so; + *ep = line + rm.rm_eo; #else - *sp = rm.rm_sp; - *ep = rm.rm_ep; + *sp = rm.rm_sp; + *ep = rm.rm_ep; #endif - } - } + } + } #endif #if HAVE_PCRE - { - int flags = (notbol) ? PCRE_NOTBOL : 0; - int ovector[3]; - matched = pcre_exec(pattern, NULL, line, line_len, - 0, flags, ovector, 3) >= 0; - if (matched) - { - *sp = line + ovector[0]; - *ep = line + ovector[1]; - } - } + { + int flags = (notbol) ? PCRE_NOTBOL : 0; + int ovector[3]; + matched = pcre_exec(pattern, NULL, line, line_len, + 0, flags, ovector, 3) >= 0; + if (matched) + { + *sp = line + ovector[0]; + *ep = line + ovector[1]; + } + } #endif #if HAVE_PCRE2 - { - int flags = (notbol) ? PCRE2_NOTBOL : 0; - pcre2_match_data *md = pcre2_match_data_create(3, NULL); - matched = pcre2_match(pattern, (PCRE2_SPTR)line, line_len, - 0, flags, md, NULL) >= 0; - if (matched) - { - PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(md); - *sp = line + ovector[0]; - *ep = line + ovector[1]; - } - pcre2_match_data_free(md); - } + { + int flags = (notbol) ? PCRE2_NOTBOL : 0; + pcre2_match_data *md = pcre2_match_data_create(3, NULL); + matched = pcre2_match(pattern, (PCRE2_SPTR)line, line_len, + 0, flags, md, NULL) >= 0; + if (matched) + { + PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(md); + *sp = line + ovector[0]; + *ep = line + ovector[1]; + } + pcre2_match_data_free(md); + } #endif #if HAVE_RE_COMP - matched = (re_exec(line) == 1); - /* - * re_exec doesn't seem to provide a way to get the matched string. - */ - *sp = *ep = NULL; + matched = (re_exec(line) == 1); + /* + * re_exec doesn't seem to provide a way to get the matched string. + */ + *sp = *ep = NULL; #endif #if HAVE_REGCMP - *ep = regex(pattern, line); - matched = (*ep != NULL); - if (matched) - *sp = __loc1; + *ep = regex(pattern, line); + matched = (*ep != NULL); + if (matched) + *sp = __loc1; #endif #if HAVE_V8_REGCOMP #if HAVE_REGEXEC2 - matched = regexec2(pattern, line, notbol); + matched = regexec2(pattern, line, notbol); #else - matched = regexec(pattern, line); -#endif - if (matched) - { - *sp = pattern->startp[0]; - *ep = pattern->endp[0]; - } -#endif - } - matched = (!(search_type & SRCH_NO_MATCH) && matched) || - ((search_type & SRCH_NO_MATCH) && !matched); - return (matched); + matched = regexec(pattern, line); +#endif + if (matched) + { + *sp = pattern->startp[0]; + *ep = pattern->endp[0]; + } +#endif + } + matched = (!(search_type & SRCH_NO_MATCH) && matched) || + ((search_type & SRCH_NO_MATCH) && !matched); + return (matched); } /* * Return the name of the pattern matching library. */ - public char * + public char * pattern_lib_name(VOID_PARAM) { #if HAVE_GNU_REGEX - return ("GNU"); + return ("GNU"); #else #if HAVE_POSIX_REGCOMP - return ("POSIX"); + return ("POSIX"); #else #if HAVE_PCRE2 - return ("PCRE2"); + return ("PCRE2"); #else #if HAVE_PCRE - return ("PCRE"); + return ("PCRE"); #else #if HAVE_RE_COMP - return ("BSD"); + return ("BSD"); #else #if HAVE_REGCMP - return ("V8"); + return ("V8"); #else #if HAVE_V8_REGCOMP - return ("Spencer V8"); + return ("Spencer V8"); #else - return ("no"); + return ("no"); #endif #endif #endif diff --git a/pattern.h b/pattern.h index a690b8e..a96b5bd 100644 --- a/pattern.h +++ b/pattern.h @@ -72,7 +72,7 @@ extern int reg_show_error; /* ---- NONE ---- */ #if NO_REGEX #define PATTERN_TYPE void * -#define SET_NULL_PATTERN(name) +#define SET_NULL_PATTERN(name) #endif #ifndef re_handles_caseless diff --git a/position.c b/position.c index eabaf7e..db4ae83 100644 --- a/position.c +++ b/position.c @@ -14,7 +14,7 @@ * first char on each currently displayed line. * * {{ The position table is scrolled by moving all the entries. - * Would be better to have a circular table + * Would be better to have a circular table * and just change a couple of pointers. }} */ @@ -36,96 +36,96 @@ extern int header_lines; * the bottom line on the screen * the line after the bottom line on the screen */ - public POSITION + public POSITION position(sindex) - int sindex; + int sindex; { - switch (sindex) - { - case BOTTOM: - sindex = sc_height - 2; - break; - case BOTTOM_PLUS_ONE: - sindex = sc_height - 1; - break; - case MIDDLE: - sindex = (sc_height - 1) / 2; - break; - } - return (table[sindex]); + switch (sindex) + { + case BOTTOM: + sindex = sc_height - 2; + break; + case BOTTOM_PLUS_ONE: + sindex = sc_height - 1; + break; + case MIDDLE: + sindex = (sc_height - 1) / 2; + break; + } + return (table[sindex]); } /* * Add a new file position to the bottom of the position table. */ - public void + public void add_forw_pos(pos) - POSITION pos; + POSITION pos; { - int i; + int i; - /* - * Scroll the position table up. - */ - for (i = 1; i < sc_height; i++) - table[i-1] = table[i]; - table[sc_height - 1] = pos; + /* + * Scroll the position table up. + */ + for (i = 1; i < sc_height; i++) + table[i-1] = table[i]; + table[sc_height - 1] = pos; } /* * Add a new file position to the top of the position table. */ - public void + public void add_back_pos(pos) - POSITION pos; + POSITION pos; { - int i; + int i; - /* - * Scroll the position table down. - */ - for (i = sc_height - 1; i > 0; i--) - table[i] = table[i-1]; - table[0] = pos; + /* + * Scroll the position table down. + */ + for (i = sc_height - 1; i > 0; i--) + table[i] = table[i-1]; + table[0] = pos; } /* * Initialize the position table, done whenever we clear the screen. */ - public void + public void pos_clear(VOID_PARAM) { - int i; + int i; - for (i = 0; i < sc_height; i++) - table[i] = NULL_POSITION; + for (i = 0; i < sc_height; i++) + table[i] = NULL_POSITION; } /* * Allocate or reallocate the position table. */ - public void + public void pos_init(VOID_PARAM) { - struct scrpos scrpos; + struct scrpos scrpos; - if (sc_height <= table_size) - return; - /* - * If we already have a table, remember the first line in it - * before we free it, so we can copy that line to the new table. - */ - if (table != NULL) - { - get_scrpos(&scrpos, TOP); - free((char*)table); - } else - scrpos.pos = NULL_POSITION; - table = (POSITION *) ecalloc(sc_height, sizeof(POSITION)); - table_size = sc_height; - pos_clear(); - if (scrpos.pos != NULL_POSITION) - table[scrpos.ln-1] = scrpos.pos; + if (sc_height <= table_size) + return; + /* + * If we already have a table, remember the first line in it + * before we free it, so we can copy that line to the new table. + */ + if (table != NULL) + { + get_scrpos(&scrpos, TOP); + free((char*)table); + } else + scrpos.pos = NULL_POSITION; + table = (POSITION *) ecalloc(sc_height, sizeof(POSITION)); + table_size = sc_height; + pos_clear(); + if (scrpos.pos != NULL_POSITION) + table[scrpos.ln-1] = scrpos.pos; } /* @@ -133,40 +133,40 @@ pos_init(VOID_PARAM) * Check the position table to see if the position falls within its range. * Return the position table entry if found, -1 if not. */ - public int + public int onscreen(pos) - POSITION pos; + POSITION pos; { - int i; + int i; - if (pos < table[0]) - return (-1); - for (i = 1; i < sc_height; i++) - if (pos < table[i]) - return (i-1); - return (-1); + if (pos < table[0]) + return (-1); + for (i = 1; i < sc_height; i++) + if (pos < table[i]) + return (i-1); + return (-1); } /* * See if the entire screen is empty. */ - public int + public int empty_screen(VOID_PARAM) { - return (empty_lines(0, sc_height-1)); + return (empty_lines(0, sc_height-1)); } - public int + public int empty_lines(s, e) - int s; - int e; + int s; + int e; { - int i; + int i; - for (i = s; i <= e; i++) - if (table[i] != NULL_POSITION && table[i] != 0) - return (0); - return (1); + for (i = s; i <= e; i++) + if (table[i] != NULL_POSITION && table[i] != 0) + return (0); + return (1); } /* @@ -177,51 +177,51 @@ empty_lines(s, e) * such that the top few lines are empty, we may have to set * the screen line to a number > 0. */ - public void + public void get_scrpos(scrpos, where) - struct scrpos *scrpos; - int where; + struct scrpos *scrpos; + int where; { - int i; - int dir; - int last; + int i; + int dir; + int last; - switch (where) - { - case TOP: - i = 0; dir = +1; last = sc_height-2; - break; - case BOTTOM: case BOTTOM_PLUS_ONE: - i = sc_height-2; dir = -1; last = 0; - break; - default: - i = where; - if (table[i] == NULL_POSITION) { - scrpos->pos = NULL_POSITION; - return; - } - /* Values of dir and last don't matter after this. */ - break; - } + switch (where) + { + case TOP: + i = 0; dir = +1; last = sc_height-2; + break; + case BOTTOM: case BOTTOM_PLUS_ONE: + i = sc_height-2; dir = -1; last = 0; + break; + default: + i = where; + if (table[i] == NULL_POSITION) { + scrpos->pos = NULL_POSITION; + return; + } + /* Values of dir and last don't matter after this. */ + break; + } - /* - * Find the first line on the screen which has something on it, - * and return the screen line number and the file position. - */ - for (;; i += dir) - { - if (table[i] != NULL_POSITION) - { - scrpos->ln = i+1; - scrpos->pos = table[i]; - return; - } - if (i == last) break; - } - /* - * The screen is empty. - */ - scrpos->pos = NULL_POSITION; + /* + * Find the first line on the screen which has something on it, + * and return the screen line number and the file position. + */ + for (;; i += dir) + { + if (table[i] != NULL_POSITION) + { + scrpos->ln = i+1; + scrpos->pos = table[i]; + return; + } + if (i == last) break; + } + /* + * The screen is empty. + */ + scrpos->pos = NULL_POSITION; } /* @@ -233,25 +233,25 @@ get_scrpos(scrpos, where) * or it may be in { -1 .. -(sc_height-1) } to refer to lines * relative to the bottom of the screen. */ - public int + public int sindex_from_sline(sline) - int sline; + int sline; { - /* - * Negative screen line number means - * relative to the bottom of the screen. - */ - if (sline < 0) - sline += sc_height; - /* - * Can't be less than 1 or greater than sc_height. - */ - if (sline <= 0) - sline = 1; - if (sline > sc_height) - sline = sc_height; - /* - * Return zero-based line number, not one-based. - */ - return (sline-1); + /* + * Negative screen line number means + * relative to the bottom of the screen. + */ + if (sline < 0) + sline += sc_height; + /* + * Can't be less than 1 or greater than sc_height. + */ + if (sline <= 0) + sline = 1; + if (sline > sc_height) + sline = sc_height; + /* + * Return zero-based line number, not one-based. + */ + return (sline-1); } diff --git a/prompt.c b/prompt.c index 5319c40..a5f03ac 100644 --- a/prompt.c +++ b/prompt.c @@ -13,7 +13,7 @@ * There are three flavors of prompts, SHORT, MEDIUM and LONG, * selected by the -m/-M options. * There is also the "equals message", printed by the = command. - * A prompt is a message composed of various pieces, such as the + * A prompt is a message composed of various pieces, such as the * name of the file being viewed, the percentage into the file, etc. */ @@ -66,177 +66,177 @@ static char *mp; /* * Initialize the prompt prototype strings. */ - public void + public void init_prompt(VOID_PARAM) { - prproto[0] = save(s_proto); - prproto[1] = save(less_is_more ? more_proto : m_proto); - prproto[2] = save(M_proto); - eqproto = save(e_proto); - hproto = save(h_proto); - wproto = save(w_proto); + prproto[0] = save(s_proto); + prproto[1] = save(less_is_more ? more_proto : m_proto); + prproto[2] = save(M_proto); + eqproto = save(e_proto); + hproto = save(h_proto); + wproto = save(w_proto); } /* * Append a string to the end of the message. */ - static void + static void ap_str(s) - char *s; + char *s; { - int len; - - len = (int) strlen(s); - if (mp + len >= message + PROMPT_SIZE) - len = (int) (message + PROMPT_SIZE - mp - 1); - strncpy(mp, s, len); - mp += len; - *mp = '\0'; + int len; + + len = (int) strlen(s); + if (mp + len >= message + PROMPT_SIZE) + len = (int) (message + PROMPT_SIZE - mp - 1); + strncpy(mp, s, len); + mp += len; + *mp = '\0'; } /* * Append a character to the end of the message. */ - static void + static void ap_char(c) - char c; + char c; { - char buf[2]; + char buf[2]; - buf[0] = c; - buf[1] = '\0'; - ap_str(buf); + buf[0] = c; + buf[1] = '\0'; + ap_str(buf); } /* * Append a POSITION (as a decimal integer) to the end of the message. */ - static void + static void ap_pos(pos) - POSITION pos; + POSITION pos; { - char buf[INT_STRLEN_BOUND(pos) + 2]; + char buf[INT_STRLEN_BOUND(pos) + 2]; - postoa(pos, buf); - ap_str(buf); + postoa(pos, buf); + ap_str(buf); } /* * Append a line number to the end of the message. */ - static void + static void ap_linenum(linenum) - LINENUM linenum; + LINENUM linenum; { - char buf[INT_STRLEN_BOUND(linenum) + 2]; + char buf[INT_STRLEN_BOUND(linenum) + 2]; - linenumtoa(linenum, buf); - ap_str(buf); + linenumtoa(linenum, buf); + ap_str(buf); } /* * Append an integer to the end of the message. */ - static void + static void ap_int(num) - int num; + int num; { - char buf[INT_STRLEN_BOUND(num) + 2]; + char buf[INT_STRLEN_BOUND(num) + 2]; - inttoa(num, buf); - ap_str(buf); + inttoa(num, buf); + ap_str(buf); } /* * Append a question mark to the end of the message. */ - static void + static void ap_quest(VOID_PARAM) { - ap_str("?"); + ap_str("?"); } /* * Return the "current" byte offset in the file. */ - static POSITION + static POSITION curr_byte(where) - int where; + int where; { - POSITION pos; - - pos = position(where); - while (pos == NULL_POSITION && where >= 0 && where < sc_height-1) - pos = position(++where); - if (pos == NULL_POSITION) - pos = ch_length(); - return (pos); + POSITION pos; + + pos = position(where); + while (pos == NULL_POSITION && where >= 0 && where < sc_height-1) + pos = position(++where); + if (pos == NULL_POSITION) + pos = ch_length(); + return (pos); } /* * Return the value of a prototype conditional. - * A prototype string may include conditionals which consist of a + * A prototype string may include conditionals which consist of a * question mark followed by a single letter. * Here we decode that letter and return the appropriate boolean value. */ - static int + static int cond(c, where) - char c; - int where; + char c; + int where; { - POSITION len; - - switch (c) - { - case 'a': /* Anything in the message yet? */ - return (mp > message); - case 'b': /* Current byte offset known? */ - return (curr_byte(where) != NULL_POSITION); - case 'c': - return (hshift != 0); - case 'e': /* At end of file? */ - return (eof_displayed()); - case 'f': /* Filename known? */ - case 'g': - return (strcmp(get_filename(curr_ifile), "-") != 0); - case 'l': /* Line number known? */ - case 'd': /* Same as l */ - if (!linenums) - return 0; - return (currline(where) != 0); - case 'L': /* Final line number known? */ - case 'D': /* Final page number known? */ - return (linenums && ch_length() != NULL_POSITION); - case 'm': /* More than one file? */ + POSITION len; + + switch (c) + { + case 'a': /* Anything in the message yet? */ + return (mp > message); + case 'b': /* Current byte offset known? */ + return (curr_byte(where) != NULL_POSITION); + case 'c': + return (hshift != 0); + case 'e': /* At end of file? */ + return (eof_displayed()); + case 'f': /* Filename known? */ + case 'g': + return (strcmp(get_filename(curr_ifile), "-") != 0); + case 'l': /* Line number known? */ + case 'd': /* Same as l */ + if (!linenums) + return 0; + return (currline(where) != 0); + case 'L': /* Final line number known? */ + case 'D': /* Final page number known? */ + return (linenums && ch_length() != NULL_POSITION); + case 'm': /* More than one file? */ #if TAGS - return (ntags() ? (ntags() > 1) : (nifile() > 1)); + return (ntags() ? (ntags() > 1) : (nifile() > 1)); #else - return (nifile() > 1); + return (nifile() > 1); #endif - case 'n': /* First prompt in a new file? */ + case 'n': /* First prompt in a new file? */ #if TAGS - return (ntags() ? 1 : new_file); + return (ntags() ? 1 : new_file); #else - return (new_file); + return (new_file); #endif - case 'p': /* Percent into file (bytes) known? */ - return (curr_byte(where) != NULL_POSITION && - ch_length() > 0); - case 'P': /* Percent into file (lines) known? */ - return (currline(where) != 0 && - (len = ch_length()) > 0 && - find_linenum(len) != 0); - case 's': /* Size of file known? */ - case 'B': - return (ch_length() != NULL_POSITION); - case 'x': /* Is there a "next" file? */ + case 'p': /* Percent into file (bytes) known? */ + return (curr_byte(where) != NULL_POSITION && + ch_length() > 0); + case 'P': /* Percent into file (lines) known? */ + return (currline(where) != 0 && + (len = ch_length()) > 0 && + find_linenum(len) != 0); + case 's': /* Size of file known? */ + case 'B': + return (ch_length() != NULL_POSITION); + case 'x': /* Is there a "next" file? */ #if TAGS - if (ntags()) - return (0); + if (ntags()) + return (0); #endif - return (next_ifile(curr_ifile) != NULL_IFILE); - } - return (0); + return (next_ifile(curr_ifile) != NULL_IFILE); + } + return (0); } /* @@ -246,315 +246,315 @@ cond(c, where) * Here we decode that letter and take the appropriate action, * usually by appending something to the message being built. */ - static void + static void protochar(c, where, iseditproto) - int c; - int where; - int iseditproto; + int c; + int where; + int iseditproto; { - POSITION pos; - POSITION len; - int n; - LINENUM linenum; - LINENUM last_linenum; - IFILE h; - char *s; + POSITION pos; + POSITION len; + int n; + LINENUM linenum; + LINENUM last_linenum; + IFILE h; + char *s; #undef PAGE_NUM #define PAGE_NUM(linenum) ((((linenum) - 1) / (sc_height - header_lines - 1)) + 1) - switch (c) - { - case 'b': /* Current byte offset */ - pos = curr_byte(where); - if (pos != NULL_POSITION) - ap_pos(pos); - else - ap_quest(); - break; - case 'c': - ap_int(hshift); - break; - case 'd': /* Current page number */ - linenum = currline(where); - if (linenum > 0 && sc_height > header_lines + 1) - ap_linenum(PAGE_NUM(linenum)); - else - ap_quest(); - break; - case 'D': /* Final page number */ - /* Find the page number of the last byte in the file (len-1). */ - len = ch_length(); - if (len == NULL_POSITION) - ap_quest(); - else if (len == 0) - /* An empty file has no pages. */ - ap_linenum(0); - else - { - linenum = find_linenum(len - 1); - if (linenum <= 0) - ap_quest(); - else - ap_linenum(PAGE_NUM(linenum)); - } - break; + switch (c) + { + case 'b': /* Current byte offset */ + pos = curr_byte(where); + if (pos != NULL_POSITION) + ap_pos(pos); + else + ap_quest(); + break; + case 'c': + ap_int(hshift); + break; + case 'd': /* Current page number */ + linenum = currline(where); + if (linenum > 0 && sc_height > header_lines + 1) + ap_linenum(PAGE_NUM(linenum)); + else + ap_quest(); + break; + case 'D': /* Final page number */ + /* Find the page number of the last byte in the file (len-1). */ + len = ch_length(); + if (len == NULL_POSITION) + ap_quest(); + else if (len == 0) + /* An empty file has no pages. */ + ap_linenum(0); + else + { + linenum = find_linenum(len - 1); + if (linenum <= 0) + ap_quest(); + else + ap_linenum(PAGE_NUM(linenum)); + } + break; #if EDITOR - case 'E': /* Editor name */ - ap_str(editor); - break; + case 'E': /* Editor name */ + ap_str(editor); + break; #endif - case 'f': /* File name */ - ap_str(get_filename(curr_ifile)); - break; - case 'F': /* Last component of file name */ - ap_str(last_component(get_filename(curr_ifile))); - break; - case 'g': /* Shell-escaped file name */ - s = shell_quote(get_filename(curr_ifile)); - ap_str(s); - free(s); - break; - case 'i': /* Index into list of files */ + case 'f': /* File name */ + ap_str(get_filename(curr_ifile)); + break; + case 'F': /* Last component of file name */ + ap_str(last_component(get_filename(curr_ifile))); + break; + case 'g': /* Shell-escaped file name */ + s = shell_quote(get_filename(curr_ifile)); + ap_str(s); + free(s); + break; + case 'i': /* Index into list of files */ #if TAGS - if (ntags()) - ap_int(curr_tag()); - else + if (ntags()) + ap_int(curr_tag()); + else #endif - ap_int(get_index(curr_ifile)); - break; - case 'l': /* Current line number */ - linenum = currline(where); - if (linenum != 0) - ap_linenum(vlinenum(linenum)); - else - ap_quest(); - break; - case 'L': /* Final line number */ - len = ch_length(); - if (len == NULL_POSITION || len == ch_zero() || - (linenum = find_linenum(len)) <= 0) - ap_quest(); - else - ap_linenum(vlinenum(linenum-1)); - break; - case 'm': /* Number of files */ + ap_int(get_index(curr_ifile)); + break; + case 'l': /* Current line number */ + linenum = currline(where); + if (linenum != 0) + ap_linenum(vlinenum(linenum)); + else + ap_quest(); + break; + case 'L': /* Final line number */ + len = ch_length(); + if (len == NULL_POSITION || len == ch_zero() || + (linenum = find_linenum(len)) <= 0) + ap_quest(); + else + ap_linenum(vlinenum(linenum-1)); + break; + case 'm': /* Number of files */ #if TAGS - n = ntags(); - if (n) - ap_int(n); - else + n = ntags(); + if (n) + ap_int(n); + else #endif - ap_int(nifile()); - break; - case 'p': /* Percent into file (bytes) */ - pos = curr_byte(where); - len = ch_length(); - if (pos != NULL_POSITION && len > 0) - ap_int(percentage(pos,len)); - else - ap_quest(); - break; - case 'P': /* Percent into file (lines) */ - linenum = currline(where); - if (linenum == 0 || - (len = ch_length()) == NULL_POSITION || len == ch_zero() || - (last_linenum = find_linenum(len)) <= 0) - ap_quest(); - else - ap_int(percentage(linenum, last_linenum)); - break; - case 's': /* Size of file */ - case 'B': - len = ch_length(); - if (len != NULL_POSITION) - ap_pos(len); - else - ap_quest(); - break; - case 't': /* Truncate trailing spaces in the message */ - while (mp > message && mp[-1] == ' ') - mp--; - *mp = '\0'; - break; - case 'T': /* Type of list */ + ap_int(nifile()); + break; + case 'p': /* Percent into file (bytes) */ + pos = curr_byte(where); + len = ch_length(); + if (pos != NULL_POSITION && len > 0) + ap_int(percentage(pos,len)); + else + ap_quest(); + break; + case 'P': /* Percent into file (lines) */ + linenum = currline(where); + if (linenum == 0 || + (len = ch_length()) == NULL_POSITION || len == ch_zero() || + (last_linenum = find_linenum(len)) <= 0) + ap_quest(); + else + ap_int(percentage(linenum, last_linenum)); + break; + case 's': /* Size of file */ + case 'B': + len = ch_length(); + if (len != NULL_POSITION) + ap_pos(len); + else + ap_quest(); + break; + case 't': /* Truncate trailing spaces in the message */ + while (mp > message && mp[-1] == ' ') + mp--; + *mp = '\0'; + break; + case 'T': /* Type of list */ #if TAGS - if (ntags()) - ap_str("tag"); - else + if (ntags()) + ap_str("tag"); + else #endif - ap_str("file"); - break; - case 'x': /* Name of next file */ - h = next_ifile(curr_ifile); - if (h != NULL_IFILE) - ap_str(get_filename(h)); - else - ap_quest(); - break; - } + ap_str("file"); + break; + case 'x': /* Name of next file */ + h = next_ifile(curr_ifile); + if (h != NULL_IFILE) + ap_str(get_filename(h)); + else + ap_quest(); + break; + } } /* * Skip a false conditional. - * When a false condition is found (either a false IF or the ELSE part + * When a false condition is found (either a false IF or the ELSE part * of a true IF), this routine scans the prototype string to decide * where to resume parsing the string. * We must keep track of nested IFs and skip them properly. */ - static constant char * + static constant char * skipcond(p) - constant char *p; + constant char *p; { - int iflevel; - - /* - * We came in here after processing a ? or :, - * so we start nested one level deep. - */ - iflevel = 1; - - for (;;) switch (*++p) - { - case '?': - /* - * Start of a nested IF. - */ - iflevel++; - break; - case ':': - /* - * Else. - * If this matches the IF we came in here with, - * then we're done. - */ - if (iflevel == 1) - return (p); - break; - case '.': - /* - * Endif. - * If this matches the IF we came in here with, - * then we're done. - */ - if (--iflevel == 0) - return (p); - break; - case '\\': - /* - * Backslash escapes the next character. - */ - ++p; - break; - case '\0': - /* - * Whoops. Hit end of string. - * This is a malformed conditional, but just treat it - * as if all active conditionals ends here. - */ - return (p-1); - } - /*NOTREACHED*/ + int iflevel; + + /* + * We came in here after processing a ? or :, + * so we start nested one level deep. + */ + iflevel = 1; + + for (;;) switch (*++p) + { + case '?': + /* + * Start of a nested IF. + */ + iflevel++; + break; + case ':': + /* + * Else. + * If this matches the IF we came in here with, + * then we're done. + */ + if (iflevel == 1) + return (p); + break; + case '.': + /* + * Endif. + * If this matches the IF we came in here with, + * then we're done. + */ + if (--iflevel == 0) + return (p); + break; + case '\\': + /* + * Backslash escapes the next character. + */ + ++p; + break; + case '\0': + /* + * Whoops. Hit end of string. + * This is a malformed conditional, but just treat it + * as if all active conditionals ends here. + */ + return (p-1); + } + /*NOTREACHED*/ } /* * Decode a char that represents a position on the screen. */ - static constant char * + static constant char * wherechar(p, wp) - char constant *p; - int *wp; + char constant *p; + int *wp; { - switch (*p) - { - case 'b': case 'd': case 'l': case 'p': case 'P': - switch (*++p) - { - case 't': *wp = TOP; break; - case 'm': *wp = MIDDLE; break; - case 'b': *wp = BOTTOM; break; - case 'B': *wp = BOTTOM_PLUS_ONE; break; - case 'j': *wp = sindex_from_sline(jump_sline); break; - default: *wp = TOP; p--; break; - } - } - return (p); + switch (*p) + { + case 'b': case 'd': case 'l': case 'p': case 'P': + switch (*++p) + { + case 't': *wp = TOP; break; + case 'm': *wp = MIDDLE; break; + case 'b': *wp = BOTTOM; break; + case 'B': *wp = BOTTOM_PLUS_ONE; break; + case 'j': *wp = sindex_from_sline(jump_sline); break; + default: *wp = TOP; p--; break; + } + } + return (p); } /* * Construct a message based on a prototype string. */ - public char * + public char * pr_expand(proto) - constant char *proto; + constant char *proto; { - constant char *p; - int c; - int where; - - mp = message; - - if (*proto == '\0') - return (""); - - for (p = proto; *p != '\0'; p++) - { - switch (*p) - { - default: /* Just put the character in the message */ - ap_char(*p); - break; - case '\\': /* Backslash escapes the next character */ - p++; - ap_char(*p); - break; - case '?': /* Conditional (IF) */ - if ((c = *++p) == '\0') - --p; - else - { - where = 0; - p = wherechar(p, &where); - if (!cond(c, where)) - p = skipcond(p); - } - break; - case ':': /* ELSE */ - p = skipcond(p); - break; - case '.': /* ENDIF */ - break; - case '%': /* Percent escape */ - if ((c = *++p) == '\0') - --p; - else - { - where = 0; - p = wherechar(p, &where); - protochar(c, where, + constant char *p; + int c; + int where; + + mp = message; + + if (*proto == '\0') + return (""); + + for (p = proto; *p != '\0'; p++) + { + switch (*p) + { + default: /* Just put the character in the message */ + ap_char(*p); + break; + case '\\': /* Backslash escapes the next character */ + p++; + ap_char(*p); + break; + case '?': /* Conditional (IF) */ + if ((c = *++p) == '\0') + --p; + else + { + where = 0; + p = wherechar(p, &where); + if (!cond(c, where)) + p = skipcond(p); + } + break; + case ':': /* ELSE */ + p = skipcond(p); + break; + case '.': /* ENDIF */ + break; + case '%': /* Percent escape */ + if ((c = *++p) == '\0') + --p; + else + { + where = 0; + p = wherechar(p, &where); + protochar(c, where, #if EDITOR - (proto == editproto)); + (proto == editproto)); #else - 0); + 0); #endif - } - break; - } - } + } + break; + } + } - if (mp == message) - return (""); - return (message); + if (mp == message) + return (""); + return (message); } /* * Return a message suitable for printing by the "=" command. */ - public char * + public char * eq_message(VOID_PARAM) { - return (pr_expand(eqproto)); + return (pr_expand(eqproto)); } /* @@ -563,24 +563,24 @@ eq_message(VOID_PARAM) * If we can't come up with an appropriate prompt, return NULL * and the caller will prompt with a colon. */ - public char * + public char * pr_string(VOID_PARAM) { - char *prompt; - int type; - - type = (!less_is_more) ? pr_type : pr_type ? 0 : 1; - prompt = pr_expand((ch_getflags() & CH_HELPFILE) ? - hproto : prproto[type]); - new_file = 0; - return (prompt); + char *prompt; + int type; + + type = (!less_is_more) ? pr_type : pr_type ? 0 : 1; + prompt = pr_expand((ch_getflags() & CH_HELPFILE) ? + hproto : prproto[type]); + new_file = 0; + return (prompt); } /* * Return a message suitable for printing while waiting in the F command. */ - public char * + public char * wait_message(VOID_PARAM) { - return (pr_expand(wproto)); + return (pr_expand(wproto)); } diff --git a/regexp.c b/regexp.c index fcf7c9a..17f6a83 100644 --- a/regexp.c +++ b/regexp.c @@ -1,22 +1,22 @@ /* * regcomp and regexec -- regsub and regerror are elsewhere * - * Copyright (c) 1986 by University of Toronto. - * Written by Henry Spencer. Not derived from licensed software. + * Copyright (c) 1986 by University of Toronto. + * Written by Henry Spencer. Not derived from licensed software. * - * Permission is granted to anyone to use this software for any - * purpose on any computer system, and to redistribute it freely, - * subject to the following restrictions: + * Permission is granted to anyone to use this software for any + * purpose on any computer system, and to redistribute it freely, + * subject to the following restrictions: * - * 1. The author is not responsible for the consequences of use of - * this software, no matter how awful, even if they arise - * from defects in it. + * 1. The author is not responsible for the consequences of use of + * this software, no matter how awful, even if they arise + * from defects in it. * - * 2. The origin of this software must not be misrepresented, either - * by explicit claim or by omission. + * 2. The origin of this software must not be misrepresented, either + * by explicit claim or by omission. * - * 3. Altered versions must be plainly marked as such, and must not - * be misrepresented as being the original software. + * 3. Altered versions must be plainly marked as such, and must not + * be misrepresented as being the original software. * * Beware that some of this code is subtly aware of the way operator * precedence is structured in regular expressions. Serious changes in @@ -44,10 +44,10 @@ * compile to execute that permits the execute phase to run lots faster on * simple cases. They are: * - * regstart char that must begin a match; '\0' if none obvious - * reganch is the match anchored (at beginning-of-line only)? - * regmust string (pointer into program) that match must include, or NULL - * regmlen length of regmust string + * regstart char that must begin a match; '\0' if none obvious + * reganch is the match anchored (at beginning-of-line only)? + * regmust string (pointer into program) that match must include, or NULL + * regmlen length of regmust string * * Regstart and reganch permit very fast decisions on suitable starting points * for a match, cutting down the work a lot. Regmust permits fast rejection @@ -75,44 +75,44 @@ * to the thing following the set of BRANCHes.) The opcodes are: */ -/* definition number opnd? meaning */ +/* definition number opnd? meaning */ #undef EOL -#define END 0 /* no End of program. */ -#define BOL 1 /* no Match "" at beginning of line. */ -#define EOL 2 /* no Match "" at end of line. */ -#define ANY 3 /* no Match any one character. */ -#define ANYOF 4 /* str Match any character in this string. */ -#define ANYBUT 5 /* str Match any character not in this string. */ -#define BRANCH 6 /* node Match this alternative, or the next... */ -#define BACK 7 /* no Match "", "next" ptr points backward. */ -#define EXACTLY 8 /* str Match this string. */ -#define NOTHING 9 /* no Match empty string. */ -#define STAR 10 /* node Match this (simple) thing 0 or more times. */ -#define PLUS 11 /* node Match this (simple) thing 1 or more times. */ -#define OPEN 20 /* no Mark this point in input as start of #n. */ - /* OPEN+1 is number 1, etc. */ -#define CLOSE 30 /* no Analogous to OPEN. */ +#define END 0 /* no End of program. */ +#define BOL 1 /* no Match "" at beginning of line. */ +#define EOL 2 /* no Match "" at end of line. */ +#define ANY 3 /* no Match any one character. */ +#define ANYOF 4 /* str Match any character in this string. */ +#define ANYBUT 5 /* str Match any character not in this string. */ +#define BRANCH 6 /* node Match this alternative, or the next... */ +#define BACK 7 /* no Match "", "next" ptr points backward. */ +#define EXACTLY 8 /* str Match this string. */ +#define NOTHING 9 /* no Match empty string. */ +#define STAR 10 /* node Match this (simple) thing 0 or more times. */ +#define PLUS 11 /* node Match this (simple) thing 1 or more times. */ +#define OPEN 20 /* no Mark this point in input as start of #n. */ + /* OPEN+1 is number 1, etc. */ +#define CLOSE 30 /* no Analogous to OPEN. */ /* * Opcode notes: * - * BRANCH The set of branches constituting a single choice are hooked - * together with their "next" pointers, since precedence prevents - * anything being concatenated to any individual branch. The - * "next" pointer of the last BRANCH in a choice points to the - * thing following the whole choice. This is also where the - * final "next" pointer of each individual branch points; each - * branch starts with the operand node of a BRANCH node. + * BRANCH The set of branches constituting a single choice are hooked + * together with their "next" pointers, since precedence prevents + * anything being concatenated to any individual branch. The + * "next" pointer of the last BRANCH in a choice points to the + * thing following the whole choice. This is also where the + * final "next" pointer of each individual branch points; each + * branch starts with the operand node of a BRANCH node. * - * BACK Normal "next" pointers all implicitly point forward; BACK - * exists to make loop structures possible. + * BACK Normal "next" pointers all implicitly point forward; BACK + * exists to make loop structures possible. * - * STAR,PLUS '?', and complex '*' and '+', are implemented as circular - * BRANCH structures using BACK. Simple cases (one character - * per match) are implemented with STAR and PLUS for speed - * and to minimize recursive plunges. + * STAR,PLUS '?', and complex '*' and '+', are implemented as circular + * BRANCH structures using BACK. Simple cases (one character + * per match) are implemented with STAR and PLUS for speed + * and to minimize recursive plunges. * - * OPEN,CLOSE ...are numbered at compile time. + * OPEN,CLOSE ...are numbered at compile time. */ /* @@ -125,9 +125,9 @@ * Using two bytes for the "next" pointer is vast overkill for most things, * but allows patterns to get big without disasters. */ -#define OP(p) (*(p)) -#define NEXT(p) (((*((p)+1)&0377)<<8) + (*((p)+2)&0377)) -#define OPERAND(p) ((p) + 3) +#define OP(p) (*(p)) +#define NEXT(p) (((*((p)+1)&0377)<<8) + (*((p)+2)&0377)) +#define OPERAND(p) ((p) + 3) /* * See regmagic.h for one further detail of program structure. @@ -138,44 +138,44 @@ * Utility definitions. */ #ifndef CHARBITS -#define UCHARAT(p) ((int)*(unsigned char *)(p)) +#define UCHARAT(p) ((int)*(unsigned char *)(p)) #else -#define UCHARAT(p) ((int)*(p)&CHARBITS) +#define UCHARAT(p) ((int)*(p)&CHARBITS) #endif -#define FAIL(m) { regerror(m); return(NULL); } -#define ISMULT(c) ((c) == '*' || (c) == '+' || (c) == '?') -#define META "^$.[()|?+*\\" +#define FAIL(m) { regerror(m); return(NULL); } +#define ISMULT(c) ((c) == '*' || (c) == '+' || (c) == '?') +#define META "^$.[()|?+*\\" /* * Flags to be passed up and down. */ -#define HASWIDTH 01 /* Known never to match null string. */ -#define SIMPLE 02 /* Simple enough to be STAR/PLUS operand. */ -#define SPSTART 04 /* Starts with * or +. */ -#define WORST 0 /* Worst case. */ +#define HASWIDTH 01 /* Known never to match null string. */ +#define SIMPLE 02 /* Simple enough to be STAR/PLUS operand. */ +#define SPSTART 04 /* Starts with * or +. */ +#define WORST 0 /* Worst case. */ /* * Global work variables for regcomp(). */ -static char *regparse; /* Input-scan pointer. */ -static int regnpar; /* () count. */ +static char *regparse; /* Input-scan pointer. */ +static int regnpar; /* () count. */ static char regdummy; -static char *regcode; /* Code-emit pointer; ®dummy = don't. */ -static long regsize; /* Code size. */ +static char *regcode; /* Code-emit pointer; ®dummy = don't. */ +static long regsize; /* Code size. */ /* * The first byte of the regexp internal "program" is actually this magic * number; the start node begins in the second byte. */ -#define MAGIC 0234 +#define MAGIC 0234 /* * Forward declarations for regcomp()'s friends. */ #ifndef STATIC -#define STATIC static +#define STATIC static #endif STATIC char *reg(); STATIC char *regbranch(); @@ -210,81 +210,81 @@ regexp * regcomp(exp) char *exp; { - register regexp *r; - register char *scan; - register char *longest; - register int len; - int flags; - - if (exp == NULL) - FAIL("NULL argument"); - - /* First pass: determine size, legality. */ - regparse = exp; - regnpar = 1; - regsize = 0L; - regcode = ®dummy; - regc(MAGIC); - if (reg(0, &flags) == NULL) - return(NULL); - - /* Small enough for pointer-storage convention? */ - if (regsize >= 32767L) /* Probably could be 65535L. */ - FAIL("regexp too big"); - - /* Allocate space. */ - r = (regexp *)malloc(sizeof(regexp) + (unsigned)regsize); - if (r == NULL) - FAIL("out of space"); - - /* Second pass: emit code. */ - regparse = exp; - regnpar = 1; - regcode = r->program; - regc(MAGIC); - if (reg(0, &flags) == NULL) - { - free(r); - return(NULL); - } - - /* Dig out information for optimizations. */ - r->regstart = '\0'; /* Worst-case defaults. */ - r->reganch = 0; - r->regmust = NULL; - r->regmlen = 0; - scan = r->program+1; /* First BRANCH. */ - if (OP(regnext(scan)) == END) { /* Only one top-level choice. */ - scan = OPERAND(scan); - - /* Starting-point info. */ - if (OP(scan) == EXACTLY) - r->regstart = *OPERAND(scan); - else if (OP(scan) == BOL) - r->reganch++; - - /* - * If there's something expensive in the r.e., find the - * longest literal string that must appear and make it the - * regmust. Resolve ties in favor of later strings, since - * the regstart check works with the beginning of the r.e. - * and avoiding duplication strengthens checking. Not a - * strong reason, but sufficient in the absence of others. - */ - if (flags&SPSTART) { - longest = NULL; - len = 0; - for (; scan != NULL; scan = regnext(scan)) - if (OP(scan) == EXACTLY && ((int) strlen(OPERAND(scan))) >= len) { - longest = OPERAND(scan); - len = (int) strlen(OPERAND(scan)); - } - r->regmust = longest; - r->regmlen = len; - } - } - - return(r); + register regexp *r; + register char *scan; + register char *longest; + register int len; + int flags; + + if (exp == NULL) + FAIL("NULL argument"); + + /* First pass: determine size, legality. */ + regparse = exp; + regnpar = 1; + regsize = 0L; + regcode = ®dummy; + regc(MAGIC); + if (reg(0, &flags) == NULL) + return(NULL); + + /* Small enough for pointer-storage convention? */ + if (regsize >= 32767L) /* Probably could be 65535L. */ + FAIL("regexp too big"); + + /* Allocate space. */ + r = (regexp *)malloc(sizeof(regexp) + (unsigned)regsize); + if (r == NULL) + FAIL("out of space"); + + /* Second pass: emit code. */ + regparse = exp; + regnpar = 1; + regcode = r->program; + regc(MAGIC); + if (reg(0, &flags) == NULL) + { + free(r); + return(NULL); + } + + /* Dig out information for optimizations. */ + r->regstart = '\0'; /* Worst-case defaults. */ + r->reganch = 0; + r->regmust = NULL; + r->regmlen = 0; + scan = r->program+1; /* First BRANCH. */ + if (OP(regnext(scan)) == END) { /* Only one top-level choice. */ + scan = OPERAND(scan); + + /* Starting-point info. */ + if (OP(scan) == EXACTLY) + r->regstart = *OPERAND(scan); + else if (OP(scan) == BOL) + r->reganch++; + + /* + * If there's something expensive in the r.e., find the + * longest literal string that must appear and make it the + * regmust. Resolve ties in favor of later strings, since + * the regstart check works with the beginning of the r.e. + * and avoiding duplication strengthens checking. Not a + * strong reason, but sufficient in the absence of others. + */ + if (flags&SPSTART) { + longest = NULL; + len = 0; + for (; scan != NULL; scan = regnext(scan)) + if (OP(scan) == EXACTLY && ((int) strlen(OPERAND(scan))) >= len) { + longest = OPERAND(scan); + len = (int) strlen(OPERAND(scan)); + } + r->regmust = longest; + r->regmlen = len; + } + } + + return(r); } /* @@ -298,69 +298,69 @@ char *exp; */ static char * reg(paren, flagp) -int paren; /* Parenthesized? */ +int paren; /* Parenthesized? */ int *flagp; { - register char *ret; - register char *br; - register char *ender; - register int parno = 0; - int flags; - - *flagp = HASWIDTH; /* Tentatively. */ - - /* Make an OPEN node, if parenthesized. */ - if (paren) { - if (regnpar >= NSUBEXP) - FAIL("too many ()"); - parno = regnpar; - regnpar++; - ret = regnode(OPEN+parno); - } else - ret = NULL; - - /* Pick up the branches, linking them together. */ - br = regbranch(&flags); - if (br == NULL) - return(NULL); - if (ret != NULL) - regtail(ret, br); /* OPEN -> first. */ - else - ret = br; - if (!(flags&HASWIDTH)) - *flagp &= ~HASWIDTH; - *flagp |= flags&SPSTART; - while (*regparse == '|') { - regparse++; - br = regbranch(&flags); - if (br == NULL) - return(NULL); - regtail(ret, br); /* BRANCH -> BRANCH. */ - if (!(flags&HASWIDTH)) - *flagp &= ~HASWIDTH; - *flagp |= flags&SPSTART; - } - - /* Make a closing node, and hook it on the end. */ - ender = regnode((paren) ? CLOSE+parno : END); - regtail(ret, ender); - - /* Hook the tails of the branches to the closing node. */ - for (br = ret; br != NULL; br = regnext(br)) - regoptail(br, ender); - - /* Check for proper termination. */ - if (paren && *regparse++ != ')') { - FAIL("unmatched ()"); - } else if (!paren && *regparse != '\0') { - if (*regparse == ')') { - FAIL("unmatched ()"); - } else - FAIL("junk on end"); /* "Can't happen". */ - /* NOTREACHED */ - } - - return(ret); + register char *ret; + register char *br; + register char *ender; + register int parno = 0; + int flags; + + *flagp = HASWIDTH; /* Tentatively. */ + + /* Make an OPEN node, if parenthesized. */ + if (paren) { + if (regnpar >= NSUBEXP) + FAIL("too many ()"); + parno = regnpar; + regnpar++; + ret = regnode(OPEN+parno); + } else + ret = NULL; + + /* Pick up the branches, linking them together. */ + br = regbranch(&flags); + if (br == NULL) + return(NULL); + if (ret != NULL) + regtail(ret, br); /* OPEN -> first. */ + else + ret = br; + if (!(flags&HASWIDTH)) + *flagp &= ~HASWIDTH; + *flagp |= flags&SPSTART; + while (*regparse == '|') { + regparse++; + br = regbranch(&flags); + if (br == NULL) + return(NULL); + regtail(ret, br); /* BRANCH -> BRANCH. */ + if (!(flags&HASWIDTH)) + *flagp &= ~HASWIDTH; + *flagp |= flags&SPSTART; + } + + /* Make a closing node, and hook it on the end. */ + ender = regnode((paren) ? CLOSE+parno : END); + regtail(ret, ender); + + /* Hook the tails of the branches to the closing node. */ + for (br = ret; br != NULL; br = regnext(br)) + regoptail(br, ender); + + /* Check for proper termination. */ + if (paren && *regparse++ != ')') { + FAIL("unmatched ()"); + } else if (!paren && *regparse != '\0') { + if (*regparse == ')') { + FAIL("unmatched ()"); + } else + FAIL("junk on end"); /* "Can't happen". */ + /* NOTREACHED */ + } + + return(ret); } /* @@ -372,30 +372,30 @@ static char * regbranch(flagp) int *flagp; { - register char *ret; - register char *chain; - register char *latest; - int flags; - - *flagp = WORST; /* Tentatively. */ - - ret = regnode(BRANCH); - chain = NULL; - while (*regparse != '\0' && *regparse != '|' && *regparse != ')') { - latest = regpiece(&flags); - if (latest == NULL) - return(NULL); - *flagp |= flags&HASWIDTH; - if (chain == NULL) /* First piece. */ - *flagp |= flags&SPSTART; - else - regtail(chain, latest); - chain = latest; - } - if (chain == NULL) /* Loop ran zero times. */ - (void) regnode(NOTHING); - - return(ret); + register char *ret; + register char *chain; + register char *latest; + int flags; + + *flagp = WORST; /* Tentatively. */ + + ret = regnode(BRANCH); + chain = NULL; + while (*regparse != '\0' && *regparse != '|' && *regparse != ')') { + latest = regpiece(&flags); + if (latest == NULL) + return(NULL); + *flagp |= flags&HASWIDTH; + if (chain == NULL) /* First piece. */ + *flagp |= flags&SPSTART; + else + regtail(chain, latest); + chain = latest; + } + if (chain == NULL) /* Loop ran zero times. */ + (void) regnode(NOTHING); + + return(ret); } /* @@ -411,56 +411,56 @@ static char * regpiece(flagp) int *flagp; { - register char *ret; - register char op; - register char *next; - int flags; - - ret = regatom(&flags); - if (ret == NULL) - return(NULL); - - op = *regparse; - if (!ISMULT(op)) { - *flagp = flags; - return(ret); - } - - if (!(flags&HASWIDTH) && op != '?') - FAIL("*+ operand could be empty"); - *flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH); - - if (op == '*' && (flags&SIMPLE)) - reginsert(STAR, ret); - else if (op == '*') { - /* Emit x* as (x&|), where & means "self". */ - reginsert(BRANCH, ret); /* Either x */ - regoptail(ret, regnode(BACK)); /* and loop */ - regoptail(ret, ret); /* back */ - regtail(ret, regnode(BRANCH)); /* or */ - regtail(ret, regnode(NOTHING)); /* null. */ - } else if (op == '+' && (flags&SIMPLE)) - reginsert(PLUS, ret); - else if (op == '+') { - /* Emit x+ as x(&|), where & means "self". */ - next = regnode(BRANCH); /* Either */ - regtail(ret, next); - regtail(regnode(BACK), ret); /* loop back */ - regtail(next, regnode(BRANCH)); /* or */ - regtail(ret, regnode(NOTHING)); /* null. */ - } else if (op == '?') { - /* Emit x? as (x|) */ - reginsert(BRANCH, ret); /* Either x */ - regtail(ret, regnode(BRANCH)); /* or */ - next = regnode(NOTHING); /* null. */ - regtail(ret, next); - regoptail(ret, next); - } - regparse++; - if (ISMULT(*regparse)) - FAIL("nested *?+"); - - return(ret); + register char *ret; + register char op; + register char *next; + int flags; + + ret = regatom(&flags); + if (ret == NULL) + return(NULL); + + op = *regparse; + if (!ISMULT(op)) { + *flagp = flags; + return(ret); + } + + if (!(flags&HASWIDTH) && op != '?') + FAIL("*+ operand could be empty"); + *flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH); + + if (op == '*' && (flags&SIMPLE)) + reginsert(STAR, ret); + else if (op == '*') { + /* Emit x* as (x&|), where & means "self". */ + reginsert(BRANCH, ret); /* Either x */ + regoptail(ret, regnode(BACK)); /* and loop */ + regoptail(ret, ret); /* back */ + regtail(ret, regnode(BRANCH)); /* or */ + regtail(ret, regnode(NOTHING)); /* null. */ + } else if (op == '+' && (flags&SIMPLE)) + reginsert(PLUS, ret); + else if (op == '+') { + /* Emit x+ as x(&|), where & means "self". */ + next = regnode(BRANCH); /* Either */ + regtail(ret, next); + regtail(regnode(BACK), ret); /* loop back */ + regtail(next, regnode(BRANCH)); /* or */ + regtail(ret, regnode(NOTHING)); /* null. */ + } else if (op == '?') { + /* Emit x? as (x|) */ + reginsert(BRANCH, ret); /* Either x */ + regtail(ret, regnode(BRANCH)); /* or */ + next = regnode(NOTHING); /* null. */ + regtail(ret, next); + regoptail(ret, next); + } + regparse++; + if (ISMULT(*regparse)) + FAIL("nested *?+"); + + return(ret); } /* @@ -475,133 +475,133 @@ static char * regatom(flagp) int *flagp; { - register char *ret; - int flags; - - *flagp = WORST; /* Tentatively. */ - - switch (*regparse++) { - case '^': - ret = regnode(BOL); - break; - case '$': - ret = regnode(EOL); - break; - case '.': - ret = regnode(ANY); - *flagp |= HASWIDTH|SIMPLE; - break; - case '[': { - register int clss; - register int classend; - - if (*regparse == '^') { /* Complement of range. */ - ret = regnode(ANYBUT); - regparse++; - } else - ret = regnode(ANYOF); - if (*regparse == ']' || *regparse == '-') - regc(*regparse++); - while (*regparse != '\0' && *regparse != ']') { - if (*regparse == '-') { - regparse++; - if (*regparse == ']' || *regparse == '\0') - regc('-'); - else { - clss = UCHARAT(regparse-2)+1; - classend = UCHARAT(regparse); - if (clss > classend+1) - FAIL("invalid [] range"); - for (; clss <= classend; clss++) - regc(clss); - regparse++; - } - } else - regc(*regparse++); - } - regc('\0'); - if (*regparse != ']') - FAIL("unmatched []"); - regparse++; - *flagp |= HASWIDTH|SIMPLE; - } - break; - case '(': - ret = reg(1, &flags); - if (ret == NULL) - return(NULL); - *flagp |= flags&(HASWIDTH|SPSTART); - break; - case '\0': - case '|': - case ')': - FAIL("internal urp"); /* Supposed to be caught earlier. */ - /* NOTREACHED */ - break; - case '?': - case '+': - case '*': - FAIL("?+* follows nothing"); - /* NOTREACHED */ - break; - case '\\': - if (*regparse == '\0') - FAIL("trailing \\"); - ret = regnode(EXACTLY); - regc(*regparse++); - regc('\0'); - *flagp |= HASWIDTH|SIMPLE; - break; - default: { - register int len; - register char ender; - - regparse--; - len = (int) strcspn(regparse, META); - if (len <= 0) - FAIL("internal disaster"); - ender = *(regparse+len); - if (len > 1 && ISMULT(ender)) - len--; /* Back off clear of ?+* operand. */ - *flagp |= HASWIDTH; - if (len == 1) - *flagp |= SIMPLE; - ret = regnode(EXACTLY); - while (len > 0) { - regc(*regparse++); - len--; - } - regc('\0'); - } - break; - } - - return(ret); + register char *ret; + int flags; + + *flagp = WORST; /* Tentatively. */ + + switch (*regparse++) { + case '^': + ret = regnode(BOL); + break; + case '$': + ret = regnode(EOL); + break; + case '.': + ret = regnode(ANY); + *flagp |= HASWIDTH|SIMPLE; + break; + case '[': { + register int clss; + register int classend; + + if (*regparse == '^') { /* Complement of range. */ + ret = regnode(ANYBUT); + regparse++; + } else + ret = regnode(ANYOF); + if (*regparse == ']' || *regparse == '-') + regc(*regparse++); + while (*regparse != '\0' && *regparse != ']') { + if (*regparse == '-') { + regparse++; + if (*regparse == ']' || *regparse == '\0') + regc('-'); + else { + clss = UCHARAT(regparse-2)+1; + classend = UCHARAT(regparse); + if (clss > classend+1) + FAIL("invalid [] range"); + for (; clss <= classend; clss++) + regc(clss); + regparse++; + } + } else + regc(*regparse++); + } + regc('\0'); + if (*regparse != ']') + FAIL("unmatched []"); + regparse++; + *flagp |= HASWIDTH|SIMPLE; + } + break; + case '(': + ret = reg(1, &flags); + if (ret == NULL) + return(NULL); + *flagp |= flags&(HASWIDTH|SPSTART); + break; + case '\0': + case '|': + case ')': + FAIL("internal urp"); /* Supposed to be caught earlier. */ + /* NOTREACHED */ + break; + case '?': + case '+': + case '*': + FAIL("?+* follows nothing"); + /* NOTREACHED */ + break; + case '\\': + if (*regparse == '\0') + FAIL("trailing \\"); + ret = regnode(EXACTLY); + regc(*regparse++); + regc('\0'); + *flagp |= HASWIDTH|SIMPLE; + break; + default: { + register int len; + register char ender; + + regparse--; + len = (int) strcspn(regparse, META); + if (len <= 0) + FAIL("internal disaster"); + ender = *(regparse+len); + if (len > 1 && ISMULT(ender)) + len--; /* Back off clear of ?+* operand. */ + *flagp |= HASWIDTH; + if (len == 1) + *flagp |= SIMPLE; + ret = regnode(EXACTLY); + while (len > 0) { + regc(*regparse++); + len--; + } + regc('\0'); + } + break; + } + + return(ret); } /* - regnode - emit a node */ -static char * /* Location. */ +static char * /* Location. */ regnode(op) char op; { - register char *ret; - register char *ptr; - - ret = regcode; - if (ret == ®dummy) { - regsize += 3; - return(ret); - } - - ptr = ret; - *ptr++ = op; - *ptr++ = '\0'; /* Null "next" pointer. */ - *ptr++ = '\0'; - regcode = ptr; - - return(ret); + register char *ret; + register char *ptr; + + ret = regcode; + if (ret == ®dummy) { + regsize += 3; + return(ret); + } + + ptr = ret; + *ptr++ = op; + *ptr++ = '\0'; /* Null "next" pointer. */ + *ptr++ = '\0'; + regcode = ptr; + + return(ret); } /* @@ -611,10 +611,10 @@ static void regc(b) char b; { - if (regcode != ®dummy) - *regcode++ = b; - else - regsize++; + if (regcode != ®dummy) + *regcode++ = b; + else + regsize++; } /* @@ -627,25 +627,25 @@ reginsert(op, opnd) char op; char *opnd; { - register char *src; - register char *dst; - register char *place; - - if (regcode == ®dummy) { - regsize += 3; - return; - } - - src = regcode; - regcode += 3; - dst = regcode; - while (src > opnd) - *--dst = *--src; - - place = opnd; /* Op node, where operand used to be. */ - *place++ = op; - *place++ = '\0'; - *place++ = '\0'; + register char *src; + register char *dst; + register char *place; + + if (regcode == ®dummy) { + regsize += 3; + return; + } + + src = regcode; + regcode += 3; + dst = regcode; + while (src > opnd) + *--dst = *--src; + + place = opnd; /* Op node, where operand used to be. */ + *place++ = op; + *place++ = '\0'; + *place++ = '\0'; } /* @@ -656,28 +656,28 @@ regtail(p, val) char *p; char *val; { - register char *scan; - register char *temp; - register int offset; - - if (p == ®dummy) - return; - - /* Find last node. */ - scan = p; - for (;;) { - temp = regnext(scan); - if (temp == NULL) - break; - scan = temp; - } - - if (OP(scan) == BACK) - offset = (int) (scan - val); - else - offset = (int) (val - scan); - *(scan+1) = (offset>>8)&0377; - *(scan+2) = offset&0377; + register char *scan; + register char *temp; + register int offset; + + if (p == ®dummy) + return; + + /* Find last node. */ + scan = p; + for (;;) { + temp = regnext(scan); + if (temp == NULL) + break; + scan = temp; + } + + if (OP(scan) == BACK) + offset = (int) (scan - val); + else + offset = (int) (val - scan); + *(scan+1) = (offset>>8)&0377; + *(scan+2) = offset&0377; } /* @@ -688,10 +688,10 @@ regoptail(p, val) char *p; char *val; { - /* "Operandless" and "op != BRANCH" are synonymous in practice. */ - if (p == NULL || p == ®dummy || OP(p) != BRANCH) - return; - regtail(OPERAND(p), val); + /* "Operandless" and "op != BRANCH" are synonymous in practice. */ + if (p == NULL || p == ®dummy || OP(p) != BRANCH) + return; + regtail(OPERAND(p), val); } /* @@ -701,10 +701,10 @@ char *val; /* * Global work variables for regexec(). */ -static char *reginput; /* String-input pointer. */ -static char *regbol; /* Beginning of input, for ^ check. */ -static char **regstartp; /* Pointer to startp array. */ -static char **regendp; /* Ditto for endp. */ +static char *reginput; /* String-input pointer. */ +static char *regbol; /* Beginning of input, for ^ check. */ +static char **regstartp; /* Pointer to startp array. */ +static char **regendp; /* Ditto for endp. */ /* * Forwards. @@ -728,60 +728,60 @@ register regexp *prog; register char *string; int notbol; { - register char *s; - - /* Be paranoid... */ - if (prog == NULL || string == NULL) { - regerror("NULL parameter"); - return(0); - } - - /* Check validity of program. */ - if (UCHARAT(prog->program) != MAGIC) { - regerror("corrupted program"); - return(0); - } - - /* If there is a "must appear" string, look for it. */ - if (prog->regmust != NULL) { - s = string; - while ((s = strchr(s, prog->regmust[0])) != NULL) { - if (strncmp(s, prog->regmust, prog->regmlen) == 0) - break; /* Found it. */ - s++; - } - if (s == NULL) /* Not present. */ - return(0); - } - - /* Mark beginning of line for ^ . */ - if (notbol) - regbol = NULL; - else - regbol = string; - - /* Simplest case: anchored match need be tried only once. */ - if (prog->reganch) - return(regtry(prog, string)); - - /* Messy cases: unanchored match. */ - s = string; - if (prog->regstart != '\0') - /* We know what char it must start with. */ - while ((s = strchr(s, prog->regstart)) != NULL) { - if (regtry(prog, s)) - return(1); - s++; - } - else - /* We don't -- general case. */ - do { - if (regtry(prog, s)) - return(1); - } while (*s++ != '\0'); - - /* Failure. */ - return(0); + register char *s; + + /* Be paranoid... */ + if (prog == NULL || string == NULL) { + regerror("NULL parameter"); + return(0); + } + + /* Check validity of program. */ + if (UCHARAT(prog->program) != MAGIC) { + regerror("corrupted program"); + return(0); + } + + /* If there is a "must appear" string, look for it. */ + if (prog->regmust != NULL) { + s = string; + while ((s = strchr(s, prog->regmust[0])) != NULL) { + if (strncmp(s, prog->regmust, prog->regmlen) == 0) + break; /* Found it. */ + s++; + } + if (s == NULL) /* Not present. */ + return(0); + } + + /* Mark beginning of line for ^ . */ + if (notbol) + regbol = NULL; + else + regbol = string; + + /* Simplest case: anchored match need be tried only once. */ + if (prog->reganch) + return(regtry(prog, string)); + + /* Messy cases: unanchored match. */ + s = string; + if (prog->regstart != '\0') + /* We know what char it must start with. */ + while ((s = strchr(s, prog->regstart)) != NULL) { + if (regtry(prog, s)) + return(1); + s++; + } + else + /* We don't -- general case. */ + do { + if (regtry(prog, s)) + return(1); + } while (*s++ != '\0'); + + /* Failure. */ + return(0); } int @@ -789,37 +789,37 @@ regexec(prog, string) register regexp *prog; register char *string; { - return regexec2(prog, string, 0); + return regexec2(prog, string, 0); } /* - regtry - try match at specific point */ -static int /* 0 failure, 1 success */ +static int /* 0 failure, 1 success */ regtry(prog, string) regexp *prog; char *string; { - register int i; - register char **sp; - register char **ep; - - reginput = string; - regstartp = prog->startp; - regendp = prog->endp; - - sp = prog->startp; - ep = prog->endp; - for (i = NSUBEXP; i > 0; i--) { - *sp++ = NULL; - *ep++ = NULL; - } - if (regmatch(prog->program + 1)) { - prog->startp[0] = string; - prog->endp[0] = reginput; - return(1); - } else - return(0); + register int i; + register char **sp; + register char **ep; + + reginput = string; + regstartp = prog->startp; + regendp = prog->endp; + + sp = prog->startp; + ep = prog->endp; + for (i = NSUBEXP; i > 0; i--) { + *sp++ = NULL; + *ep++ = NULL; + } + if (regmatch(prog->program + 1)) { + prog->startp[0] = string; + prog->endp[0] = reginput; + return(1); + } else + return(0); } /* @@ -832,194 +832,194 @@ char *string; * need to know whether the rest of the match failed) by a loop instead of * by recursion. */ -static int /* 0 failure, 1 success */ +static int /* 0 failure, 1 success */ regmatch(prog) char *prog; { - register char *scan; /* Current node. */ - char *next; /* Next node. */ + register char *scan; /* Current node. */ + char *next; /* Next node. */ - scan = prog; + scan = prog; #ifdef DEBUG - if (scan != NULL && regnarrate) - fprintf(stderr, "%s(\n", regprop(scan)); + if (scan != NULL && regnarrate) + fprintf(stderr, "%s(\n", regprop(scan)); #endif - while (scan != NULL) { + while (scan != NULL) { #ifdef DEBUG - if (regnarrate) - fprintf(stderr, "%s...\n", regprop(scan)); + if (regnarrate) + fprintf(stderr, "%s...\n", regprop(scan)); #endif - next = regnext(scan); - - switch (OP(scan)) { - case BOL: - if (reginput != regbol) - return(0); - break; - case EOL: - if (*reginput != '\0') - return(0); - break; - case ANY: - if (*reginput == '\0') - return(0); - reginput++; - break; - case EXACTLY: { - register int len; - register char *opnd; - - opnd = OPERAND(scan); - /* Inline the first character, for speed. */ - if (*opnd != *reginput) - return(0); - len = (int) strlen(opnd); - if (len > 1 && strncmp(opnd, reginput, len) != 0) - return(0); - reginput += len; - } - break; - case ANYOF: - if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL) - return(0); - reginput++; - break; - case ANYBUT: - if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL) - return(0); - reginput++; - break; - case NOTHING: - break; - case BACK: - break; - case OPEN+1: - case OPEN+2: - case OPEN+3: - case OPEN+4: - case OPEN+5: - case OPEN+6: - case OPEN+7: - case OPEN+8: - case OPEN+9: { - register int no; - register char *save; - - no = OP(scan) - OPEN; - save = reginput; - - if (regmatch(next)) { - /* - * Don't set startp if some later - * invocation of the same parentheses - * already has. - */ - if (regstartp[no] == NULL) - regstartp[no] = save; - return(1); - } else - return(0); - } - /* NOTREACHED */ - break; - case CLOSE+1: - case CLOSE+2: - case CLOSE+3: - case CLOSE+4: - case CLOSE+5: - case CLOSE+6: - case CLOSE+7: - case CLOSE+8: - case CLOSE+9: { - register int no; - register char *save; - - no = OP(scan) - CLOSE; - save = reginput; - - if (regmatch(next)) { - /* - * Don't set endp if some later - * invocation of the same parentheses - * already has. - */ - if (regendp[no] == NULL) - regendp[no] = save; - return(1); - } else - return(0); - } - /* NOTREACHED */ - break; - case BRANCH: { - register char *save; - - if (OP(next) != BRANCH) /* No choice. */ - next = OPERAND(scan); /* Avoid recursion. */ - else { - do { - save = reginput; - if (regmatch(OPERAND(scan))) - return(1); - reginput = save; - scan = regnext(scan); - } while (scan != NULL && OP(scan) == BRANCH); - return(0); - /* NOTREACHED */ - } - } - /* NOTREACHED */ - break; - case STAR: - case PLUS: { - register char nextch; - register int no; - register char *save; - register int min; - - /* - * Lookahead to avoid useless match attempts - * when we know what character comes next. - */ - nextch = '\0'; - if (OP(next) == EXACTLY) - nextch = *OPERAND(next); - min = (OP(scan) == STAR) ? 0 : 1; - save = reginput; - no = regrepeat(OPERAND(scan)); - while (no >= min) { - /* If it could work, try it. */ - if (nextch == '\0' || *reginput == nextch) - if (regmatch(next)) - return(1); - /* Couldn't or didn't -- back up. */ - no--; - reginput = save + no; - } - return(0); - } - /* NOTREACHED */ - break; - case END: - return(1); /* Success! */ - /* NOTREACHED */ - break; - default: - regerror("memory corruption"); - return(0); - /* NOTREACHED */ - break; - } - - scan = next; - } - - /* - * We get here only if there's trouble -- normally "case END" is - * the terminating point. - */ - regerror("corrupted pointers"); - return(0); + next = regnext(scan); + + switch (OP(scan)) { + case BOL: + if (reginput != regbol) + return(0); + break; + case EOL: + if (*reginput != '\0') + return(0); + break; + case ANY: + if (*reginput == '\0') + return(0); + reginput++; + break; + case EXACTLY: { + register int len; + register char *opnd; + + opnd = OPERAND(scan); + /* Inline the first character, for speed. */ + if (*opnd != *reginput) + return(0); + len = (int) strlen(opnd); + if (len > 1 && strncmp(opnd, reginput, len) != 0) + return(0); + reginput += len; + } + break; + case ANYOF: + if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL) + return(0); + reginput++; + break; + case ANYBUT: + if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL) + return(0); + reginput++; + break; + case NOTHING: + break; + case BACK: + break; + case OPEN+1: + case OPEN+2: + case OPEN+3: + case OPEN+4: + case OPEN+5: + case OPEN+6: + case OPEN+7: + case OPEN+8: + case OPEN+9: { + register int no; + register char *save; + + no = OP(scan) - OPEN; + save = reginput; + + if (regmatch(next)) { + /* + * Don't set startp if some later + * invocation of the same parentheses + * already has. + */ + if (regstartp[no] == NULL) + regstartp[no] = save; + return(1); + } else + return(0); + } + /* NOTREACHED */ + break; + case CLOSE+1: + case CLOSE+2: + case CLOSE+3: + case CLOSE+4: + case CLOSE+5: + case CLOSE+6: + case CLOSE+7: + case CLOSE+8: + case CLOSE+9: { + register int no; + register char *save; + + no = OP(scan) - CLOSE; + save = reginput; + + if (regmatch(next)) { + /* + * Don't set endp if some later + * invocation of the same parentheses + * already has. + */ + if (regendp[no] == NULL) + regendp[no] = save; + return(1); + } else + return(0); + } + /* NOTREACHED */ + break; + case BRANCH: { + register char *save; + + if (OP(next) != BRANCH) /* No choice. */ + next = OPERAND(scan); /* Avoid recursion. */ + else { + do { + save = reginput; + if (regmatch(OPERAND(scan))) + return(1); + reginput = save; + scan = regnext(scan); + } while (scan != NULL && OP(scan) == BRANCH); + return(0); + /* NOTREACHED */ + } + } + /* NOTREACHED */ + break; + case STAR: + case PLUS: { + register char nextch; + register int no; + register char *save; + register int min; + + /* + * Lookahead to avoid useless match attempts + * when we know what character comes next. + */ + nextch = '\0'; + if (OP(next) == EXACTLY) + nextch = *OPERAND(next); + min = (OP(scan) == STAR) ? 0 : 1; + save = reginput; + no = regrepeat(OPERAND(scan)); + while (no >= min) { + /* If it could work, try it. */ + if (nextch == '\0' || *reginput == nextch) + if (regmatch(next)) + return(1); + /* Couldn't or didn't -- back up. */ + no--; + reginput = save + no; + } + return(0); + } + /* NOTREACHED */ + break; + case END: + return(1); /* Success! */ + /* NOTREACHED */ + break; + default: + regerror("memory corruption"); + return(0); + /* NOTREACHED */ + break; + } + + scan = next; + } + + /* + * We get here only if there's trouble -- normally "case END" is + * the terminating point. + */ + regerror("corrupted pointers"); + return(0); } /* @@ -1029,43 +1029,43 @@ static int regrepeat(p) char *p; { - register int count = 0; - register char *scan; - register char *opnd; - - scan = reginput; - opnd = OPERAND(p); - switch (OP(p)) { - case ANY: - count = (int) strlen(scan); - scan += count; - break; - case EXACTLY: - while (*opnd == *scan) { - count++; - scan++; - } - break; - case ANYOF: - while (*scan != '\0' && strchr(opnd, *scan) != NULL) { - count++; - scan++; - } - break; - case ANYBUT: - while (*scan != '\0' && strchr(opnd, *scan) == NULL) { - count++; - scan++; - } - break; - default: /* Oh dear. Called inappropriately. */ - regerror("internal foulup"); - count = 0; /* Best compromise. */ - break; - } - reginput = scan; - - return(count); + register int count = 0; + register char *scan; + register char *opnd; + + scan = reginput; + opnd = OPERAND(p); + switch (OP(p)) { + case ANY: + count = (int) strlen(scan); + scan += count; + break; + case EXACTLY: + while (*opnd == *scan) { + count++; + scan++; + } + break; + case ANYOF: + while (*scan != '\0' && strchr(opnd, *scan) != NULL) { + count++; + scan++; + } + break; + case ANYBUT: + while (*scan != '\0' && strchr(opnd, *scan) == NULL) { + count++; + scan++; + } + break; + default: /* Oh dear. Called inappropriately. */ + regerror("internal foulup"); + count = 0; /* Best compromise. */ + break; + } + reginput = scan; + + return(count); } /* @@ -1075,19 +1075,19 @@ static char * regnext(p) register char *p; { - register int offset; + register int offset; - if (p == ®dummy) - return(NULL); + if (p == ®dummy) + return(NULL); - offset = NEXT(p); - if (offset == 0) - return(NULL); + offset = NEXT(p); + if (offset == 0) + return(NULL); - if (OP(p) == BACK) - return(p-offset); - else - return(p+offset); + if (OP(p) == BACK) + return(p-offset); + else + return(p+offset); } #ifdef DEBUG @@ -1101,40 +1101,40 @@ void regdump(r) regexp *r; { - register char *s; - register char op = EXACTLY; /* Arbitrary non-END op. */ - register char *next; - - - s = r->program + 1; - while (op != END) { /* While that wasn't END last time... */ - op = OP(s); - printf("%2d%s", s-r->program, regprop(s)); /* Where, what. */ - next = regnext(s); - if (next == NULL) /* Next ptr. */ - printf("(0)"); - else - printf("(%d)", (s-r->program)+(next-s)); - s += 3; - if (op == ANYOF || op == ANYBUT || op == EXACTLY) { - /* Literal string, where present. */ - while (*s != '\0') { - putchar(*s); - s++; - } - s++; - } - putchar('\n'); - } - - /* Header fields of interest. */ - if (r->regstart != '\0') - printf("start `%c' ", r->regstart); - if (r->reganch) - printf("anchored "); - if (r->regmust != NULL) - printf("must have \"%s\"", r->regmust); - printf("\n"); + register char *s; + register char op = EXACTLY; /* Arbitrary non-END op. */ + register char *next; + + + s = r->program + 1; + while (op != END) { /* While that wasn't END last time... */ + op = OP(s); + printf("%2d%s", s-r->program, regprop(s)); /* Where, what. */ + next = regnext(s); + if (next == NULL) /* Next ptr. */ + printf("(0)"); + else + printf("(%d)", (s-r->program)+(next-s)); + s += 3; + if (op == ANYOF || op == ANYBUT || op == EXACTLY) { + /* Literal string, where present. */ + while (*s != '\0') { + putchar(*s); + s++; + } + s++; + } + putchar('\n'); + } + + /* Header fields of interest. */ + if (r->regstart != '\0') + printf("start `%c' ", r->regstart); + if (r->reganch) + printf("anchored "); + if (r->regmust != NULL) + printf("must have \"%s\"", r->regmust); + printf("\n"); } /* @@ -1144,79 +1144,79 @@ static char * regprop(op) char *op; { - register char *p; - static char buf[50]; - - (void) strcpy(buf, ":"); - - switch (OP(op)) { - case BOL: - p = "BOL"; - break; - case EOL: - p = "EOL"; - break; - case ANY: - p = "ANY"; - break; - case ANYOF: - p = "ANYOF"; - break; - case ANYBUT: - p = "ANYBUT"; - break; - case BRANCH: - p = "BRANCH"; - break; - case EXACTLY: - p = "EXACTLY"; - break; - case NOTHING: - p = "NOTHING"; - break; - case BACK: - p = "BACK"; - break; - case END: - p = "END"; - break; - case OPEN+1: - case OPEN+2: - case OPEN+3: - case OPEN+4: - case OPEN+5: - case OPEN+6: - case OPEN+7: - case OPEN+8: - case OPEN+9: - sprintf(buf+strlen(buf), "OPEN%d", OP(op)-OPEN); - p = NULL; - break; - case CLOSE+1: - case CLOSE+2: - case CLOSE+3: - case CLOSE+4: - case CLOSE+5: - case CLOSE+6: - case CLOSE+7: - case CLOSE+8: - case CLOSE+9: - sprintf(buf+strlen(buf), "CLOSE%d", OP(op)-CLOSE); - p = NULL; - break; - case STAR: - p = "STAR"; - break; - case PLUS: - p = "PLUS"; - break; - default: - regerror("corrupted opcode"); - break; - } - if (p != NULL) - (void) strcat(buf, p); - return(buf); + register char *p; + static char buf[50]; + + (void) strcpy(buf, ":"); + + switch (OP(op)) { + case BOL: + p = "BOL"; + break; + case EOL: + p = "EOL"; + break; + case ANY: + p = "ANY"; + break; + case ANYOF: + p = "ANYOF"; + break; + case ANYBUT: + p = "ANYBUT"; + break; + case BRANCH: + p = "BRANCH"; + break; + case EXACTLY: + p = "EXACTLY"; + break; + case NOTHING: + p = "NOTHING"; + break; + case BACK: + p = "BACK"; + break; + case END: + p = "END"; + break; + case OPEN+1: + case OPEN+2: + case OPEN+3: + case OPEN+4: + case OPEN+5: + case OPEN+6: + case OPEN+7: + case OPEN+8: + case OPEN+9: + sprintf(buf+strlen(buf), "OPEN%d", OP(op)-OPEN); + p = NULL; + break; + case CLOSE+1: + case CLOSE+2: + case CLOSE+3: + case CLOSE+4: + case CLOSE+5: + case CLOSE+6: + case CLOSE+7: + case CLOSE+8: + case CLOSE+9: + sprintf(buf+strlen(buf), "CLOSE%d", OP(op)-CLOSE); + p = NULL; + break; + case STAR: + p = "STAR"; + break; + case PLUS: + p = "PLUS"; + break; + default: + regerror("corrupted opcode"); + break; + } + if (p != NULL) + (void) strcat(buf, p); + return(buf); } #endif @@ -1237,17 +1237,17 @@ strcspn(s1, s2) char *s1; char *s2; { - register char *scan1; - register char *scan2; - register int count; - - count = 0; - for (scan1 = s1; *scan1 != '\0'; scan1++) { - for (scan2 = s2; *scan2 != '\0';) /* ++ moved down. */ - if (*scan1 == *scan2++) - return(count); - count++; - } - return(count); + register char *scan1; + register char *scan2; + register int count; + + count = 0; + for (scan1 = s1; *scan1 != '\0'; scan1++) { + for (scan2 = s2; *scan2 != '\0';) /* ++ moved down. */ + if (*scan1 == *scan2++) + return(count); + count++; + } + return(count); } #endif diff --git a/screen.c b/screen.c index 7c903ab..667936d 100644 --- a/screen.c +++ b/screen.c @@ -36,13 +36,13 @@ extern int fd0; #include #ifndef FOREGROUND_BLUE -#define FOREGROUND_BLUE 0x0001 +#define FOREGROUND_BLUE 0x0001 #endif #ifndef FOREGROUND_GREEN -#define FOREGROUND_GREEN 0x0002 +#define FOREGROUND_GREEN 0x0002 #endif #ifndef FOREGROUND_RED -#define FOREGROUND_RED 0x0004 +#define FOREGROUND_RED 0x0004 #endif #ifndef FOREGROUND_INTENSITY #define FOREGROUND_INTENSITY 0x0008 @@ -131,9 +131,9 @@ extern int sc_height; #define UTF8_MAX_LENGTH 4 struct keyRecord { - WCHAR unicode; - int ascii; - int scan; + WCHAR unicode; + int ascii; + int scan; } currentKey; static int keyCount = 0; @@ -189,31 +189,31 @@ public int vt_enabled = -1; /* Is virtual terminal processing available? */ * Strings passed to tputs() to do various terminal functions. */ static char - *sc_pad, /* Pad string */ - *sc_home, /* Cursor home */ - *sc_addline, /* Add line, scroll down following lines */ - *sc_lower_left, /* Cursor to last line, first column */ - *sc_return, /* Cursor to beginning of current line */ - *sc_move, /* General cursor positioning */ - *sc_clear, /* Clear screen */ - *sc_eol_clear, /* Clear to end of line */ - *sc_eos_clear, /* Clear to end of screen */ - *sc_s_in, /* Enter standout (highlighted) mode */ - *sc_s_out, /* Exit standout mode */ - *sc_u_in, /* Enter underline mode */ - *sc_u_out, /* Exit underline mode */ - *sc_b_in, /* Enter bold mode */ - *sc_b_out, /* Exit bold mode */ - *sc_bl_in, /* Enter blink mode */ - *sc_bl_out, /* Exit blink mode */ - *sc_visual_bell, /* Visual bell (flash screen) sequence */ - *sc_backspace, /* Backspace cursor */ - *sc_s_keypad, /* Start keypad mode */ - *sc_e_keypad, /* End keypad mode */ - *sc_s_mousecap, /* Start mouse capture mode */ - *sc_e_mousecap, /* End mouse capture mode */ - *sc_init, /* Startup terminal initialization */ - *sc_deinit; /* Exit terminal de-initialization */ + *sc_pad, /* Pad string */ + *sc_home, /* Cursor home */ + *sc_addline, /* Add line, scroll down following lines */ + *sc_lower_left, /* Cursor to last line, first column */ + *sc_return, /* Cursor to beginning of current line */ + *sc_move, /* General cursor positioning */ + *sc_clear, /* Clear screen */ + *sc_eol_clear, /* Clear to end of line */ + *sc_eos_clear, /* Clear to end of screen */ + *sc_s_in, /* Enter standout (highlighted) mode */ + *sc_s_out, /* Exit standout mode */ + *sc_u_in, /* Enter underline mode */ + *sc_u_out, /* Exit underline mode */ + *sc_b_in, /* Enter bold mode */ + *sc_b_out, /* Exit bold mode */ + *sc_bl_in, /* Enter blink mode */ + *sc_bl_out, /* Exit blink mode */ + *sc_visual_bell, /* Visual bell (flash screen) sequence */ + *sc_backspace, /* Backspace cursor */ + *sc_s_keypad, /* Start keypad mode */ + *sc_e_keypad, /* End keypad mode */ + *sc_s_mousecap, /* Start mouse capture mode */ + *sc_e_mousecap, /* End mouse capture mode */ + *sc_init, /* Startup terminal initialization */ + *sc_deinit; /* Exit terminal de-initialization */ static int attrcolor = -1; #endif @@ -299,372 +299,372 @@ extern char *tgoto(); /* * Change terminal to "raw mode", or restore to "normal" mode. - * "Raw mode" means + * "Raw mode" means * 1. An outstanding read will complete on receipt of a single keystroke. - * 2. Input is not echoed. + * 2. Input is not echoed. * 3. On output, \n is mapped to \r\n. * 4. \t is NOT expanded into spaces. * 5. Signal-causing characters such as ctrl-C (interrupt), * etc. are NOT disabled. * It doesn't matter whether an input \n is mapped to \r, or vice versa. */ - public void + public void raw_mode(on) - int on; + int on; { - static int curr_on = 0; + static int curr_on = 0; - if (on == curr_on) - return; - erase2_char = '\b'; /* in case OS doesn't know about erase2 */ + if (on == curr_on) + return; + erase2_char = '\b'; /* in case OS doesn't know about erase2 */ #if HAVE_TERMIOS_H && HAVE_TERMIOS_FUNCS { - struct termios s; - static struct termios save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - tcgetattr(tty, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } + struct termios s; + static struct termios save_term; + static int saved_term = 0; + + if (on) + { + /* + * Get terminal modes. + */ + tcgetattr(tty, &s); + + /* + * Save modes and set certain variables dependent on modes. + */ + if (!saved_term) + { + save_term = s; + saved_term = 1; + } #if HAVE_OSPEED - switch (cfgetospeed(&s)) - { + switch (cfgetospeed(&s)) + { #ifdef B0 - case B0: ospeed = 0; break; + case B0: ospeed = 0; break; #endif #ifdef B50 - case B50: ospeed = 1; break; + case B50: ospeed = 1; break; #endif #ifdef B75 - case B75: ospeed = 2; break; + case B75: ospeed = 2; break; #endif #ifdef B110 - case B110: ospeed = 3; break; + case B110: ospeed = 3; break; #endif #ifdef B134 - case B134: ospeed = 4; break; + case B134: ospeed = 4; break; #endif #ifdef B150 - case B150: ospeed = 5; break; + case B150: ospeed = 5; break; #endif #ifdef B200 - case B200: ospeed = 6; break; + case B200: ospeed = 6; break; #endif #ifdef B300 - case B300: ospeed = 7; break; + case B300: ospeed = 7; break; #endif #ifdef B600 - case B600: ospeed = 8; break; + case B600: ospeed = 8; break; #endif #ifdef B1200 - case B1200: ospeed = 9; break; + case B1200: ospeed = 9; break; #endif #ifdef B1800 - case B1800: ospeed = 10; break; + case B1800: ospeed = 10; break; #endif #ifdef B2400 - case B2400: ospeed = 11; break; + case B2400: ospeed = 11; break; #endif #ifdef B4800 - case B4800: ospeed = 12; break; + case B4800: ospeed = 12; break; #endif #ifdef B9600 - case B9600: ospeed = 13; break; + case B9600: ospeed = 13; break; #endif #ifdef EXTA - case EXTA: ospeed = 14; break; + case EXTA: ospeed = 14; break; #endif #ifdef EXTB - case EXTB: ospeed = 15; break; + case EXTB: ospeed = 15; break; #endif #ifdef B57600 - case B57600: ospeed = 16; break; + case B57600: ospeed = 16; break; #endif #ifdef B115200 - case B115200: ospeed = 17; break; + case B115200: ospeed = 17; break; #endif - default: ; - } + default: ; + } #endif - erase_char = s.c_cc[VERASE]; + erase_char = s.c_cc[VERASE]; #ifdef VERASE2 - erase2_char = s.c_cc[VERASE2]; + erase2_char = s.c_cc[VERASE2]; #endif - kill_char = s.c_cc[VKILL]; + kill_char = s.c_cc[VKILL]; #ifdef VWERASE - werase_char = s.c_cc[VWERASE]; + werase_char = s.c_cc[VWERASE]; #else - werase_char = CONTROL('W'); + werase_char = CONTROL('W'); #endif - /* - * Set the modes to the way we want them. - */ - s.c_lflag &= ~(0 + /* + * Set the modes to the way we want them. + */ + s.c_lflag &= ~(0 #ifdef ICANON - | ICANON + | ICANON #endif #ifdef ECHO - | ECHO + | ECHO #endif #ifdef ECHOE - | ECHOE + | ECHOE #endif #ifdef ECHOK - | ECHOK + | ECHOK #endif #if ECHONL - | ECHONL + | ECHONL #endif - ); + ); - s.c_oflag |= (0 + s.c_oflag |= (0 #ifdef OXTABS - | OXTABS + | OXTABS #else #ifdef TAB3 - | TAB3 + | TAB3 #else #ifdef XTABS - | XTABS + | XTABS #endif #endif #endif #ifdef OPOST - | OPOST + | OPOST #endif #ifdef ONLCR - | ONLCR + | ONLCR #endif - ); + ); - s.c_oflag &= ~(0 + s.c_oflag &= ~(0 #ifdef ONOEOT - | ONOEOT + | ONOEOT #endif #ifdef OCRNL - | OCRNL + | OCRNL #endif #ifdef ONOCR - | ONOCR + | ONOCR #endif #ifdef ONLRET - | ONLRET + | ONLRET #endif - ); - s.c_cc[VMIN] = 1; - s.c_cc[VTIME] = 0; + ); + s.c_cc[VMIN] = 1; + s.c_cc[VTIME] = 0; #ifdef VLNEXT - s.c_cc[VLNEXT] = 0; + s.c_cc[VLNEXT] = 0; #endif #ifdef VDSUSP - s.c_cc[VDSUSP] = 0; + s.c_cc[VDSUSP] = 0; #endif #if MUST_SET_LINE_DISCIPLINE - /* - * System's termios is broken; need to explicitly - * request TERMIODISC line discipline. - */ - s.c_line = TERMIODISC; -#endif - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } + /* + * System's termios is broken; need to explicitly + * request TERMIODISC line discipline. + */ + s.c_line = TERMIODISC; +#endif + } else + { + /* + * Restore saved modes. + */ + s = save_term; + } #if HAVE_FSYNC - fsync(tty); + fsync(tty); #endif - tcsetattr(tty, TCSADRAIN, &s); + tcsetattr(tty, TCSADRAIN, &s); #if MUST_SET_LINE_DISCIPLINE - if (!on) - { - /* - * Broken termios *ignores* any line discipline - * except TERMIODISC. A different old line discipline - * is therefore not restored, yet. Restore the old - * line discipline by hand. - */ - ioctl(tty, TIOCSETD, &save_term.c_line); - } + if (!on) + { + /* + * Broken termios *ignores* any line discipline + * except TERMIODISC. A different old line discipline + * is therefore not restored, yet. Restore the old + * line discipline by hand. + */ + ioctl(tty, TIOCSETD, &save_term.c_line); + } #endif } #else #ifdef TCGETA { - struct termio s; - static struct termio save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - ioctl(tty, TCGETA, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } + struct termio s; + static struct termio save_term; + static int saved_term = 0; + + if (on) + { + /* + * Get terminal modes. + */ + ioctl(tty, TCGETA, &s); + + /* + * Save modes and set certain variables dependent on modes. + */ + if (!saved_term) + { + save_term = s; + saved_term = 1; + } #if HAVE_OSPEED - ospeed = s.c_cflag & CBAUD; + ospeed = s.c_cflag & CBAUD; #endif - erase_char = s.c_cc[VERASE]; - kill_char = s.c_cc[VKILL]; + erase_char = s.c_cc[VERASE]; + kill_char = s.c_cc[VKILL]; #ifdef VWERASE - werase_char = s.c_cc[VWERASE]; + werase_char = s.c_cc[VWERASE]; #else - werase_char = CONTROL('W'); -#endif - - /* - * Set the modes to the way we want them. - */ - s.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL); - s.c_oflag |= (OPOST|ONLCR|TAB3); - s.c_oflag &= ~(OCRNL|ONOCR|ONLRET); - s.c_cc[VMIN] = 1; - s.c_cc[VTIME] = 0; - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } - ioctl(tty, TCSETAW, &s); + werase_char = CONTROL('W'); +#endif + + /* + * Set the modes to the way we want them. + */ + s.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL); + s.c_oflag |= (OPOST|ONLCR|TAB3); + s.c_oflag &= ~(OCRNL|ONOCR|ONLRET); + s.c_cc[VMIN] = 1; + s.c_cc[VTIME] = 0; + } else + { + /* + * Restore saved modes. + */ + s = save_term; + } + ioctl(tty, TCSETAW, &s); } #else #ifdef TIOCGETP { - struct sgttyb s; - static struct sgttyb save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - ioctl(tty, TIOCGETP, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } + struct sgttyb s; + static struct sgttyb save_term; + static int saved_term = 0; + + if (on) + { + /* + * Get terminal modes. + */ + ioctl(tty, TIOCGETP, &s); + + /* + * Save modes and set certain variables dependent on modes. + */ + if (!saved_term) + { + save_term = s; + saved_term = 1; + } #if HAVE_OSPEED - ospeed = s.sg_ospeed; -#endif - erase_char = s.sg_erase; - kill_char = s.sg_kill; - werase_char = CONTROL('W'); - - /* - * Set the modes to the way we want them. - */ - s.sg_flags |= CBREAK; - s.sg_flags &= ~(ECHO|XTABS); - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } - ioctl(tty, TIOCSETN, &s); + ospeed = s.sg_ospeed; +#endif + erase_char = s.sg_erase; + kill_char = s.sg_kill; + werase_char = CONTROL('W'); + + /* + * Set the modes to the way we want them. + */ + s.sg_flags |= CBREAK; + s.sg_flags &= ~(ECHO|XTABS); + } else + { + /* + * Restore saved modes. + */ + s = save_term; + } + ioctl(tty, TIOCSETN, &s); } #else #ifdef _OSK { - struct sgbuf s; - static struct sgbuf save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - _gs_opt(tty, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } - erase_char = s.sg_bspch; - kill_char = s.sg_dlnch; - werase_char = CONTROL('W'); - - /* - * Set the modes to the way we want them. - */ - s.sg_echo = 0; - s.sg_eofch = 0; - s.sg_pause = 0; - s.sg_psch = 0; - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } - _ss_opt(tty, &s); + struct sgbuf s; + static struct sgbuf save_term; + static int saved_term = 0; + + if (on) + { + /* + * Get terminal modes. + */ + _gs_opt(tty, &s); + + /* + * Save modes and set certain variables dependent on modes. + */ + if (!saved_term) + { + save_term = s; + saved_term = 1; + } + erase_char = s.sg_bspch; + kill_char = s.sg_dlnch; + werase_char = CONTROL('W'); + + /* + * Set the modes to the way we want them. + */ + s.sg_echo = 0; + s.sg_eofch = 0; + s.sg_pause = 0; + s.sg_psch = 0; + } else + { + /* + * Restore saved modes. + */ + s = save_term; + } + _ss_opt(tty, &s); } #else - /* MS-DOS, Windows, or OS2 */ + /* MS-DOS, Windows, or OS2 */ #if OS2 - /* OS2 */ - LSIGNAL(SIGINT, SIG_IGN); + /* OS2 */ + LSIGNAL(SIGINT, SIG_IGN); #endif - erase_char = '\b'; + erase_char = '\b'; #if MSDOS_COMPILER==DJGPPC - kill_char = CONTROL('U'); - /* - * So that when we shell out or run another program, its - * stdin is in cooked mode. We do not switch stdin to binary - * mode if fd0 is zero, since that means we were called before - * tty was reopened in open_getchr, in which case we would be - * changing the original stdin device outside less. - */ - if (fd0 != 0) - setmode(0, on ? O_BINARY : O_TEXT); + kill_char = CONTROL('U'); + /* + * So that when we shell out or run another program, its + * stdin is in cooked mode. We do not switch stdin to binary + * mode if fd0 is zero, since that means we were called before + * tty was reopened in open_getchr, in which case we would be + * changing the original stdin device outside less. + */ + if (fd0 != 0) + setmode(0, on ? O_BINARY : O_TEXT); #else - kill_char = ESC; + kill_char = ESC; #endif - werase_char = CONTROL('W'); + werase_char = CONTROL('W'); #endif #endif #endif #endif - curr_on = on; + curr_on = on; } #if !MSDOS_COMPILER @@ -673,84 +673,84 @@ raw_mode(on) */ static int hardcopy; - static char * + static char * ltget_env(capname) - char *capname; -{ - char name[64]; - - if (termcap_debug) - { - struct env { struct env *next; char *name; char *value; }; - static struct env *envs = NULL; - struct env *p; - for (p = envs; p != NULL; p = p->next) - if (strcmp(p->name, capname) == 0) - return p->value; - p = (struct env *) ecalloc(1, sizeof(struct env)); - p->name = save(capname); - p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char)); - sprintf(p->value, "<%s>", capname); - p->next = envs; - envs = p; - return p->value; - } - SNPRINTF1(name, sizeof(name), "LESS_TERMCAP_%s", capname); - return (lgetenv(name)); -} - - static int + char *capname; +{ + char name[64]; + + if (termcap_debug) + { + struct env { struct env *next; char *name; char *value; }; + static struct env *envs = NULL; + struct env *p; + for (p = envs; p != NULL; p = p->next) + if (strcmp(p->name, capname) == 0) + return p->value; + p = (struct env *) ecalloc(1, sizeof(struct env)); + p->name = save(capname); + p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char)); + sprintf(p->value, "<%s>", capname); + p->next = envs; + envs = p; + return p->value; + } + SNPRINTF1(name, sizeof(name), "LESS_TERMCAP_%s", capname); + return (lgetenv(name)); +} + + static int ltgetflag(capname) - char *capname; + char *capname; { - char *s; + char *s; - if ((s = ltget_env(capname)) != NULL) - return (*s != '\0' && *s != '0'); - if (hardcopy) - return (0); - return (tgetflag(capname)); + if ((s = ltget_env(capname)) != NULL) + return (*s != '\0' && *s != '0'); + if (hardcopy) + return (0); + return (tgetflag(capname)); } - static int + static int ltgetnum(capname) - char *capname; + char *capname; { - char *s; + char *s; - if ((s = ltget_env(capname)) != NULL) - return (atoi(s)); - if (hardcopy) - return (-1); - return (tgetnum(capname)); + if ((s = ltget_env(capname)) != NULL) + return (atoi(s)); + if (hardcopy) + return (-1); + return (tgetnum(capname)); } - static char * + static char * ltgetstr(capname, pp) - char *capname; - char **pp; + char *capname; + char **pp; { - char *s; + char *s; - if ((s = ltget_env(capname)) != NULL) - return (s); - if (hardcopy) - return (NULL); - return (tgetstr(capname, pp)); + if ((s = ltget_env(capname)) != NULL) + return (s); + if (hardcopy) + return (NULL); + return (tgetstr(capname, pp)); } #endif /* MSDOS_COMPILER */ /* * Get size of the output screen. */ - public void + public void scrsize(VOID_PARAM) { - char *s; - int sys_height; - int sys_width; + char *s; + int sys_height; + int sys_width; #if !MSDOS_COMPILER - int n; + int n; #endif #define DEF_SC_WIDTH 80 @@ -761,84 +761,84 @@ scrsize(VOID_PARAM) #endif - sys_width = sys_height = 0; + sys_width = sys_height = 0; #if MSDOS_COMPILER==MSOFTC - { - struct videoconfig w; - _getvideoconfig(&w); - sys_height = w.numtextrows; - sys_width = w.numtextcols; - } + { + struct videoconfig w; + _getvideoconfig(&w); + sys_height = w.numtextrows; + sys_width = w.numtextcols; + } #else #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - { - struct text_info w; - gettextinfo(&w); - sys_height = w.screenheight; - sys_width = w.screenwidth; - } + { + struct text_info w; + gettextinfo(&w); + sys_height = w.screenheight; + sys_width = w.screenwidth; + } #else #if MSDOS_COMPILER==WIN32C - { - CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); - sys_height = scr.srWindow.Bottom - scr.srWindow.Top + 1; - sys_width = scr.srWindow.Right - scr.srWindow.Left + 1; - } + { + CONSOLE_SCREEN_BUFFER_INFO scr; + GetConsoleScreenBufferInfo(con_out, &scr); + sys_height = scr.srWindow.Bottom - scr.srWindow.Top + 1; + sys_width = scr.srWindow.Right - scr.srWindow.Left + 1; + } #else #if OS2 - { - int s[2]; - _scrsize(s); - sys_width = s[0]; - sys_height = s[1]; - /* - * When using terminal emulators for XFree86/OS2, the - * _scrsize function does not work well. - * Call the scrsize.exe program to get the window size. - */ - windowid = getenv("WINDOWID"); - if (windowid != NULL) - { - FILE *fd = popen("scrsize", "rt"); - if (fd != NULL) - { - int w, h; - fscanf(fd, "%i %i", &w, &h); - if (w > 0 && h > 0) - { - sys_width = w; - sys_height = h; - } - pclose(fd); - } - } - } + { + int s[2]; + _scrsize(s); + sys_width = s[0]; + sys_height = s[1]; + /* + * When using terminal emulators for XFree86/OS2, the + * _scrsize function does not work well. + * Call the scrsize.exe program to get the window size. + */ + windowid = getenv("WINDOWID"); + if (windowid != NULL) + { + FILE *fd = popen("scrsize", "rt"); + if (fd != NULL) + { + int w, h; + fscanf(fd, "%i %i", &w, &h); + if (w > 0 && h > 0) + { + sys_width = w; + sys_height = h; + } + pclose(fd); + } + } + } #else #ifdef TIOCGWINSZ - { - struct winsize w; - if (ioctl(2, TIOCGWINSZ, &w) == 0) - { - if (w.ws_row > 0) - sys_height = w.ws_row; - if (w.ws_col > 0) - sys_width = w.ws_col; - } - } + { + struct winsize w; + if (ioctl(2, TIOCGWINSZ, &w) == 0) + { + if (w.ws_row > 0) + sys_height = w.ws_row; + if (w.ws_col > 0) + sys_width = w.ws_col; + } + } #else #ifdef WIOCGETD - { - struct uwdata w; - if (ioctl(2, WIOCGETD, &w) == 0) - { - if (w.uw_height > 0) - sys_height = w.uw_height / w.uw_vs; - if (w.uw_width > 0) - sys_width = w.uw_width / w.uw_hs; - } - } + { + struct uwdata w; + if (ioctl(2, WIOCGETD, &w) == 0) + { + if (w.uw_height > 0) + sys_height = w.uw_height / w.uw_vs; + if (w.uw_width > 0) + sys_width = w.uw_width / w.uw_hs; + } + } #endif #endif #endif @@ -846,556 +846,556 @@ scrsize(VOID_PARAM) #endif #endif - if (sys_height > 0) - sc_height = sys_height; - else if ((s = lgetenv("LINES")) != NULL) - sc_height = atoi(s); + if (sys_height > 0) + sc_height = sys_height; + else if ((s = lgetenv("LINES")) != NULL) + sc_height = atoi(s); #if !MSDOS_COMPILER - else if ((n = ltgetnum("li")) > 0) - sc_height = n; + else if ((n = ltgetnum("li")) > 0) + sc_height = n; #endif - if (sc_height <= 0) - sc_height = DEF_SC_HEIGHT; + if (sc_height <= 0) + sc_height = DEF_SC_HEIGHT; - if (sys_width > 0) - sc_width = sys_width; - else if ((s = lgetenv("COLUMNS")) != NULL) - sc_width = atoi(s); + if (sys_width > 0) + sc_width = sys_width; + else if ((s = lgetenv("COLUMNS")) != NULL) + sc_width = atoi(s); #if !MSDOS_COMPILER - else if ((n = ltgetnum("co")) > 0) - sc_width = n; + else if ((n = ltgetnum("co")) > 0) + sc_width = n; #endif - if (sc_width <= 0) - sc_width = DEF_SC_WIDTH; + if (sc_width <= 0) + sc_width = DEF_SC_WIDTH; } #if MSDOS_COMPILER==MSOFTC /* * Figure out how many empty loops it takes to delay a millisecond. */ - static void + static void get_clock(VOID_PARAM) { - clock_t start; - - /* - * Get synchronized at the start of a tick. - */ - start = clock(); - while (clock() == start) - ; - /* - * Now count loops till the next tick. - */ - start = clock(); - msec_loops = 0; - while (clock() == start) - msec_loops++; - /* - * Convert from (loops per clock) to (loops per millisecond). - */ - msec_loops *= CLOCKS_PER_SEC; - msec_loops /= 1000; + clock_t start; + + /* + * Get synchronized at the start of a tick. + */ + start = clock(); + while (clock() == start) + ; + /* + * Now count loops till the next tick. + */ + start = clock(); + msec_loops = 0; + while (clock() == start) + msec_loops++; + /* + * Convert from (loops per clock) to (loops per millisecond). + */ + msec_loops *= CLOCKS_PER_SEC; + msec_loops /= 1000; } /* * Delay for a specified number of milliseconds. */ - static void + static void delay(msec) - int msec; + int msec; { - long i; - - while (msec-- > 0) - { - for (i = 0; i < msec_loops; i++) - (void) clock(); - } + long i; + + while (msec-- > 0) + { + for (i = 0; i < msec_loops; i++) + (void) clock(); + } } #endif /* * Return the characters actually input by a "special" key. */ - public char * + public char * special_key_str(key) - int key; + int key; { - static char tbuf[40]; - char *s; + static char tbuf[40]; + char *s; #if MSDOS_COMPILER || OS2 - static char k_right[] = { '\340', PCK_RIGHT, 0 }; - static char k_left[] = { '\340', PCK_LEFT, 0 }; - static char k_ctl_right[] = { '\340', PCK_CTL_RIGHT, 0 }; - static char k_ctl_left[] = { '\340', PCK_CTL_LEFT, 0 }; - static char k_insert[] = { '\340', PCK_INSERT, 0 }; - static char k_delete[] = { '\340', PCK_DELETE, 0 }; - static char k_ctl_delete[] = { '\340', PCK_CTL_DELETE, 0 }; - static char k_ctl_backspace[] = { '\177', 0 }; - static char k_backspace[] = { '\b', 0 }; - static char k_home[] = { '\340', PCK_HOME, 0 }; - static char k_end[] = { '\340', PCK_END, 0 }; - static char k_up[] = { '\340', PCK_UP, 0 }; - static char k_down[] = { '\340', PCK_DOWN, 0 }; - static char k_backtab[] = { '\340', PCK_SHIFT_TAB, 0 }; - static char k_pagedown[] = { '\340', PCK_PAGEDOWN, 0 }; - static char k_pageup[] = { '\340', PCK_PAGEUP, 0 }; - static char k_f1[] = { '\340', PCK_F1, 0 }; + static char k_right[] = { '\340', PCK_RIGHT, 0 }; + static char k_left[] = { '\340', PCK_LEFT, 0 }; + static char k_ctl_right[] = { '\340', PCK_CTL_RIGHT, 0 }; + static char k_ctl_left[] = { '\340', PCK_CTL_LEFT, 0 }; + static char k_insert[] = { '\340', PCK_INSERT, 0 }; + static char k_delete[] = { '\340', PCK_DELETE, 0 }; + static char k_ctl_delete[] = { '\340', PCK_CTL_DELETE, 0 }; + static char k_ctl_backspace[] = { '\177', 0 }; + static char k_backspace[] = { '\b', 0 }; + static char k_home[] = { '\340', PCK_HOME, 0 }; + static char k_end[] = { '\340', PCK_END, 0 }; + static char k_up[] = { '\340', PCK_UP, 0 }; + static char k_down[] = { '\340', PCK_DOWN, 0 }; + static char k_backtab[] = { '\340', PCK_SHIFT_TAB, 0 }; + static char k_pagedown[] = { '\340', PCK_PAGEDOWN, 0 }; + static char k_pageup[] = { '\340', PCK_PAGEUP, 0 }; + static char k_f1[] = { '\340', PCK_F1, 0 }; #endif #if !MSDOS_COMPILER - char *sp = tbuf; + char *sp = tbuf; #endif - switch (key) - { + switch (key) + { #if OS2 - /* - * If windowid is not NULL, assume less is executed in - * the XFree86 environment. - */ - case SK_RIGHT_ARROW: - s = windowid ? ltgetstr("kr", &sp) : k_right; - break; - case SK_LEFT_ARROW: - s = windowid ? ltgetstr("kl", &sp) : k_left; - break; - case SK_UP_ARROW: - s = windowid ? ltgetstr("ku", &sp) : k_up; - break; - case SK_DOWN_ARROW: - s = windowid ? ltgetstr("kd", &sp) : k_down; - break; - case SK_PAGE_UP: - s = windowid ? ltgetstr("kP", &sp) : k_pageup; - break; - case SK_PAGE_DOWN: - s = windowid ? ltgetstr("kN", &sp) : k_pagedown; - break; - case SK_HOME: - s = windowid ? ltgetstr("kh", &sp) : k_home; - break; - case SK_END: - s = windowid ? ltgetstr("@7", &sp) : k_end; - break; - case SK_DELETE: - s = windowid ? ltgetstr("kD", &sp) : k_delete; - if (s == NULL) - { - tbuf[0] = '\177'; - tbuf[1] = '\0'; - s = tbuf; - } - break; + /* + * If windowid is not NULL, assume less is executed in + * the XFree86 environment. + */ + case SK_RIGHT_ARROW: + s = windowid ? ltgetstr("kr", &sp) : k_right; + break; + case SK_LEFT_ARROW: + s = windowid ? ltgetstr("kl", &sp) : k_left; + break; + case SK_UP_ARROW: + s = windowid ? ltgetstr("ku", &sp) : k_up; + break; + case SK_DOWN_ARROW: + s = windowid ? ltgetstr("kd", &sp) : k_down; + break; + case SK_PAGE_UP: + s = windowid ? ltgetstr("kP", &sp) : k_pageup; + break; + case SK_PAGE_DOWN: + s = windowid ? ltgetstr("kN", &sp) : k_pagedown; + break; + case SK_HOME: + s = windowid ? ltgetstr("kh", &sp) : k_home; + break; + case SK_END: + s = windowid ? ltgetstr("@7", &sp) : k_end; + break; + case SK_DELETE: + s = windowid ? ltgetstr("kD", &sp) : k_delete; + if (s == NULL) + { + tbuf[0] = '\177'; + tbuf[1] = '\0'; + s = tbuf; + } + break; #endif #if MSDOS_COMPILER - case SK_RIGHT_ARROW: - s = k_right; - break; - case SK_LEFT_ARROW: - s = k_left; - break; - case SK_UP_ARROW: - s = k_up; - break; - case SK_DOWN_ARROW: - s = k_down; - break; - case SK_PAGE_UP: - s = k_pageup; - break; - case SK_PAGE_DOWN: - s = k_pagedown; - break; - case SK_HOME: - s = k_home; - break; - case SK_END: - s = k_end; - break; - case SK_DELETE: - s = k_delete; - break; + case SK_RIGHT_ARROW: + s = k_right; + break; + case SK_LEFT_ARROW: + s = k_left; + break; + case SK_UP_ARROW: + s = k_up; + break; + case SK_DOWN_ARROW: + s = k_down; + break; + case SK_PAGE_UP: + s = k_pageup; + break; + case SK_PAGE_DOWN: + s = k_pagedown; + break; + case SK_HOME: + s = k_home; + break; + case SK_END: + s = k_end; + break; + case SK_DELETE: + s = k_delete; + break; #endif #if MSDOS_COMPILER || OS2 - case SK_INSERT: - s = k_insert; - break; - case SK_CTL_LEFT_ARROW: - s = k_ctl_left; - break; - case SK_CTL_RIGHT_ARROW: - s = k_ctl_right; - break; - case SK_CTL_BACKSPACE: - s = k_ctl_backspace; - break; - case SK_CTL_DELETE: - s = k_ctl_delete; - break; - case SK_BACKSPACE: - s = k_backspace; - break; - case SK_F1: - s = k_f1; - break; - case SK_BACKTAB: - s = k_backtab; - break; + case SK_INSERT: + s = k_insert; + break; + case SK_CTL_LEFT_ARROW: + s = k_ctl_left; + break; + case SK_CTL_RIGHT_ARROW: + s = k_ctl_right; + break; + case SK_CTL_BACKSPACE: + s = k_ctl_backspace; + break; + case SK_CTL_DELETE: + s = k_ctl_delete; + break; + case SK_BACKSPACE: + s = k_backspace; + break; + case SK_F1: + s = k_f1; + break; + case SK_BACKTAB: + s = k_backtab; + break; #else - case SK_RIGHT_ARROW: - s = ltgetstr("kr", &sp); - break; - case SK_LEFT_ARROW: - s = ltgetstr("kl", &sp); - break; - case SK_UP_ARROW: - s = ltgetstr("ku", &sp); - break; - case SK_DOWN_ARROW: - s = ltgetstr("kd", &sp); - break; - case SK_PAGE_UP: - s = ltgetstr("kP", &sp); - break; - case SK_PAGE_DOWN: - s = ltgetstr("kN", &sp); - break; - case SK_HOME: - s = ltgetstr("kh", &sp); - break; - case SK_END: - s = ltgetstr("@7", &sp); - break; - case SK_DELETE: - s = ltgetstr("kD", &sp); - if (s == NULL) - { - tbuf[0] = '\177'; - tbuf[1] = '\0'; - s = tbuf; - } - break; - case SK_BACKSPACE: - s = ltgetstr("kb", &sp); - if (s == NULL) - { - tbuf[0] = '\b'; - tbuf[1] = '\0'; - s = tbuf; - } - break; -#endif - case SK_CONTROL_K: - tbuf[0] = CONTROL('K'); - tbuf[1] = '\0'; - s = tbuf; - break; - default: - return (NULL); - } - return (s); + case SK_RIGHT_ARROW: + s = ltgetstr("kr", &sp); + break; + case SK_LEFT_ARROW: + s = ltgetstr("kl", &sp); + break; + case SK_UP_ARROW: + s = ltgetstr("ku", &sp); + break; + case SK_DOWN_ARROW: + s = ltgetstr("kd", &sp); + break; + case SK_PAGE_UP: + s = ltgetstr("kP", &sp); + break; + case SK_PAGE_DOWN: + s = ltgetstr("kN", &sp); + break; + case SK_HOME: + s = ltgetstr("kh", &sp); + break; + case SK_END: + s = ltgetstr("@7", &sp); + break; + case SK_DELETE: + s = ltgetstr("kD", &sp); + if (s == NULL) + { + tbuf[0] = '\177'; + tbuf[1] = '\0'; + s = tbuf; + } + break; + case SK_BACKSPACE: + s = ltgetstr("kb", &sp); + if (s == NULL) + { + tbuf[0] = '\b'; + tbuf[1] = '\0'; + s = tbuf; + } + break; +#endif + case SK_CONTROL_K: + tbuf[0] = CONTROL('K'); + tbuf[1] = '\0'; + s = tbuf; + break; + default: + return (NULL); + } + return (s); } /* * Get terminal capabilities via termcap. */ - public void + public void get_term(VOID_PARAM) { - termcap_debug = !isnullenv(lgetenv("LESS_TERMCAP_DEBUG")); + termcap_debug = !isnullenv(lgetenv("LESS_TERMCAP_DEBUG")); #if MSDOS_COMPILER - auto_wrap = 1; - ignaw = 0; - can_goto_line = 1; - clear_bg = 1; - /* - * Set up default colors. - * The xx_s_width and xx_e_width vars are already initialized to 0. - */ + auto_wrap = 1; + ignaw = 0; + can_goto_line = 1; + clear_bg = 1; + /* + * Set up default colors. + * The xx_s_width and xx_e_width vars are already initialized to 0. + */ #if MSDOS_COMPILER==MSOFTC - sy_bg_color = _getbkcolor(); - sy_fg_color = _gettextcolor(); - get_clock(); + sy_bg_color = _getbkcolor(); + sy_fg_color = _gettextcolor(); + get_clock(); #else #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC { - struct text_info w; - gettextinfo(&w); - sy_bg_color = (w.attribute >> 4) & 0x0F; - sy_fg_color = (w.attribute >> 0) & 0x0F; + struct text_info w; + gettextinfo(&w); + sy_bg_color = (w.attribute >> 4) & 0x0F; + sy_fg_color = (w.attribute >> 0) & 0x0F; } #else #if MSDOS_COMPILER==WIN32C { - CONSOLE_SCREEN_BUFFER_INFO scr; - - con_out_save = con_out = GetStdHandle(STD_OUTPUT_HANDLE); - /* - * Always open stdin in binary. Note this *must* be done - * before any file operations have been done on fd0. - */ - SET_BINARY(0); - GetConsoleMode(con_out, &init_output_mode); - GetConsoleScreenBufferInfo(con_out, &scr); - curr_attr = scr.wAttributes; - sy_bg_color = (curr_attr & BG_COLORS) >> 4; /* normalize */ - sy_fg_color = curr_attr & FG_COLORS; + CONSOLE_SCREEN_BUFFER_INFO scr; + + con_out_save = con_out = GetStdHandle(STD_OUTPUT_HANDLE); + /* + * Always open stdin in binary. Note this *must* be done + * before any file operations have been done on fd0. + */ + SET_BINARY(0); + GetConsoleMode(con_out, &init_output_mode); + GetConsoleScreenBufferInfo(con_out, &scr); + curr_attr = scr.wAttributes; + sy_bg_color = (curr_attr & BG_COLORS) >> 4; /* normalize */ + sy_fg_color = curr_attr & FG_COLORS; } #endif #endif #endif - nm_fg_color = sy_fg_color; - nm_bg_color = sy_bg_color; - bo_fg_color = 11; - bo_bg_color = 0; - ul_fg_color = 9; - ul_bg_color = 0; - so_fg_color = 15; - so_bg_color = 9; - bl_fg_color = 15; - bl_bg_color = 0; - sgr_mode = 0; + nm_fg_color = sy_fg_color; + nm_bg_color = sy_bg_color; + bo_fg_color = 11; + bo_bg_color = 0; + ul_fg_color = 9; + ul_bg_color = 0; + so_fg_color = 15; + so_bg_color = 9; + bl_fg_color = 15; + bl_bg_color = 0; + sgr_mode = 0; - /* - * Get size of the screen. - */ - scrsize(); - pos_init(); + /* + * Get size of the screen. + */ + scrsize(); + pos_init(); #else /* !MSDOS_COMPILER */ { - char *sp; - char *t1, *t2; - char *term; - /* - * Some termcap libraries assume termbuf is static - * (accessible after tgetent returns). - */ - static char termbuf[TERMBUF_SIZE]; - static char sbuf[TERMSBUF_SIZE]; + char *sp; + char *t1, *t2; + char *term; + /* + * Some termcap libraries assume termbuf is static + * (accessible after tgetent returns). + */ + static char termbuf[TERMBUF_SIZE]; + static char sbuf[TERMSBUF_SIZE]; #if OS2 - /* - * Make sure the termcap database is available. - */ - sp = lgetenv("TERMCAP"); - if (isnullenv(sp)) - { - char *termcap; - if ((sp = homefile("termcap.dat")) != NULL) - { - termcap = (char *) ecalloc(strlen(sp)+9, sizeof(char)); - sprintf(termcap, "TERMCAP=%s", sp); - free(sp); - putenv(termcap); - } - } -#endif - /* - * Find out what kind of terminal this is. - */ - if ((term = lgetenv("TERM")) == NULL) - term = DEFAULT_TERM; - hardcopy = 0; - /* {{ Should probably just pass NULL instead of termbuf. }} */ - if (tgetent(termbuf, term) != TGETENT_OK) - hardcopy = 1; - if (ltgetflag("hc")) - hardcopy = 1; - - /* - * Get size of the screen. - */ - scrsize(); - pos_init(); - - auto_wrap = ltgetflag("am"); - ignaw = ltgetflag("xn"); - above_mem = ltgetflag("da"); - below_mem = ltgetflag("db"); - clear_bg = ltgetflag("ut"); - - /* - * Assumes termcap variable "sg" is the printing width of: - * the standout sequence, the end standout sequence, - * the underline sequence, the end underline sequence, - * the boldface sequence, and the end boldface sequence. - */ - if ((so_s_width = ltgetnum("sg")) < 0) - so_s_width = 0; - so_e_width = so_s_width; - - bo_s_width = bo_e_width = so_s_width; - ul_s_width = ul_e_width = so_s_width; - bl_s_width = bl_e_width = so_s_width; + /* + * Make sure the termcap database is available. + */ + sp = lgetenv("TERMCAP"); + if (isnullenv(sp)) + { + char *termcap; + if ((sp = homefile("termcap.dat")) != NULL) + { + termcap = (char *) ecalloc(strlen(sp)+9, sizeof(char)); + sprintf(termcap, "TERMCAP=%s", sp); + free(sp); + putenv(termcap); + } + } +#endif + /* + * Find out what kind of terminal this is. + */ + if ((term = lgetenv("TERM")) == NULL) + term = DEFAULT_TERM; + hardcopy = 0; + /* {{ Should probably just pass NULL instead of termbuf. }} */ + if (tgetent(termbuf, term) != TGETENT_OK) + hardcopy = 1; + if (ltgetflag("hc")) + hardcopy = 1; + + /* + * Get size of the screen. + */ + scrsize(); + pos_init(); + + auto_wrap = ltgetflag("am"); + ignaw = ltgetflag("xn"); + above_mem = ltgetflag("da"); + below_mem = ltgetflag("db"); + clear_bg = ltgetflag("ut"); + + /* + * Assumes termcap variable "sg" is the printing width of: + * the standout sequence, the end standout sequence, + * the underline sequence, the end underline sequence, + * the boldface sequence, and the end boldface sequence. + */ + if ((so_s_width = ltgetnum("sg")) < 0) + so_s_width = 0; + so_e_width = so_s_width; + + bo_s_width = bo_e_width = so_s_width; + ul_s_width = ul_e_width = so_s_width; + bl_s_width = bl_e_width = so_s_width; #if HILITE_SEARCH - if (so_s_width > 0 || so_e_width > 0) - /* - * Disable highlighting by default on magic cookie terminals. - * Turning on highlighting might change the displayed width - * of a line, causing the display to get messed up. - * The user can turn it back on with -g, - * but she won't like the results. - */ - hilite_search = 0; -#endif - - /* - * Get various string-valued capabilities. - */ - sp = sbuf; + if (so_s_width > 0 || so_e_width > 0) + /* + * Disable highlighting by default on magic cookie terminals. + * Turning on highlighting might change the displayed width + * of a line, causing the display to get messed up. + * The user can turn it back on with -g, + * but she won't like the results. + */ + hilite_search = 0; +#endif + + /* + * Get various string-valued capabilities. + */ + sp = sbuf; #if HAVE_OSPEED - sc_pad = ltgetstr("pc", &sp); - if (sc_pad != NULL) - PC = *sc_pad; -#endif - - sc_s_keypad = ltgetstr("ks", &sp); - if (sc_s_keypad == NULL) - sc_s_keypad = ""; - sc_e_keypad = ltgetstr("ke", &sp); - if (sc_e_keypad == NULL) - sc_e_keypad = ""; - kent = ltgetstr("@8", &sp); - - sc_s_mousecap = ltgetstr("MOUSE_START", &sp); - if (sc_s_mousecap == NULL) - sc_s_mousecap = ESCS "[?1000h" ESCS "[?1006h"; - sc_e_mousecap = ltgetstr("MOUSE_END", &sp); - if (sc_e_mousecap == NULL) - sc_e_mousecap = ESCS "[?1006l" ESCS "[?1000l"; - - sc_init = ltgetstr("ti", &sp); - if (sc_init == NULL) - sc_init = ""; - - sc_deinit= ltgetstr("te", &sp); - if (sc_deinit == NULL) - sc_deinit = ""; - - sc_eol_clear = ltgetstr("ce", &sp); - if (sc_eol_clear == NULL || *sc_eol_clear == '\0') - { - missing_cap = 1; - sc_eol_clear = ""; - } - - sc_eos_clear = ltgetstr("cd", &sp); - if (below_mem && (sc_eos_clear == NULL || *sc_eos_clear == '\0')) - { - missing_cap = 1; - sc_eos_clear = ""; - } - - sc_clear = ltgetstr("cl", &sp); - if (sc_clear == NULL || *sc_clear == '\0') - { - missing_cap = 1; - sc_clear = "\n\n"; - } - - sc_move = ltgetstr("cm", &sp); - if (sc_move == NULL || *sc_move == '\0') - { - /* - * This is not an error here, because we don't - * always need sc_move. - * We need it only if we don't have home or lower-left. - */ - sc_move = ""; - can_goto_line = 0; - } else - can_goto_line = 1; - - tmodes("so", "se", &sc_s_in, &sc_s_out, "", "", &sp); - tmodes("us", "ue", &sc_u_in, &sc_u_out, sc_s_in, sc_s_out, &sp); - tmodes("md", "me", &sc_b_in, &sc_b_out, sc_s_in, sc_s_out, &sp); - tmodes("mb", "me", &sc_bl_in, &sc_bl_out, sc_s_in, sc_s_out, &sp); - - sc_visual_bell = ltgetstr("vb", &sp); - if (sc_visual_bell == NULL) - sc_visual_bell = ""; - - if (ltgetflag("bs")) - sc_backspace = "\b"; - else - { - sc_backspace = ltgetstr("bc", &sp); - if (sc_backspace == NULL || *sc_backspace == '\0') - sc_backspace = "\b"; - } - - /* - * Choose between using "ho" and "cm" ("home" and "cursor move") - * to move the cursor to the upper left corner of the screen. - */ - t1 = ltgetstr("ho", &sp); - if (t1 == NULL) - t1 = ""; - if (*sc_move == '\0') - t2 = ""; - else - { - strcpy(sp, tgoto(sc_move, 0, 0)); - t2 = sp; - sp += strlen(sp) + 1; - } - sc_home = cheaper(t1, t2, "|\b^"); - - /* - * Choose between using "ll" and "cm" ("lower left" and "cursor move") - * to move the cursor to the lower left corner of the screen. - */ - t1 = ltgetstr("ll", &sp); - if (t1 == NULL) - t1 = ""; - if (*sc_move == '\0') - t2 = ""; - else - { - strcpy(sp, tgoto(sc_move, 0, sc_height-1)); - t2 = sp; - sp += strlen(sp) + 1; - } - sc_lower_left = cheaper(t1, t2, "\r"); - - /* - * Get carriage return string. - */ - sc_return = ltgetstr("cr", &sp); - if (sc_return == NULL) - sc_return = "\r"; - - /* - * Choose between using "al" or "sr" ("add line" or "scroll reverse") - * to add a line at the top of the screen. - */ - t1 = ltgetstr("al", &sp); - if (t1 == NULL) - t1 = ""; - t2 = ltgetstr("sr", &sp); - if (t2 == NULL) - t2 = ""; + sc_pad = ltgetstr("pc", &sp); + if (sc_pad != NULL) + PC = *sc_pad; +#endif + + sc_s_keypad = ltgetstr("ks", &sp); + if (sc_s_keypad == NULL) + sc_s_keypad = ""; + sc_e_keypad = ltgetstr("ke", &sp); + if (sc_e_keypad == NULL) + sc_e_keypad = ""; + kent = ltgetstr("@8", &sp); + + sc_s_mousecap = ltgetstr("MOUSE_START", &sp); + if (sc_s_mousecap == NULL) + sc_s_mousecap = ESCS "[?1000h" ESCS "[?1006h"; + sc_e_mousecap = ltgetstr("MOUSE_END", &sp); + if (sc_e_mousecap == NULL) + sc_e_mousecap = ESCS "[?1006l" ESCS "[?1000l"; + + sc_init = ltgetstr("ti", &sp); + if (sc_init == NULL) + sc_init = ""; + + sc_deinit= ltgetstr("te", &sp); + if (sc_deinit == NULL) + sc_deinit = ""; + + sc_eol_clear = ltgetstr("ce", &sp); + if (sc_eol_clear == NULL || *sc_eol_clear == '\0') + { + missing_cap = 1; + sc_eol_clear = ""; + } + + sc_eos_clear = ltgetstr("cd", &sp); + if (below_mem && (sc_eos_clear == NULL || *sc_eos_clear == '\0')) + { + missing_cap = 1; + sc_eos_clear = ""; + } + + sc_clear = ltgetstr("cl", &sp); + if (sc_clear == NULL || *sc_clear == '\0') + { + missing_cap = 1; + sc_clear = "\n\n"; + } + + sc_move = ltgetstr("cm", &sp); + if (sc_move == NULL || *sc_move == '\0') + { + /* + * This is not an error here, because we don't + * always need sc_move. + * We need it only if we don't have home or lower-left. + */ + sc_move = ""; + can_goto_line = 0; + } else + can_goto_line = 1; + + tmodes("so", "se", &sc_s_in, &sc_s_out, "", "", &sp); + tmodes("us", "ue", &sc_u_in, &sc_u_out, sc_s_in, sc_s_out, &sp); + tmodes("md", "me", &sc_b_in, &sc_b_out, sc_s_in, sc_s_out, &sp); + tmodes("mb", "me", &sc_bl_in, &sc_bl_out, sc_s_in, sc_s_out, &sp); + + sc_visual_bell = ltgetstr("vb", &sp); + if (sc_visual_bell == NULL) + sc_visual_bell = ""; + + if (ltgetflag("bs")) + sc_backspace = "\b"; + else + { + sc_backspace = ltgetstr("bc", &sp); + if (sc_backspace == NULL || *sc_backspace == '\0') + sc_backspace = "\b"; + } + + /* + * Choose between using "ho" and "cm" ("home" and "cursor move") + * to move the cursor to the upper left corner of the screen. + */ + t1 = ltgetstr("ho", &sp); + if (t1 == NULL) + t1 = ""; + if (*sc_move == '\0') + t2 = ""; + else + { + strcpy(sp, tgoto(sc_move, 0, 0)); + t2 = sp; + sp += strlen(sp) + 1; + } + sc_home = cheaper(t1, t2, "|\b^"); + + /* + * Choose between using "ll" and "cm" ("lower left" and "cursor move") + * to move the cursor to the lower left corner of the screen. + */ + t1 = ltgetstr("ll", &sp); + if (t1 == NULL) + t1 = ""; + if (*sc_move == '\0') + t2 = ""; + else + { + strcpy(sp, tgoto(sc_move, 0, sc_height-1)); + t2 = sp; + sp += strlen(sp) + 1; + } + sc_lower_left = cheaper(t1, t2, "\r"); + + /* + * Get carriage return string. + */ + sc_return = ltgetstr("cr", &sp); + if (sc_return == NULL) + sc_return = "\r"; + + /* + * Choose between using "al" or "sr" ("add line" or "scroll reverse") + * to add a line at the top of the screen. + */ + t1 = ltgetstr("al", &sp); + if (t1 == NULL) + t1 = ""; + t2 = ltgetstr("sr", &sp); + if (t2 == NULL) + t2 = ""; #if OS2 - if (*t1 == '\0' && *t2 == '\0') - sc_addline = ""; - else -#endif - if (above_mem) - sc_addline = t1; - else - sc_addline = cheaper(t1, t2, ""); - if (*sc_addline == '\0') - { - /* - * Force repaint on any backward movement. - */ - no_back_scroll = 1; - } + if (*t1 == '\0' && *t2 == '\0') + sc_addline = ""; + else +#endif + if (above_mem) + sc_addline = t1; + else + sc_addline = cheaper(t1, t2, ""); + if (*sc_addline == '\0') + { + /* + * Force repaint on any backward movement. + */ + no_back_scroll = 1; + } } #endif /* MSDOS_COMPILER */ } @@ -1411,80 +1411,80 @@ get_term(VOID_PARAM) static int costcount; /*ARGSUSED*/ - static int + static int inc_costcount(c) - int c; + int c; { - costcount++; - return (c); + costcount++; + return (c); } - static int + static int cost(t) - char *t; + char *t; { - costcount = 0; - tputs(t, sc_height, inc_costcount); - return (costcount); + costcount = 0; + tputs(t, sc_height, inc_costcount); + return (costcount); } /* * Return the "best" of the two given termcap strings. - * The best, if both exist, is the one with the lower + * The best, if both exist, is the one with the lower * cost (see cost() function). */ - static char * + static char * cheaper(t1, t2, def) - char *t1, *t2; - char *def; -{ - if (*t1 == '\0' && *t2 == '\0') - { - missing_cap = 1; - return (def); - } - if (*t1 == '\0') - return (t2); - if (*t2 == '\0') - return (t1); - if (cost(t1) < cost(t2)) - return (t1); - return (t2); -} - - static void + char *t1, *t2; + char *def; +{ + if (*t1 == '\0' && *t2 == '\0') + { + missing_cap = 1; + return (def); + } + if (*t1 == '\0') + return (t2); + if (*t2 == '\0') + return (t1); + if (cost(t1) < cost(t2)) + return (t1); + return (t2); +} + + static void tmodes(incap, outcap, instr, outstr, def_instr, def_outstr, spp) - char *incap; - char *outcap; - char **instr; - char **outstr; - char *def_instr; - char *def_outstr; - char **spp; -{ - *instr = ltgetstr(incap, spp); - if (*instr == NULL) - { - /* Use defaults. */ - *instr = def_instr; - *outstr = def_outstr; - return; - } - - *outstr = ltgetstr(outcap, spp); - if (*outstr == NULL) - /* No specific out capability; use "me". */ - *outstr = ltgetstr("me", spp); - if (*outstr == NULL) - /* Don't even have "me"; use a null string. */ - *outstr = ""; + char *incap; + char *outcap; + char **instr; + char **outstr; + char *def_instr; + char *def_outstr; + char **spp; +{ + *instr = ltgetstr(incap, spp); + if (*instr == NULL) + { + /* Use defaults. */ + *instr = def_instr; + *outstr = def_outstr; + return; + } + + *outstr = ltgetstr(outcap, spp); + if (*outstr == NULL) + /* No specific out capability; use "me". */ + *outstr = ltgetstr("me", spp); + if (*outstr == NULL) + /* Don't even have "me"; use a null string. */ + *outstr = ""; } #endif /* MSDOS_COMPILER */ /* - * Below are the functions which perform all the + * Below are the functions which perform all the * terminal-specific screen manipulation. */ @@ -1492,49 +1492,49 @@ tmodes(incap, outcap, instr, outstr, def_instr, def_outstr, spp) #if MSDOS_COMPILER #if MSDOS_COMPILER==WIN32C - static void + static void _settextposition(int row, int col) { - COORD cpos; - CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD cpos; + CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(con_out, &csbi); - cpos.X = csbi.srWindow.Left + (col - 1); - cpos.Y = csbi.srWindow.Top + (row - 1); - SetConsoleCursorPosition(con_out, cpos); + GetConsoleScreenBufferInfo(con_out, &csbi); + cpos.X = csbi.srWindow.Left + (col - 1); + cpos.Y = csbi.srWindow.Top + (row - 1); + SetConsoleCursorPosition(con_out, cpos); } #endif /* * Initialize the screen to the correct color at startup. */ - static void + static void initcolor(VOID_PARAM) { #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - intensevideo(); + intensevideo(); #endif - SETCOLORS(nm_fg_color, nm_bg_color); + SETCOLORS(nm_fg_color, nm_bg_color); #if 0 - /* - * This clears the screen at startup. This is different from - * the behavior of other versions of less. Disable it for now. - */ - char *blanks; - int row; - int col; - - /* - * Create a complete, blank screen using "normal" colors. - */ - SETCOLORS(nm_fg_color, nm_bg_color); - blanks = (char *) ecalloc(width+1, sizeof(char)); - for (col = 0; col < sc_width; col++) - blanks[col] = ' '; - blanks[sc_width] = '\0'; - for (row = 0; row < sc_height; row++) - _outtext(blanks); - free(blanks); + /* + * This clears the screen at startup. This is different from + * the behavior of other versions of less. Disable it for now. + */ + char *blanks; + int row; + int col; + + /* + * Create a complete, blank screen using "normal" colors. + */ + SETCOLORS(nm_fg_color, nm_bg_color); + blanks = (char *) ecalloc(width+1, sizeof(char)); + for (col = 0; col < sc_width; col++) + blanks[col] = ' '; + blanks[sc_width] = '\0'; + for (row = 0; row < sc_height; row++) + _outtext(blanks); + free(blanks); #endif } #endif @@ -1544,157 +1544,157 @@ initcolor(VOID_PARAM) /* * Enable virtual terminal processing, if available. */ - static void + static void win32_init_vt_term(VOID_PARAM) { - DWORD output_mode; + DWORD output_mode; - if (vt_enabled == 0 || (vt_enabled == 1 && con_out == con_out_ours)) - return; + if (vt_enabled == 0 || (vt_enabled == 1 && con_out == con_out_ours)) + return; - GetConsoleMode(con_out, &output_mode); - vt_enabled = SetConsoleMode(con_out, - output_mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING); - if (vt_enabled) - { - auto_wrap = 0; - ignaw = 1; - } + GetConsoleMode(con_out, &output_mode); + vt_enabled = SetConsoleMode(con_out, + output_mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING); + if (vt_enabled) + { + auto_wrap = 0; + ignaw = 1; + } } - static void + static void win32_deinit_vt_term(VOID_PARAM) { - if (vt_enabled == 1 && con_out == con_out_save) - SetConsoleMode(con_out, init_output_mode); + if (vt_enabled == 1 && con_out == con_out_save) + SetConsoleMode(con_out, init_output_mode); } /* * Termcap-like init with a private win32 console. */ - static void + static void win32_init_term(VOID_PARAM) { - CONSOLE_SCREEN_BUFFER_INFO scr; - COORD size; + CONSOLE_SCREEN_BUFFER_INFO scr; + COORD size; - if (con_out_save == INVALID_HANDLE_VALUE) - return; + if (con_out_save == INVALID_HANDLE_VALUE) + return; - GetConsoleScreenBufferInfo(con_out_save, &scr); + GetConsoleScreenBufferInfo(con_out_save, &scr); - if (con_out_ours == INVALID_HANDLE_VALUE) - { - /* - * Create our own screen buffer, so that we - * may restore the original when done. - */ - con_out_ours = CreateConsoleScreenBuffer( - GENERIC_WRITE | GENERIC_READ, - FILE_SHARE_WRITE | FILE_SHARE_READ, - (LPSECURITY_ATTRIBUTES) NULL, - CONSOLE_TEXTMODE_BUFFER, - (LPVOID) NULL); - } + if (con_out_ours == INVALID_HANDLE_VALUE) + { + /* + * Create our own screen buffer, so that we + * may restore the original when done. + */ + con_out_ours = CreateConsoleScreenBuffer( + GENERIC_WRITE | GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ, + (LPSECURITY_ATTRIBUTES) NULL, + CONSOLE_TEXTMODE_BUFFER, + (LPVOID) NULL); + } - size.X = scr.srWindow.Right - scr.srWindow.Left + 1; - size.Y = scr.srWindow.Bottom - scr.srWindow.Top + 1; - SetConsoleScreenBufferSize(con_out_ours, size); - SetConsoleActiveScreenBuffer(con_out_ours); - con_out = con_out_ours; + size.X = scr.srWindow.Right - scr.srWindow.Left + 1; + size.Y = scr.srWindow.Bottom - scr.srWindow.Top + 1; + SetConsoleScreenBufferSize(con_out_ours, size); + SetConsoleActiveScreenBuffer(con_out_ours); + con_out = con_out_ours; } /* * Restore the startup console. */ - static void + static void win32_deinit_term(VOID_PARAM) { - if (con_out_save == INVALID_HANDLE_VALUE) - return; - if (quitting) - (void) CloseHandle(con_out_ours); - SetConsoleActiveScreenBuffer(con_out_save); - con_out = con_out_save; + if (con_out_save == INVALID_HANDLE_VALUE) + return; + if (quitting) + (void) CloseHandle(con_out_ours); + SetConsoleActiveScreenBuffer(con_out_save); + con_out = con_out_save; } #endif #if !MSDOS_COMPILER - static void + static void do_tputs(str, affcnt, f_putc) - char *str; - int affcnt; - int (*f_putc)(int); + char *str; + int affcnt; + int (*f_putc)(int); { #if LESSTEST - if (ttyin_name != NULL) - putstr(str); - else + if (ttyin_name != NULL) + putstr(str); + else #endif /*LESSTEST*/ - tputs(str, affcnt, f_putc); + tputs(str, affcnt, f_putc); } /* * Like tputs but we handle $<...> delay strings here because * some implementations of tputs don't perform delays correctly. */ - static void + static void ltputs(str, affcnt, f_putc) - char *str; - int affcnt; - int (*f_putc)(int); + char *str; + int affcnt; + int (*f_putc)(int); { - while (str != NULL && *str != '\0') - { + while (str != NULL && *str != '\0') + { #if HAVE_STRSTR - char *obrac = strstr(str, "$<"); - if (obrac != NULL) - { - char str2[64]; - int slen = obrac - str; - if (slen < sizeof(str2)) - { - int delay; - /* Output first part of string (before "$<"). */ - memcpy(str2, str, slen); - str2[slen] = '\0'; - do_tputs(str2, affcnt, f_putc); - str += slen + 2; - /* Perform the delay. */ - delay = lstrtoi(str, &str); - if (*str == '*') - delay *= affcnt; - flush(); - sleep_ms(delay); - /* Skip past closing ">" at end of delay string. */ - str = strstr(str, ">"); - if (str != NULL) - str++; - continue; - } - } -#endif - /* Pass the rest of the string to tputs and we're done. */ - do_tputs(str, affcnt, f_putc); - break; - } + char *obrac = strstr(str, "$<"); + if (obrac != NULL) + { + char str2[64]; + int slen = obrac - str; + if (slen < sizeof(str2)) + { + int delay; + /* Output first part of string (before "$<"). */ + memcpy(str2, str, slen); + str2[slen] = '\0'; + do_tputs(str2, affcnt, f_putc); + str += slen + 2; + /* Perform the delay. */ + delay = lstrtoi(str, &str); + if (*str == '*') + delay *= affcnt; + flush(); + sleep_ms(delay); + /* Skip past closing ">" at end of delay string. */ + str = strstr(str, ">"); + if (str != NULL) + str++; + continue; + } + } +#endif + /* Pass the rest of the string to tputs and we're done. */ + do_tputs(str, affcnt, f_putc); + break; + } } #endif /* MSDOS_COMPILER */ /* - * Configure the termimal so mouse clicks and wheel moves + * Configure the termimal so mouse clicks and wheel moves * produce input to less. */ - public void + public void init_mouse(VOID_PARAM) { #if !MSDOS_COMPILER - ltputs(sc_s_mousecap, sc_height, putchr); + ltputs(sc_s_mousecap, sc_height, putchr); #else #if MSDOS_COMPILER==WIN32C - SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT - | ENABLE_EXTENDED_FLAGS /* disable quick edit */); + SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT + | ENABLE_EXTENDED_FLAGS /* disable quick edit */); #endif #endif @@ -1704,15 +1704,15 @@ init_mouse(VOID_PARAM) * Configure the terminal so mouse clicks and wheel moves * are handled by the system (so text can be selected, etc). */ - public void + public void deinit_mouse(VOID_PARAM) { #if !MSDOS_COMPILER - ltputs(sc_e_mousecap, sc_height, putchr); + ltputs(sc_e_mousecap, sc_height, putchr); #else #if MSDOS_COMPILER==WIN32C - SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_EXTENDED_FLAGS - | (console_mode & ENABLE_QUICK_EDIT_MODE)); + SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_EXTENDED_FLAGS + | (console_mode & ENABLE_QUICK_EDIT_MODE)); #endif #endif } @@ -1720,125 +1720,125 @@ deinit_mouse(VOID_PARAM) /* * Initialize terminal */ - public void + public void init(VOID_PARAM) { - clear_bot_if_needed(); + clear_bot_if_needed(); #if !MSDOS_COMPILER - if (!(quit_if_one_screen && one_screen)) - { - if (!no_init) - { - ltputs(sc_init, sc_height, putchr); - term_init_done = 1; - } - if (!no_keypad) - ltputs(sc_s_keypad, sc_height, putchr); - if (mousecap) - init_mouse(); - } - init_done = 1; - if (top_scroll) - { - int i; - - /* - * This is nice to terminals with no alternate screen, - * but with saved scrolled-off-the-top lines. This way, - * no previous line is lost, but we start with a whole - * screen to ourself. - */ - for (i = 1; i < sc_height; i++) - putchr('\n'); - } else - line_left(); + if (!(quit_if_one_screen && one_screen)) + { + if (!no_init) + { + ltputs(sc_init, sc_height, putchr); + term_init_done = 1; + } + if (!no_keypad) + ltputs(sc_s_keypad, sc_height, putchr); + if (mousecap) + init_mouse(); + } + init_done = 1; + if (top_scroll) + { + int i; + + /* + * This is nice to terminals with no alternate screen, + * but with saved scrolled-off-the-top lines. This way, + * no previous line is lost, but we start with a whole + * screen to ourself. + */ + for (i = 1; i < sc_height; i++) + putchr('\n'); + } else + line_left(); #else #if MSDOS_COMPILER==WIN32C - if (!(quit_if_one_screen && one_screen)) - { - if (!no_init) - { - win32_init_term(); - term_init_done = 1; - } - if (mousecap) - init_mouse(); + if (!(quit_if_one_screen && one_screen)) + { + if (!no_init) + { + win32_init_term(); + term_init_done = 1; + } + if (mousecap) + init_mouse(); - } - win32_init_vt_term(); + } + win32_init_vt_term(); #endif - init_done = 1; - initcolor(); - flush(); + init_done = 1; + initcolor(); + flush(); #endif } /* * Deinitialize terminal */ - public void + public void deinit(VOID_PARAM) { - if (!init_done) - return; + if (!init_done) + return; #if !MSDOS_COMPILER - if (!(quit_if_one_screen && one_screen)) - { - if (mousecap) - deinit_mouse(); - if (!no_keypad) - ltputs(sc_e_keypad, sc_height, putchr); - if (!no_init) - ltputs(sc_deinit, sc_height, putchr); - } + if (!(quit_if_one_screen && one_screen)) + { + if (mousecap) + deinit_mouse(); + if (!no_keypad) + ltputs(sc_e_keypad, sc_height, putchr); + if (!no_init) + ltputs(sc_deinit, sc_height, putchr); + } #else - /* Restore system colors. */ - SETCOLORS(sy_fg_color, sy_bg_color); + /* Restore system colors. */ + SETCOLORS(sy_fg_color, sy_bg_color); #if MSDOS_COMPILER==WIN32C - win32_deinit_vt_term(); - if (!(quit_if_one_screen && one_screen)) - { - if (mousecap) - deinit_mouse(); - if (!no_init) - win32_deinit_term(); - } + win32_deinit_vt_term(); + if (!(quit_if_one_screen && one_screen)) + { + if (mousecap) + deinit_mouse(); + if (!no_init) + win32_deinit_term(); + } #else - /* Need clreol to make SETCOLORS take effect. */ - clreol(); + /* Need clreol to make SETCOLORS take effect. */ + clreol(); #endif #endif - init_done = 0; + init_done = 0; } /* * Are we interactive (ie. writing to an initialized tty)? */ - public int + public int interactive(VOID_PARAM) { - return (is_tty && init_done); + return (is_tty && init_done); } - static void + static void assert_interactive(VOID_PARAM) { - if (interactive()) return; - /* abort(); */ + if (interactive()) return; + /* abort(); */ } /* * Home cursor (move to upper left corner of screen). */ - public void + public void home(VOID_PARAM) { - assert_interactive(); + assert_interactive(); #if !MSDOS_COMPILER - ltputs(sc_home, 1, putchr); + ltputs(sc_home, 1, putchr); #else - flush(); - _settextposition(1,1); + flush(); + _settextposition(1,1); #endif } @@ -1846,52 +1846,52 @@ home(VOID_PARAM) * Add a blank line (called with cursor at home). * Should scroll the display down. */ - public void + public void add_line(VOID_PARAM) { - assert_interactive(); + assert_interactive(); #if !MSDOS_COMPILER - ltputs(sc_addline, sc_height, putchr); + ltputs(sc_addline, sc_height, putchr); #else - flush(); + flush(); #if MSDOS_COMPILER==MSOFTC - _scrolltextwindow(_GSCROLLDOWN); - _settextposition(1,1); + _scrolltextwindow(_GSCROLLDOWN); + _settextposition(1,1); #else #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - movetext(1,1, sc_width,sc_height-1, 1,2); - gotoxy(1,1); - clreol(); + movetext(1,1, sc_width,sc_height-1, 1,2); + gotoxy(1,1); + clreol(); #else #if MSDOS_COMPILER==WIN32C { - CHAR_INFO fillchar; - SMALL_RECT rcSrc, rcClip; - COORD new_org; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(con_out,&csbi); - - /* The clip rectangle is the entire visible screen. */ - rcClip.Left = csbi.srWindow.Left; - rcClip.Top = csbi.srWindow.Top; - rcClip.Right = csbi.srWindow.Right; - rcClip.Bottom = csbi.srWindow.Bottom; - - /* The source rectangle is the visible screen minus the last line. */ - rcSrc = rcClip; - rcSrc.Bottom--; - - /* Move the top left corner of the source window down one row. */ - new_org.X = rcSrc.Left; - new_org.Y = rcSrc.Top + 1; - - /* Fill the right character and attributes. */ - fillchar.Char.AsciiChar = ' '; - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - fillchar.Attributes = curr_attr; - ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); - _settextposition(1,1); + CHAR_INFO fillchar; + SMALL_RECT rcSrc, rcClip; + COORD new_org; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(con_out,&csbi); + + /* The clip rectangle is the entire visible screen. */ + rcClip.Left = csbi.srWindow.Left; + rcClip.Top = csbi.srWindow.Top; + rcClip.Right = csbi.srWindow.Right; + rcClip.Bottom = csbi.srWindow.Bottom; + + /* The source rectangle is the visible screen minus the last line. */ + rcSrc = rcClip; + rcSrc.Bottom--; + + /* Move the top left corner of the source window down one row. */ + new_org.X = rcSrc.Left; + new_org.Y = rcSrc.Top + 1; + + /* Fill the right character and attributes. */ + fillchar.Char.AsciiChar = ' '; + curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); + fillchar.Attributes = curr_attr; + ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); + _settextposition(1,1); } #endif #endif @@ -1901,56 +1901,56 @@ add_line(VOID_PARAM) #if 0 /* - * Remove the n topmost lines and scroll everything below it in the - * window upward. This is needed to stop leaking the topmost line + * Remove the n topmost lines and scroll everything below it in the + * window upward. This is needed to stop leaking the topmost line * into the scrollback buffer when we go down-one-line (in WIN32). */ - public void + public void remove_top(n) - int n; + int n; { #if MSDOS_COMPILER==WIN32C - SMALL_RECT rcSrc, rcClip; - CHAR_INFO fillchar; - COORD new_org; - CONSOLE_SCREEN_BUFFER_INFO csbi; /* to get buffer info */ + SMALL_RECT rcSrc, rcClip; + CHAR_INFO fillchar; + COORD new_org; + CONSOLE_SCREEN_BUFFER_INFO csbi; /* to get buffer info */ - if (n >= sc_height - 1) - { - clear(); - home(); - return; - } + if (n >= sc_height - 1) + { + clear(); + home(); + return; + } - flush(); + flush(); - GetConsoleScreenBufferInfo(con_out, &csbi); + GetConsoleScreenBufferInfo(con_out, &csbi); - /* Get the extent of all-visible-rows-but-the-last. */ - rcSrc.Left = csbi.srWindow.Left; - rcSrc.Top = csbi.srWindow.Top + n; - rcSrc.Right = csbi.srWindow.Right; - rcSrc.Bottom = csbi.srWindow.Bottom; + /* Get the extent of all-visible-rows-but-the-last. */ + rcSrc.Left = csbi.srWindow.Left; + rcSrc.Top = csbi.srWindow.Top + n; + rcSrc.Right = csbi.srWindow.Right; + rcSrc.Bottom = csbi.srWindow.Bottom; - /* Get the clip rectangle. */ - rcClip.Left = rcSrc.Left; - rcClip.Top = csbi.srWindow.Top; - rcClip.Right = rcSrc.Right; - rcClip.Bottom = rcSrc.Bottom ; + /* Get the clip rectangle. */ + rcClip.Left = rcSrc.Left; + rcClip.Top = csbi.srWindow.Top; + rcClip.Right = rcSrc.Right; + rcClip.Bottom = rcSrc.Bottom ; - /* Move the source window up n rows. */ - new_org.X = rcSrc.Left; - new_org.Y = rcSrc.Top - n; + /* Move the source window up n rows. */ + new_org.X = rcSrc.Left; + new_org.Y = rcSrc.Top - n; - /* Fill the right character and attributes. */ - fillchar.Char.AsciiChar = ' '; - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - fillchar.Attributes = curr_attr; + /* Fill the right character and attributes. */ + fillchar.Char.AsciiChar = ' '; + curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); + fillchar.Attributes = curr_attr; - ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); + ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); - /* Position cursor on first blank line. */ - goto_line(sc_height - n - 1); + /* Position cursor on first blank line. */ + goto_line(sc_height - n - 1); #endif } #endif @@ -1959,193 +1959,193 @@ remove_top(n) /* * Clear the screen. */ - static void + static void win32_clear(VOID_PARAM) { - /* - * This will clear only the currently visible rows of the NT - * console buffer, which means none of the precious scrollback - * rows are touched making for faster scrolling. Note that, if - * the window has fewer columns than the console buffer (i.e. - * there is a horizontal scrollbar as well), the entire width - * of the visible rows will be cleared. - */ - COORD topleft; - DWORD nchars; - DWORD winsz; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - /* get the number of cells in the current buffer */ - GetConsoleScreenBufferInfo(con_out, &csbi); - winsz = csbi.dwSize.X * (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); - topleft.X = 0; - topleft.Y = csbi.srWindow.Top; - - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - FillConsoleOutputCharacter(con_out, ' ', winsz, topleft, &nchars); - FillConsoleOutputAttribute(con_out, curr_attr, winsz, topleft, &nchars); + /* + * This will clear only the currently visible rows of the NT + * console buffer, which means none of the precious scrollback + * rows are touched making for faster scrolling. Note that, if + * the window has fewer columns than the console buffer (i.e. + * there is a horizontal scrollbar as well), the entire width + * of the visible rows will be cleared. + */ + COORD topleft; + DWORD nchars; + DWORD winsz; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + /* get the number of cells in the current buffer */ + GetConsoleScreenBufferInfo(con_out, &csbi); + winsz = csbi.dwSize.X * (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); + topleft.X = 0; + topleft.Y = csbi.srWindow.Top; + + curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); + FillConsoleOutputCharacter(con_out, ' ', winsz, topleft, &nchars); + FillConsoleOutputAttribute(con_out, curr_attr, winsz, topleft, &nchars); } /* - * Remove the n topmost lines and scroll everything below it in the + * Remove the n topmost lines and scroll everything below it in the * window upward. */ - public void + public void win32_scroll_up(n) - int n; -{ - SMALL_RECT rcSrc, rcClip; - CHAR_INFO fillchar; - COORD topleft; - COORD new_org; - DWORD nchars; - DWORD size; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - if (n <= 0) - return; - - if (n >= sc_height - 1) - { - win32_clear(); - _settextposition(1,1); - return; - } - - /* Get the extent of what will remain visible after scrolling. */ - GetConsoleScreenBufferInfo(con_out, &csbi); - rcSrc.Left = csbi.srWindow.Left; - rcSrc.Top = csbi.srWindow.Top + n; - rcSrc.Right = csbi.srWindow.Right; - rcSrc.Bottom = csbi.srWindow.Bottom; - - /* Get the clip rectangle. */ - rcClip.Left = rcSrc.Left; - rcClip.Top = csbi.srWindow.Top; - rcClip.Right = rcSrc.Right; - rcClip.Bottom = rcSrc.Bottom ; - - /* Move the source text to the top of the screen. */ - new_org.X = rcSrc.Left; - new_org.Y = rcClip.Top; - - /* Fill the right character and attributes. */ - fillchar.Char.AsciiChar = ' '; - fillchar.Attributes = MAKEATTR(nm_fg_color, nm_bg_color); - - /* Scroll the window. */ - SetConsoleTextAttribute(con_out, fillchar.Attributes); - ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); - - /* Clear remaining lines at bottom. */ - topleft.X = csbi.dwCursorPosition.X; - topleft.Y = rcSrc.Bottom - n; - size = (n * csbi.dwSize.X) + (rcSrc.Right - topleft.X); - FillConsoleOutputCharacter(con_out, ' ', size, topleft, - &nchars); - FillConsoleOutputAttribute(con_out, fillchar.Attributes, size, topleft, - &nchars); - SetConsoleTextAttribute(con_out, curr_attr); - - /* Move cursor n lines up from where it was. */ - csbi.dwCursorPosition.Y -= n; - SetConsoleCursorPosition(con_out, csbi.dwCursorPosition); + int n; +{ + SMALL_RECT rcSrc, rcClip; + CHAR_INFO fillchar; + COORD topleft; + COORD new_org; + DWORD nchars; + DWORD size; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + if (n <= 0) + return; + + if (n >= sc_height - 1) + { + win32_clear(); + _settextposition(1,1); + return; + } + + /* Get the extent of what will remain visible after scrolling. */ + GetConsoleScreenBufferInfo(con_out, &csbi); + rcSrc.Left = csbi.srWindow.Left; + rcSrc.Top = csbi.srWindow.Top + n; + rcSrc.Right = csbi.srWindow.Right; + rcSrc.Bottom = csbi.srWindow.Bottom; + + /* Get the clip rectangle. */ + rcClip.Left = rcSrc.Left; + rcClip.Top = csbi.srWindow.Top; + rcClip.Right = rcSrc.Right; + rcClip.Bottom = rcSrc.Bottom ; + + /* Move the source text to the top of the screen. */ + new_org.X = rcSrc.Left; + new_org.Y = rcClip.Top; + + /* Fill the right character and attributes. */ + fillchar.Char.AsciiChar = ' '; + fillchar.Attributes = MAKEATTR(nm_fg_color, nm_bg_color); + + /* Scroll the window. */ + SetConsoleTextAttribute(con_out, fillchar.Attributes); + ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); + + /* Clear remaining lines at bottom. */ + topleft.X = csbi.dwCursorPosition.X; + topleft.Y = rcSrc.Bottom - n; + size = (n * csbi.dwSize.X) + (rcSrc.Right - topleft.X); + FillConsoleOutputCharacter(con_out, ' ', size, topleft, + &nchars); + FillConsoleOutputAttribute(con_out, fillchar.Attributes, size, topleft, + &nchars); + SetConsoleTextAttribute(con_out, curr_attr); + + /* Move cursor n lines up from where it was. */ + csbi.dwCursorPosition.Y -= n; + SetConsoleCursorPosition(con_out, csbi.dwCursorPosition); } #endif /* * Move cursor to lower left corner of screen. */ - public void + public void lower_left(VOID_PARAM) { - assert_interactive(); + assert_interactive(); #if !MSDOS_COMPILER - ltputs(sc_lower_left, 1, putchr); + ltputs(sc_lower_left, 1, putchr); #else - flush(); - _settextposition(sc_height, 1); + flush(); + _settextposition(sc_height, 1); #endif } /* * Move cursor to left position of current line. */ - public void + public void line_left(VOID_PARAM) { - assert_interactive(); + assert_interactive(); #if !MSDOS_COMPILER - ltputs(sc_return, 1, putchr); + ltputs(sc_return, 1, putchr); #else - { - int row; - flush(); + { + int row; + flush(); #if MSDOS_COMPILER==WIN32C - { - CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); - row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1; - } + { + CONSOLE_SCREEN_BUFFER_INFO scr; + GetConsoleScreenBufferInfo(con_out, &scr); + row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1; + } #else #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - row = wherey(); + row = wherey(); #else - { - struct rccoord tpos = _gettextposition(); - row = tpos.row; - } + { + struct rccoord tpos = _gettextposition(); + row = tpos.row; + } #endif #endif - _settextposition(row, 1); - } + _settextposition(row, 1); + } #endif } /* - * Check if the console size has changed and reset internals + * Check if the console size has changed and reset internals * (in lieu of SIGWINCH for WIN32). */ - public void + public void check_winch(VOID_PARAM) { #if MSDOS_COMPILER==WIN32C - CONSOLE_SCREEN_BUFFER_INFO scr; - COORD size; - - if (con_out == INVALID_HANDLE_VALUE) - return; - - flush(); - GetConsoleScreenBufferInfo(con_out, &scr); - size.Y = scr.srWindow.Bottom - scr.srWindow.Top + 1; - size.X = scr.srWindow.Right - scr.srWindow.Left + 1; - if (size.Y != sc_height || size.X != sc_width) - { - sc_height = size.Y; - sc_width = size.X; - if (!no_init && con_out_ours == con_out) - SetConsoleScreenBufferSize(con_out, size); - pos_init(); - wscroll = (sc_height + 1) / 2; - screen_trashed = 1; - } + CONSOLE_SCREEN_BUFFER_INFO scr; + COORD size; + + if (con_out == INVALID_HANDLE_VALUE) + return; + + flush(); + GetConsoleScreenBufferInfo(con_out, &scr); + size.Y = scr.srWindow.Bottom - scr.srWindow.Top + 1; + size.X = scr.srWindow.Right - scr.srWindow.Left + 1; + if (size.Y != sc_height || size.X != sc_width) + { + sc_height = size.Y; + sc_width = size.X; + if (!no_init && con_out_ours == con_out) + SetConsoleScreenBufferSize(con_out, size); + pos_init(); + wscroll = (sc_height + 1) / 2; + screen_trashed = 1; + } #endif } /* * Goto a specific line on the screen. */ - public void + public void goto_line(sindex) - int sindex; + int sindex; { - assert_interactive(); + assert_interactive(); #if !MSDOS_COMPILER - ltputs(tgoto(sc_move, 0, sindex), 1, putchr); + ltputs(tgoto(sc_move, 0, sindex), 1, putchr); #else - flush(); - _settextposition(sindex+1, 1); + flush(); + _settextposition(sindex+1, 1); #endif } @@ -2156,107 +2156,107 @@ goto_line(sindex) * briefly and then switching back to the normal screen. * {{ Yuck! There must be a better way to get a visual bell. }} */ - static void + static void create_flash(VOID_PARAM) { #if MSDOS_COMPILER==MSOFTC - struct videoconfig w; - char *blanks; - int row, col; - - _getvideoconfig(&w); - videopages = w.numvideopages; - if (videopages < 2) - { - at_enter(AT_STANDOUT); - at_exit(); - } else - { - _setactivepage(1); - at_enter(AT_STANDOUT); - blanks = (char *) ecalloc(w.numtextcols, sizeof(char)); - for (col = 0; col < w.numtextcols; col++) - blanks[col] = ' '; - for (row = w.numtextrows; row > 0; row--) - _outmem(blanks, w.numtextcols); - _setactivepage(0); - _setvisualpage(0); - free(blanks); - at_exit(); - } + struct videoconfig w; + char *blanks; + int row, col; + + _getvideoconfig(&w); + videopages = w.numvideopages; + if (videopages < 2) + { + at_enter(AT_STANDOUT); + at_exit(); + } else + { + _setactivepage(1); + at_enter(AT_STANDOUT); + blanks = (char *) ecalloc(w.numtextcols, sizeof(char)); + for (col = 0; col < w.numtextcols; col++) + blanks[col] = ' '; + for (row = w.numtextrows; row > 0; row--) + _outmem(blanks, w.numtextcols); + _setactivepage(0); + _setvisualpage(0); + free(blanks); + at_exit(); + } #else #if MSDOS_COMPILER==BORLANDC - int n; + int n; - whitescreen = (unsigned short *) - malloc(sc_width * sc_height * sizeof(short)); - if (whitescreen == NULL) - return; - for (n = 0; n < sc_width * sc_height; n++) - whitescreen[n] = 0x7020; + whitescreen = (unsigned short *) + malloc(sc_width * sc_height * sizeof(short)); + if (whitescreen == NULL) + return; + for (n = 0; n < sc_width * sc_height; n++) + whitescreen[n] = 0x7020; #endif #endif - flash_created = 1; + flash_created = 1; } #endif /* MSDOS_COMPILER */ /* * Output the "visual bell", if there is one. */ - public void + public void vbell(VOID_PARAM) { #if !MSDOS_COMPILER - if (*sc_visual_bell == '\0') - return; - ltputs(sc_visual_bell, sc_height, putchr); + if (*sc_visual_bell == '\0') + return; + ltputs(sc_visual_bell, sc_height, putchr); #else #if MSDOS_COMPILER==DJGPPC - ScreenVisualBell(); + ScreenVisualBell(); #else #if MSDOS_COMPILER==MSOFTC - /* - * Create a flash screen on the second video page. - * Switch to that page, then switch back. - */ - if (!flash_created) - create_flash(); - if (videopages < 2) - return; - _setvisualpage(1); - delay(100); - _setvisualpage(0); + /* + * Create a flash screen on the second video page. + * Switch to that page, then switch back. + */ + if (!flash_created) + create_flash(); + if (videopages < 2) + return; + _setvisualpage(1); + delay(100); + _setvisualpage(0); #else #if MSDOS_COMPILER==BORLANDC - unsigned short *currscreen; - - /* - * Get a copy of the current screen. - * Display the flash screen. - * Then restore the old screen. - */ - if (!flash_created) - create_flash(); - if (whitescreen == NULL) - return; - currscreen = (unsigned short *) - malloc(sc_width * sc_height * sizeof(short)); - if (currscreen == NULL) return; - gettext(1, 1, sc_width, sc_height, currscreen); - puttext(1, 1, sc_width, sc_height, whitescreen); - delay(100); - puttext(1, 1, sc_width, sc_height, currscreen); - free(currscreen); + unsigned short *currscreen; + + /* + * Get a copy of the current screen. + * Display the flash screen. + * Then restore the old screen. + */ + if (!flash_created) + create_flash(); + if (whitescreen == NULL) + return; + currscreen = (unsigned short *) + malloc(sc_width * sc_height * sizeof(short)); + if (currscreen == NULL) return; + gettext(1, 1, sc_width, sc_height, currscreen); + puttext(1, 1, sc_width, sc_height, whitescreen); + delay(100); + puttext(1, 1, sc_width, sc_height, currscreen); + free(currscreen); #else #if MSDOS_COMPILER==WIN32C - /* paint screen with an inverse color */ - clear(); + /* paint screen with an inverse color */ + clear(); - /* leave it displayed for 100 msec. */ - Sleep(100); + /* leave it displayed for 100 msec. */ + Sleep(100); - /* restore with a redraw */ - repaint(); + /* restore with a redraw */ + repaint(); #endif #endif #endif @@ -2267,16 +2267,16 @@ vbell(VOID_PARAM) /* * Make a noise. */ - static void + static void beep(VOID_PARAM) { #if !MSDOS_COMPILER - putchr(CONTROL('G')); + putchr(CONTROL('G')); #else #if MSDOS_COMPILER==WIN32C - MessageBeep(0); + MessageBeep(0); #else - write(1, "\7", 1); + write(1, "\7", 1); #endif #endif } @@ -2284,30 +2284,30 @@ beep(VOID_PARAM) /* * Ring the terminal bell. */ - public void + public void bell(VOID_PARAM) { - if (quiet == VERY_QUIET) - vbell(); - else - beep(); + if (quiet == VERY_QUIET) + vbell(); + else + beep(); } /* * Clear the screen. */ - public void + public void clear(VOID_PARAM) { - assert_interactive(); + assert_interactive(); #if !MSDOS_COMPILER - ltputs(sc_clear, sc_height, putchr); + ltputs(sc_clear, sc_height, putchr); #else - flush(); + flush(); #if MSDOS_COMPILER==WIN32C - win32_clear(); + win32_clear(); #else - _clearscreen(_GCLEARSCREEN); + _clearscreen(_GCLEARSCREEN); #endif #endif } @@ -2316,56 +2316,56 @@ clear(VOID_PARAM) * Clear from the cursor to the end of the cursor's line. * {{ This must not move the cursor. }} */ - public void + public void clear_eol(VOID_PARAM) { - /* assert_interactive();*/ + /* assert_interactive();*/ #if !MSDOS_COMPILER - ltputs(sc_eol_clear, 1, putchr); + ltputs(sc_eol_clear, 1, putchr); #else #if MSDOS_COMPILER==MSOFTC - short top, left; - short bot, right; - struct rccoord tpos; - - flush(); - /* - * Save current state. - */ - tpos = _gettextposition(); - _gettextwindow(&top, &left, &bot, &right); - /* - * Set a temporary window to the current line, - * from the cursor's position to the right edge of the screen. - * Then clear that window. - */ - _settextwindow(tpos.row, tpos.col, tpos.row, sc_width); - _clearscreen(_GWINDOW); - /* - * Restore state. - */ - _settextwindow(top, left, bot, right); - _settextposition(tpos.row, tpos.col); + short top, left; + short bot, right; + struct rccoord tpos; + + flush(); + /* + * Save current state. + */ + tpos = _gettextposition(); + _gettextwindow(&top, &left, &bot, &right); + /* + * Set a temporary window to the current line, + * from the cursor's position to the right edge of the screen. + * Then clear that window. + */ + _settextwindow(tpos.row, tpos.col, tpos.row, sc_width); + _clearscreen(_GWINDOW); + /* + * Restore state. + */ + _settextwindow(top, left, bot, right); + _settextposition(tpos.row, tpos.col); #else #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - flush(); - clreol(); + flush(); + clreol(); #else #if MSDOS_COMPILER==WIN32C - DWORD nchars; - COORD cpos; - CONSOLE_SCREEN_BUFFER_INFO scr; + DWORD nchars; + COORD cpos; + CONSOLE_SCREEN_BUFFER_INFO scr; - flush(); - memset(&scr, 0, sizeof(scr)); - GetConsoleScreenBufferInfo(con_out, &scr); - cpos.X = scr.dwCursorPosition.X; - cpos.Y = scr.dwCursorPosition.Y; - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - FillConsoleOutputAttribute(con_out, curr_attr, - scr.dwSize.X - cpos.X, cpos, &nchars); - FillConsoleOutputCharacter(con_out, ' ', - scr.dwSize.X - cpos.X, cpos, &nchars); + flush(); + memset(&scr, 0, sizeof(scr)); + GetConsoleScreenBufferInfo(con_out, &scr); + cpos.X = scr.dwCursorPosition.X; + cpos.Y = scr.dwCursorPosition.Y; + curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); + FillConsoleOutputAttribute(con_out, curr_attr, + scr.dwSize.X - cpos.X, cpos, &nchars); + FillConsoleOutputCharacter(con_out, ' ', + scr.dwSize.X - cpos.X, cpos, &nchars); #endif #endif #endif @@ -2376,17 +2376,17 @@ clear_eol(VOID_PARAM) * Clear the current line. * Clear the screen if there's off-screen memory below the display. */ - static void + static void clear_eol_bot(VOID_PARAM) { - assert_interactive(); + assert_interactive(); #if MSDOS_COMPILER - clear_eol(); + clear_eol(); #else - if (below_mem) - ltputs(sc_eos_clear, 1, putchr); - else - ltputs(sc_eol_clear, 1, putchr); + if (below_mem) + ltputs(sc_eos_clear, 1, putchr); + else + ltputs(sc_eol_clear, 1, putchr); #endif } @@ -2394,29 +2394,29 @@ clear_eol_bot(VOID_PARAM) * Clear the bottom line of the display. * Leave the cursor at the beginning of the bottom line. */ - public void + public void clear_bot(VOID_PARAM) { - /* - * If we're in a non-normal attribute mode, temporarily exit - * the mode while we do the clear. Some terminals fill the - * cleared area with the current attribute. - */ - if (oldbot) - lower_left(); - else - line_left(); - - if (attrmode == AT_NORMAL) - clear_eol_bot(); - else - { - int saved_attrmode = attrmode; + /* + * If we're in a non-normal attribute mode, temporarily exit + * the mode while we do the clear. Some terminals fill the + * cleared area with the current attribute. + */ + if (oldbot) + lower_left(); + else + line_left(); + + if (attrmode == AT_NORMAL) + clear_eol_bot(); + else + { + int saved_attrmode = attrmode; - at_exit(); - clear_eol_bot(); - at_enter(saved_attrmode); - } + at_exit(); + clear_eol_bot(); + at_enter(saved_attrmode); + } } /* @@ -2428,52 +2428,52 @@ clear_bot(VOID_PARAM) /* * Parse a 4-bit color char. */ - static int + static int parse_color4(ch) - char ch; -{ - switch (ch) - { - case 'k': return 0; - case 'r': return CV_RED; - case 'g': return CV_GREEN; - case 'y': return CV_RED|CV_GREEN; - case 'b': return CV_BLUE; - case 'm': return CV_RED|CV_BLUE; - case 'c': return CV_GREEN|CV_BLUE; - case 'w': return CV_RED|CV_GREEN|CV_BLUE; - case 'K': return 0|CV_BRIGHT; - case 'R': return CV_RED|CV_BRIGHT; - case 'G': return CV_GREEN|CV_BRIGHT; - case 'Y': return CV_RED|CV_GREEN|CV_BRIGHT; - case 'B': return CV_BLUE|CV_BRIGHT; - case 'M': return CV_RED|CV_BLUE|CV_BRIGHT; - case 'C': return CV_GREEN|CV_BLUE|CV_BRIGHT; - case 'W': return CV_RED|CV_GREEN|CV_BLUE|CV_BRIGHT; - case '-': return CV_NOCHANGE; - default: return CV_ERROR; - } + char ch; +{ + switch (ch) + { + case 'k': return 0; + case 'r': return CV_RED; + case 'g': return CV_GREEN; + case 'y': return CV_RED|CV_GREEN; + case 'b': return CV_BLUE; + case 'm': return CV_RED|CV_BLUE; + case 'c': return CV_GREEN|CV_BLUE; + case 'w': return CV_RED|CV_GREEN|CV_BLUE; + case 'K': return 0|CV_BRIGHT; + case 'R': return CV_RED|CV_BRIGHT; + case 'G': return CV_GREEN|CV_BRIGHT; + case 'Y': return CV_RED|CV_GREEN|CV_BRIGHT; + case 'B': return CV_BLUE|CV_BRIGHT; + case 'M': return CV_RED|CV_BLUE|CV_BRIGHT; + case 'C': return CV_GREEN|CV_BLUE|CV_BRIGHT; + case 'W': return CV_RED|CV_GREEN|CV_BLUE|CV_BRIGHT; + case '-': return CV_NOCHANGE; + default: return CV_ERROR; + } } /* * Parse a color as a decimal integer. */ - static int + static int parse_color6(ps) - char **ps; -{ - if (**ps == '-') - { - (*ps)++; - return CV_NOCHANGE; - } else - { - char *ops = *ps; - int color = lstrtoi(ops, ps); - if (*ps == ops) - return CV_ERROR; - return color; - } + char **ps; +{ + if (**ps == '-') + { + (*ps)++; + return CV_NOCHANGE; + } else + { + char *ops = *ps; + int color = lstrtoi(ops, ps); + if (*ps == ops) + return CV_ERROR; + return color; + } } /* @@ -2482,550 +2482,549 @@ parse_color6(ps) * CV_4BIT: fg/bg values are OR of CV_{RGB} bits. * CV_6BIT: fg/bg values are integers entered by user. */ - public COLOR_TYPE + public COLOR_TYPE parse_color(str, p_fg, p_bg) - char *str; - int *p_fg; - int *p_bg; -{ - int fg; - int bg; - COLOR_TYPE type = CT_NULL; - - if (str == NULL || *str == '\0') - return CT_NULL; - if (*str == '+') - str++; /* ignore leading + */ - - fg = parse_color4(str[0]); - bg = parse_color4((strlen(str) < 2) ? '-' : str[1]); - if (fg != CV_ERROR && bg != CV_ERROR) - type = CT_4BIT; - else - { - fg = parse_color6(&str); - bg = (fg != CV_ERROR && *str++ == '.') ? parse_color6(&str) : CV_NOCHANGE; - if (fg != CV_ERROR && bg != CV_ERROR) - type = CT_6BIT; - } - if (p_fg != NULL) *p_fg = fg; - if (p_bg != NULL) *p_bg = bg; - return type; + char *str; + int *p_fg; + int *p_bg; +{ + int fg; + int bg; + COLOR_TYPE type = CT_NULL; + + if (str == NULL || *str == '\0') + return CT_NULL; + if (*str == '+') + str++; /* ignore leading + */ + + fg = parse_color4(str[0]); + bg = parse_color4((strlen(str) < 2) ? '-' : str[1]); + if (fg != CV_ERROR && bg != CV_ERROR) + type = CT_4BIT; + else + { + fg = parse_color6(&str); + bg = (fg != CV_ERROR && *str++ == '.') ? parse_color6(&str) : CV_NOCHANGE; + if (fg != CV_ERROR && bg != CV_ERROR) + type = CT_6BIT; + } + if (p_fg != NULL) *p_fg = fg; + if (p_bg != NULL) *p_bg = bg; + return type; } #if !MSDOS_COMPILER - static int + static int sgr_color(color) - int color; -{ - switch (color) - { - case 0: return 30; - case CV_RED: return 31; - case CV_GREEN: return 32; - case CV_RED|CV_GREEN: return 33; - case CV_BLUE: return 34; - case CV_RED|CV_BLUE: return 35; - case CV_GREEN|CV_BLUE: return 36; - case CV_RED|CV_GREEN|CV_BLUE: return 37; - - case CV_BRIGHT: return 90; - case CV_RED|CV_BRIGHT: return 91; - case CV_GREEN|CV_BRIGHT: return 92; - case CV_RED|CV_GREEN|CV_BRIGHT: return 93; - case CV_BLUE|CV_BRIGHT: return 94; - case CV_RED|CV_BLUE|CV_BRIGHT: return 95; - case CV_GREEN|CV_BLUE|CV_BRIGHT: return 96; - case CV_RED|CV_GREEN|CV_BLUE|CV_BRIGHT: return 97; - - default: return color; - } -} - - static void + int color; +{ + switch (color) + { + case 0: return 30; + case CV_RED: return 31; + case CV_GREEN: return 32; + case CV_RED|CV_GREEN: return 33; + case CV_BLUE: return 34; + case CV_RED|CV_BLUE: return 35; + case CV_GREEN|CV_BLUE: return 36; + case CV_RED|CV_GREEN|CV_BLUE: return 37; + + case CV_BRIGHT: return 90; + case CV_RED|CV_BRIGHT: return 91; + case CV_GREEN|CV_BRIGHT: return 92; + case CV_RED|CV_GREEN|CV_BRIGHT: return 93; + case CV_BLUE|CV_BRIGHT: return 94; + case CV_RED|CV_BLUE|CV_BRIGHT: return 95; + case CV_GREEN|CV_BLUE|CV_BRIGHT: return 96; + case CV_RED|CV_GREEN|CV_BLUE|CV_BRIGHT: return 97; + + default: return color; + } +} + + static void tput_fmt(fmt, color, f_putc) - char *fmt; - int color; - int (*f_putc)(int); + char *fmt; + int color; + int (*f_putc)(int); { - char buf[INT_STRLEN_BOUND(int)+16]; - if (color == attrcolor) - return; - SNPRINTF1(buf, sizeof(buf), fmt, color); - ltputs(buf, 1, f_putc); - attrcolor = color; + char buf[INT_STRLEN_BOUND(int)+16]; + if (color == attrcolor) + return; + SNPRINTF1(buf, sizeof(buf), fmt, color); + ltputs(buf, 1, f_putc); + attrcolor = color; } - static void + static void tput_color(str, f_putc) - char *str; - int (*f_putc)(int); -{ - int fg; - int bg; - - if (str != NULL && strcmp(str, "*") == 0) - { - /* Special case: reset to normal */ - tput_fmt(ESCS"[m", -1, f_putc); - return; - } - switch (parse_color(str, &fg, &bg)) - { - case CT_4BIT: - if (fg >= 0) - tput_fmt(ESCS"[%dm", sgr_color(fg), f_putc); - if (bg >= 0) - tput_fmt(ESCS"[%dm", sgr_color(bg)+10, f_putc); - break; - case CT_6BIT: - if (fg >= 0) - tput_fmt(ESCS"[38;5;%dm", fg, f_putc); - if (bg >= 0) - tput_fmt(ESCS"[48;5;%dm", bg, f_putc); - break; - default: - break; - } -} - - static void + char *str; + int (*f_putc)(int); +{ + int fg; + int bg; + + if (str != NULL && strcmp(str, "*") == 0) + { + /* Special case: reset to normal */ + tput_fmt(ESCS"[m", -1, f_putc); + return; + } + switch (parse_color(str, &fg, &bg)) + { + case CT_4BIT: + if (fg >= 0) + tput_fmt(ESCS"[%dm", sgr_color(fg), f_putc); + if (bg >= 0) + tput_fmt(ESCS"[%dm", sgr_color(bg)+10, f_putc); + break; + case CT_6BIT: + if (fg >= 0) + tput_fmt(ESCS"[38;5;%dm", fg, f_putc); + if (bg >= 0) + tput_fmt(ESCS"[48;5;%dm", bg, f_putc); + break; + default: + break; + } +} + + static void tput_inmode(mode_str, attr, attr_bit, f_putc) - char *mode_str; - int attr; - int attr_bit; - int (*f_putc)(int); -{ - char *color_str; - if ((attr & attr_bit) == 0) - return; - color_str = get_color_map(attr_bit); - if (color_str == NULL || *color_str == '\0' || *color_str == '+') - { - ltputs(mode_str, 1, f_putc); - if (color_str == NULL || *color_str++ != '+') - return; - } - /* Color overrides mode string */ - tput_color(color_str, f_putc); -} - - static void + char *mode_str; + int attr; + int attr_bit; + int (*f_putc)(int); +{ + char *color_str; + if ((attr & attr_bit) == 0) + return; + color_str = get_color_map(attr_bit); + if (color_str == NULL || *color_str == '\0' || *color_str == '+') + { + ltputs(mode_str, 1, f_putc); + if (color_str == NULL || *color_str++ != '+') + return; + } + /* Color overrides mode string */ + tput_color(color_str, f_putc); +} + + static void tput_outmode(mode_str, attr_bit, f_putc) - char *mode_str; - int attr_bit; - int (*f_putc)(int); + char *mode_str; + int attr_bit; + int (*f_putc)(int); { - if ((attrmode & attr_bit) == 0) - return; - ltputs(mode_str, 1, f_putc); + if ((attrmode & attr_bit) == 0) + return; + ltputs(mode_str, 1, f_putc); } #else /* MSDOS_COMPILER */ #if MSDOS_COMPILER==WIN32C - static int + static int WIN32put_fmt(fmt, color) - char *fmt; - int color; + char *fmt; + int color; { - char buf[INT_STRLEN_BOUND(int)+16]; - int len = SNPRINTF1(buf, sizeof(buf), fmt, color); - WIN32textout(buf, len); - return TRUE; + char buf[INT_STRLEN_BOUND(int)+16]; + int len = SNPRINTF1(buf, sizeof(buf), fmt, color); + WIN32textout(buf, len); + return TRUE; } #endif - static int + static int win_set_color(attr) - int attr; -{ - int fg; - int bg; - int out = FALSE; - char *str = get_color_map(attr); - if (str == NULL || str[0] == '\0') - return FALSE; - switch (parse_color(str, &fg, &bg)) - { - case CT_4BIT: - if (fg >= 0 && bg >= 0) - { - SETCOLORS(fg, bg); - out = TRUE; - } else if (fg >= 0) - { - SET_FG_COLOR(fg); - out = TRUE; - } else if (bg >= 0) - { - SET_BG_COLOR(bg); - out = TRUE; - } - break; + int attr; +{ + int fg; + int bg; + int out = FALSE; + char *str = get_color_map(attr); + if (str == NULL || str[0] == '\0') + return FALSE; + switch (parse_color(str, &fg, &bg)) + { + case CT_4BIT: + if (fg >= 0 && bg >= 0) + { + SETCOLORS(fg, bg); + out = TRUE; + } else if (fg >= 0) + { + SET_FG_COLOR(fg); + out = TRUE; + } else if (bg >= 0) + { + SET_BG_COLOR(bg); + out = TRUE; + } + break; #if MSDOS_COMPILER==WIN32C - case CT_6BIT: - if (vt_enabled) - { - if (fg > 0) - out = WIN32put_fmt(ESCS"[38;5;%dm", fg); - if (bg > 0) - out = WIN32put_fmt(ESCS"[48;5;%dm", bg); - } - break; -#endif - default: - break; - } - return out; + case CT_6BIT: + if (vt_enabled) + { + if (fg > 0) + out = WIN32put_fmt(ESCS"[38;5;%dm", fg); + if (bg > 0) + out = WIN32put_fmt(ESCS"[48;5;%dm", bg); + } + break; +#endif + default: + break; + } + return out; } #endif /* MSDOS_COMPILER */ - public void + public void at_enter(attr) - int attr; + int attr; { - attr = apply_at_specials(attr); + attr = apply_at_specials(attr); #if !MSDOS_COMPILER - /* The one with the most priority is last. */ - tput_inmode(sc_u_in, attr, AT_UNDERLINE, putchr); - tput_inmode(sc_b_in, attr, AT_BOLD, putchr); - tput_inmode(sc_bl_in, attr, AT_BLINK, putchr); - /* Don't use standout and color at the same time. */ - if (use_color && (attr & AT_COLOR)) - tput_color(get_color_map(attr), putchr); - else - tput_inmode(sc_s_in, attr, AT_STANDOUT, putchr); + /* The one with the most priority is last. */ + tput_inmode(sc_u_in, attr, AT_UNDERLINE, putchr); + tput_inmode(sc_b_in, attr, AT_BOLD, putchr); + tput_inmode(sc_bl_in, attr, AT_BLINK, putchr); + /* Don't use standout and color at the same time. */ + if (use_color && (attr & AT_COLOR)) + tput_color(get_color_map(attr), putchr); + else + tput_inmode(sc_s_in, attr, AT_STANDOUT, putchr); #else - flush(); - /* The one with the most priority is first. */ - if ((attr & AT_COLOR) && use_color) - { - win_set_color(attr); - } else if (attr & AT_STANDOUT) - { - SETCOLORS(so_fg_color, so_bg_color); - } else if (attr & AT_BLINK) - { - SETCOLORS(bl_fg_color, bl_bg_color); - } else if (attr & AT_BOLD) - { - SETCOLORS(bo_fg_color, bo_bg_color); - } else if (attr & AT_UNDERLINE) - { - SETCOLORS(ul_fg_color, ul_bg_color); - } -#endif - attrmode = attr; -} - - public void + flush(); + /* The one with the most priority is first. */ + if ((attr & AT_COLOR) && use_color) + { + win_set_color(attr); + } else if (attr & AT_STANDOUT) + { + SETCOLORS(so_fg_color, so_bg_color); + } else if (attr & AT_BLINK) + { + SETCOLORS(bl_fg_color, bl_bg_color); + } else if (attr & AT_BOLD) + { + SETCOLORS(bo_fg_color, bo_bg_color); + } else if (attr & AT_UNDERLINE) + { + SETCOLORS(ul_fg_color, ul_bg_color); + } +#endif + attrmode = attr; +} + + public void at_exit(VOID_PARAM) { #if !MSDOS_COMPILER - /* Undo things in the reverse order we did them. */ - tput_color("*", putchr); - tput_outmode(sc_s_out, AT_STANDOUT, putchr); - tput_outmode(sc_bl_out, AT_BLINK, putchr); - tput_outmode(sc_b_out, AT_BOLD, putchr); - tput_outmode(sc_u_out, AT_UNDERLINE, putchr); + /* Undo things in the reverse order we did them. */ + tput_color("*", putchr); + tput_outmode(sc_s_out, AT_STANDOUT, putchr); + tput_outmode(sc_bl_out, AT_BLINK, putchr); + tput_outmode(sc_b_out, AT_BOLD, putchr); + tput_outmode(sc_u_out, AT_UNDERLINE, putchr); #else - flush(); - SETCOLORS(nm_fg_color, nm_bg_color); + flush(); + SETCOLORS(nm_fg_color, nm_bg_color); #endif - attrmode = AT_NORMAL; + attrmode = AT_NORMAL; } - public void + public void at_switch(attr) - int attr; + int attr; { - int new_attrmode = apply_at_specials(attr); - int ignore_modes = AT_ANSI; + int new_attrmode = apply_at_specials(attr); + int ignore_modes = AT_ANSI; - if ((new_attrmode & ~ignore_modes) != (attrmode & ~ignore_modes)) - { - at_exit(); - at_enter(attr); - } + if ((new_attrmode & ~ignore_modes) != (attrmode & ~ignore_modes)) + { + at_exit(); + at_enter(attr); + } } - public int + public int is_at_equiv(attr1, attr2) - int attr1; - int attr2; + int attr1; + int attr2; { - attr1 = apply_at_specials(attr1); - attr2 = apply_at_specials(attr2); + attr1 = apply_at_specials(attr1); + attr2 = apply_at_specials(attr2); - return (attr1 == attr2); + return (attr1 == attr2); } - public int + public int apply_at_specials(attr) - int attr; + int attr; { - if (attr & AT_BINARY) - attr |= binattr; - if (attr & AT_HILITE) - attr |= AT_STANDOUT; - attr &= ~(AT_BINARY|AT_HILITE); + if (attr & AT_BINARY) + attr |= binattr; + if (attr & AT_HILITE) + attr |= AT_STANDOUT; + attr &= ~(AT_BINARY|AT_HILITE); - return attr; + return attr; } /* * Output a plain backspace, without erasing the previous char. */ - public void + public void putbs(VOID_PARAM) { - if (termcap_debug) - putstr(""); - else - { + if (termcap_debug) + putstr(""); + else + { #if !MSDOS_COMPILER - ltputs(sc_backspace, 1, putchr); + ltputs(sc_backspace, 1, putchr); #else - int row, col; + int row, col; - flush(); - { + flush(); + { #if MSDOS_COMPILER==MSOFTC - struct rccoord tpos; - tpos = _gettextposition(); - row = tpos.row; - col = tpos.col; + struct rccoord tpos; + tpos = _gettextposition(); + row = tpos.row; + col = tpos.col; #else #if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - row = wherey(); - col = wherex(); + row = wherey(); + col = wherex(); #else #if MSDOS_COMPILER==WIN32C - CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); - row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1; - col = scr.dwCursorPosition.X - scr.srWindow.Left + 1; + CONSOLE_SCREEN_BUFFER_INFO scr; + GetConsoleScreenBufferInfo(con_out, &scr); + row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1; + col = scr.dwCursorPosition.X - scr.srWindow.Left + 1; #endif #endif #endif - } - if (col <= 1) - return; - _settextposition(row, col-1); + } + if (col <= 1) + return; + _settextposition(row, col-1); #endif /* MSDOS_COMPILER */ - } + } } #if MSDOS_COMPILER==WIN32C /* * Determine whether an input character is waiting to be read. */ - public int + public int win32_kbhit(VOID_PARAM) { - INPUT_RECORD ip; - DWORD read; - - if (keyCount > 0) - return (TRUE); - - currentKey.ascii = 0; - currentKey.scan = 0; - - if (x11mouseCount > 0) - { - currentKey.ascii = x11mousebuf[x11mousePos++]; - --x11mouseCount; - keyCount = 1; - return (TRUE); - } - - /* - * Wait for a real key-down event, but - * ignore SHIFT and CONTROL key events. - */ - do - { - PeekConsoleInputW(tty, &ip, 1, &read); - if (read == 0) - return (FALSE); - ReadConsoleInputW(tty, &ip, 1, &read); - /* generate an X11 mouse sequence from the mouse event */ - if (mousecap && ip.EventType == MOUSE_EVENT && - ip.Event.MouseEvent.dwEventFlags != MOUSE_MOVED) - { - x11mousebuf[3] = X11MOUSE_OFFSET + ip.Event.MouseEvent.dwMousePosition.X + 1; - x11mousebuf[4] = X11MOUSE_OFFSET + ip.Event.MouseEvent.dwMousePosition.Y + 1; - switch (ip.Event.MouseEvent.dwEventFlags) - { - case 0: /* press or release */ - if (ip.Event.MouseEvent.dwButtonState == 0) - x11mousebuf[2] = X11MOUSE_OFFSET + X11MOUSE_BUTTON_REL; - else if (ip.Event.MouseEvent.dwButtonState & (FROM_LEFT_3RD_BUTTON_PRESSED | FROM_LEFT_4TH_BUTTON_PRESSED)) - continue; - else - x11mousebuf[2] = X11MOUSE_OFFSET + X11MOUSE_BUTTON1 + ((int)ip.Event.MouseEvent.dwButtonState << 1); - break; - case MOUSE_WHEELED: - x11mousebuf[2] = X11MOUSE_OFFSET + (((int)ip.Event.MouseEvent.dwButtonState < 0) ? X11MOUSE_WHEEL_DOWN : X11MOUSE_WHEEL_UP); - break; - default: - continue; - } - x11mousePos = 0; - x11mouseCount = 5; - currentKey.ascii = ESC; - keyCount = 1; - return (TRUE); - } - } while (ip.EventType != KEY_EVENT || - ip.Event.KeyEvent.bKeyDown != TRUE || - (ip.Event.KeyEvent.wVirtualScanCode == 0 && ip.Event.KeyEvent.uChar.UnicodeChar == 0) || - ip.Event.KeyEvent.wVirtualKeyCode == VK_KANJI || - ip.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT || - ip.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL || - ip.Event.KeyEvent.wVirtualKeyCode == VK_MENU); - - currentKey.unicode = ip.Event.KeyEvent.uChar.UnicodeChar; - currentKey.ascii = ip.Event.KeyEvent.uChar.AsciiChar; - currentKey.scan = ip.Event.KeyEvent.wVirtualScanCode; - keyCount = ip.Event.KeyEvent.wRepeatCount; - - if (ip.Event.KeyEvent.dwControlKeyState & - (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - { - switch (currentKey.scan) - { - case PCK_ALT_E: /* letter 'E' */ - currentKey.ascii = 0; - break; - } - } else if (ip.Event.KeyEvent.dwControlKeyState & - (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - switch (currentKey.scan) - { - case PCK_RIGHT: /* right arrow */ - currentKey.scan = PCK_CTL_RIGHT; - break; - case PCK_LEFT: /* left arrow */ - currentKey.scan = PCK_CTL_LEFT; - break; - case PCK_DELETE: /* delete */ - currentKey.scan = PCK_CTL_DELETE; - break; - } - } else if (ip.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) - { - switch (currentKey.scan) - { - case PCK_SHIFT_TAB: /* tab */ - currentKey.ascii = 0; - break; - } - } - - return (TRUE); + INPUT_RECORD ip; + DWORD read; + + if (keyCount > 0) + return (TRUE); + + currentKey.ascii = 0; + currentKey.scan = 0; + + if (x11mouseCount > 0) + { + currentKey.ascii = x11mousebuf[x11mousePos++]; + --x11mouseCount; + keyCount = 1; + return (TRUE); + } + + /* + * Wait for a real key-down event, but + * ignore SHIFT and CONTROL key events. + */ + do + { + PeekConsoleInputW(tty, &ip, 1, &read); + if (read == 0) + return (FALSE); + ReadConsoleInputW(tty, &ip, 1, &read); + /* generate an X11 mouse sequence from the mouse event */ + if (mousecap && ip.EventType == MOUSE_EVENT && + ip.Event.MouseEvent.dwEventFlags != MOUSE_MOVED) + { + x11mousebuf[3] = X11MOUSE_OFFSET + ip.Event.MouseEvent.dwMousePosition.X + 1; + x11mousebuf[4] = X11MOUSE_OFFSET + ip.Event.MouseEvent.dwMousePosition.Y + 1; + switch (ip.Event.MouseEvent.dwEventFlags) + { + case 0: /* press or release */ + if (ip.Event.MouseEvent.dwButtonState == 0) + x11mousebuf[2] = X11MOUSE_OFFSET + X11MOUSE_BUTTON_REL; + else if (ip.Event.MouseEvent.dwButtonState & (FROM_LEFT_3RD_BUTTON_PRESSED | FROM_LEFT_4TH_BUTTON_PRESSED)) + continue; + else + x11mousebuf[2] = X11MOUSE_OFFSET + X11MOUSE_BUTTON1 + ((int)ip.Event.MouseEvent.dwButtonState << 1); + break; + case MOUSE_WHEELED: + x11mousebuf[2] = X11MOUSE_OFFSET + (((int)ip.Event.MouseEvent.dwButtonState < 0) ? X11MOUSE_WHEEL_DOWN : X11MOUSE_WHEEL_UP); + break; + default: + continue; + } + x11mousePos = 0; + x11mouseCount = 5; + currentKey.ascii = ESC; + keyCount = 1; + return (TRUE); + } + } while (ip.EventType != KEY_EVENT || + ip.Event.KeyEvent.bKeyDown != TRUE || + (ip.Event.KeyEvent.wVirtualScanCode == 0 && ip.Event.KeyEvent.uChar.UnicodeChar == 0) || + ip.Event.KeyEvent.wVirtualKeyCode == VK_KANJI || + ip.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT || + ip.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL || + ip.Event.KeyEvent.wVirtualKeyCode == VK_MENU); + + currentKey.unicode = ip.Event.KeyEvent.uChar.UnicodeChar; + currentKey.ascii = ip.Event.KeyEvent.uChar.AsciiChar; + currentKey.scan = ip.Event.KeyEvent.wVirtualScanCode; + keyCount = ip.Event.KeyEvent.wRepeatCount; + + if (ip.Event.KeyEvent.dwControlKeyState & + (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + { + switch (currentKey.scan) + { + case PCK_ALT_E: /* letter 'E' */ + currentKey.ascii = 0; + break; + } + } else if (ip.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + switch (currentKey.scan) + { + case PCK_RIGHT: /* right arrow */ + currentKey.scan = PCK_CTL_RIGHT; + break; + case PCK_LEFT: /* left arrow */ + currentKey.scan = PCK_CTL_LEFT; + break; + case PCK_DELETE: /* delete */ + currentKey.scan = PCK_CTL_DELETE; + break; + } + } else if (ip.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) + { + switch (currentKey.scan) + { + case PCK_SHIFT_TAB: /* tab */ + currentKey.ascii = 0; + break; + } + } + + return (TRUE); } /* * Read a character from the keyboard. */ - public char + public char WIN32getch(VOID_PARAM) { - char ascii; - static unsigned char utf8[UTF8_MAX_LENGTH]; - static int utf8_size = 0; - static int utf8_next_byte = 0; - - // Return the rest of multibyte character from the prior call - if (utf8_next_byte < utf8_size) - { - ascii = utf8[utf8_next_byte++]; - return ascii; - } - utf8_size = 0; - - if (pending_scancode) - { - pending_scancode = 0; - return ((char)(currentKey.scan & 0x00FF)); - } - - do { - while (win32_kbhit() == FALSE) - { - Sleep(20); - if (ABORT_SIGS()) - return ('\003'); - continue; - } - keyCount --; - // If multibyte character, return its first byte - if (currentKey.ascii != currentKey.unicode) - { - utf8_size = WideCharToMultiByte(CP_UTF8, 0, ¤tKey.unicode, 1, &utf8, sizeof(utf8), NULL, NULL); - if (utf8_size == 0 ) - return '\0'; - ascii = utf8[0]; - utf8_next_byte = 1; - } else - ascii = currentKey.ascii; - /* - * On PC's, the extended keys return a 2 byte sequence beginning - * with '00', so if the ascii code is 00, the next byte will be - * the lsb of the scan code. - */ - pending_scancode = (ascii == 0x00); - } while (pending_scancode && - (currentKey.scan == PCK_CAPS_LOCK || currentKey.scan == PCK_NUM_LOCK)); - - return ascii; + char ascii; + static unsigned char utf8[UTF8_MAX_LENGTH]; + static int utf8_size = 0; + static int utf8_next_byte = 0; + + // Return the rest of multibyte character from the prior call + if (utf8_next_byte < utf8_size) + { + ascii = utf8[utf8_next_byte++]; + return ascii; + } + utf8_size = 0; + + if (pending_scancode) + { + pending_scancode = 0; + return ((char)(currentKey.scan & 0x00FF)); + } + + do { + while (win32_kbhit() == FALSE) + { + Sleep(20); + if (ABORT_SIGS()) + return ('\003'); + continue; + } + keyCount --; + // If multibyte character, return its first byte + if (currentKey.ascii != currentKey.unicode) + { + utf8_size = WideCharToMultiByte(CP_UTF8, 0, ¤tKey.unicode, 1, &utf8, sizeof(utf8), NULL, NULL); + if (utf8_size == 0 ) + return '\0'; + ascii = utf8[0]; + utf8_next_byte = 1; + } else + ascii = currentKey.ascii; + /* + * On PC's, the extended keys return a 2 byte sequence beginning + * with '00', so if the ascii code is 00, the next byte will be + * the lsb of the scan code. + */ + pending_scancode = (ascii == 0x00); + } while (pending_scancode && + (currentKey.scan == PCK_CAPS_LOCK || currentKey.scan == PCK_NUM_LOCK)); + + return ascii; } #endif #if MSDOS_COMPILER /* */ - public void + public void WIN32setcolors(fg, bg) - int fg; - int bg; + int fg; + int bg; { - SETCOLORS(fg, bg); + SETCOLORS(fg, bg); } /* */ - public void + public void WIN32textout(text, len) - char *text; - int len; + char *text; + int len; { #if MSDOS_COMPILER==WIN32C - DWORD written; - if (utf_mode == 2) - { - /* - * We've got UTF-8 text in a non-UTF-8 console. Convert it to - * wide and use WriteConsoleW. - */ - WCHAR wtext[1024]; - len = MultiByteToWideChar(CP_UTF8, 0, text, len, wtext, - sizeof(wtext)/sizeof(*wtext)); - WriteConsoleW(con_out, wtext, len, &written, NULL); - } else - WriteConsole(con_out, text, len, &written, NULL); + DWORD written; + if (utf_mode == 2) + { + /* + * We've got UTF-8 text in a non-UTF-8 console. Convert it to + * wide and use WriteConsoleW. + */ + WCHAR wtext[1024]; + len = MultiByteToWideChar(CP_UTF8, 0, text, len, wtext, + sizeof(wtext)/sizeof(*wtext)); + WriteConsoleW(con_out, wtext, len, &written, NULL); + } else + WriteConsole(con_out, text, len, &written, NULL); #else - char c = text[len]; - text[len] = '\0'; - cputs(text); - text[len] = c; + char c = text[len]; + text[len] = '\0'; + cputs(text); + text[len] = c; #endif } #endif - diff --git a/scrsize.c b/scrsize.c index 7ceed58..9e03b87 100644 --- a/scrsize.c +++ b/scrsize.c @@ -13,7 +13,7 @@ */ /* - * When I wrote this routine, I consulted some part of the source code + * When I wrote this routine, I consulted some part of the source code * of the xwininfo utility by X Consortium. * * Copyright (c) 1987, X Consortium @@ -46,58 +46,58 @@ #include static int get_winsize(dpy, window, p_width, p_height) - Display *dpy; - Window window; - int *p_width; - int *p_height; + Display *dpy; + Window window; + int *p_width; + int *p_height; { - XWindowAttributes win_attributes; - XSizeHints hints; - long longjunk; + XWindowAttributes win_attributes; + XSizeHints hints; + long longjunk; - if (!XGetWindowAttributes(dpy, window, &win_attributes)) - return 1; - if (!XGetWMNormalHints(dpy, window, &hints, &longjunk)) - return 1; - if (!(hints.flags & PResizeInc)) - return 1; - if (hints.width_inc == 0 || hints.height_inc == 0) - return 1; - if (!(hints.flags & (PBaseSize|PMinSize))) - return 1; - if (hints.flags & PBaseSize) - { - win_attributes.width -= hints.base_width; - win_attributes.height -= hints.base_height; - } else - { - win_attributes.width -= hints.min_width; - win_attributes.height -= hints.min_height; - } - *p_width = win_attributes.width / hints.width_inc; - *p_height = win_attributes.height / hints.height_inc; - return 0; + if (!XGetWindowAttributes(dpy, window, &win_attributes)) + return 1; + if (!XGetWMNormalHints(dpy, window, &hints, &longjunk)) + return 1; + if (!(hints.flags & PResizeInc)) + return 1; + if (hints.width_inc == 0 || hints.height_inc == 0) + return 1; + if (!(hints.flags & (PBaseSize|PMinSize))) + return 1; + if (hints.flags & PBaseSize) + { + win_attributes.width -= hints.base_width; + win_attributes.height -= hints.base_height; + } else + { + win_attributes.width -= hints.min_width; + win_attributes.height -= hints.min_height; + } + *p_width = win_attributes.width / hints.width_inc; + *p_height = win_attributes.height / hints.height_inc; + return 0; } int main(argc, argv) - int argc; - char *argv[]; + int argc; + char *argv[]; { - char *cp; - Display *dpy; - int size[2]; + char *cp; + Display *dpy; + int size[2]; - _scrsize(size); - cp = getenv("WINDOWID"); - if (cp != NULL) - { - dpy = XOpenDisplay(NULL); - if (dpy != NULL) - { - get_winsize(dpy, (Window) atol(cp), &size[0], &size[1]); - XCloseDisplay(dpy); - } - } - printf("%i %i\n", size[0], size[1]); - return (0); + _scrsize(size); + cp = getenv("WINDOWID"); + if (cp != NULL) + { + dpy = XOpenDisplay(NULL); + if (dpy != NULL) + { + get_winsize(dpy, (Window) atol(cp), &size[0], &size[1]); + XCloseDisplay(dpy); + } + } + printf("%i %i\n", size[0], size[1]); + return (0); } diff --git a/search.c b/search.c index 224bc49..7bc5fa8 100644 --- a/search.c +++ b/search.c @@ -64,32 +64,32 @@ extern POSITION xxpos; */ struct hilite { - POSITION hl_startpos; - POSITION hl_endpos; + POSITION hl_startpos; + POSITION hl_endpos; }; struct hilite_node { - struct hilite_node *parent; - struct hilite_node *left; - struct hilite_node *right; - struct hilite_node *prev; - struct hilite_node *next; - int red; - struct hilite r; + struct hilite_node *parent; + struct hilite_node *left; + struct hilite_node *right; + struct hilite_node *prev; + struct hilite_node *next; + int red; + struct hilite r; }; struct hilite_storage { - int capacity; - int used; - struct hilite_storage *next; - struct hilite_node *nodes; + int capacity; + int used; + struct hilite_storage *next; + struct hilite_node *nodes; }; struct hilite_tree { - struct hilite_storage *first; - struct hilite_storage *current; - struct hilite_node *root; - struct hilite_node *lookaside; + struct hilite_storage *first; + struct hilite_storage *current; + struct hilite_node *root; + struct hilite_node *lookaside; }; #define HILITE_INITIALIZER() { NULL, NULL, NULL, NULL } #define HILITE_LOOKASIDE_STEPS 2 @@ -105,10 +105,10 @@ static struct pattern_info *filter_infos = NULL; * search pattern and filter pattern. */ struct pattern_info { - PATTERN_TYPE compiled; - char* text; - int search_type; - struct pattern_info *next; + PATTERN_TYPE compiled; + char* text; + int search_type; + struct pattern_info *next; }; #if NO_REGEX @@ -116,7 +116,7 @@ struct pattern_info { #else #define info_compiled(info) ((info)->compiled) #endif - + static struct pattern_info search_info; static int is_ucase_pattern; public int is_caseless; @@ -124,125 +124,125 @@ public int is_caseless; /* * Are there any uppercase letters in this string? */ - static int + static int is_ucase(str) - char *str; + char *str; { - char *str_end = str + strlen(str); - LWCHAR ch; - - while (str < str_end) - { - ch = step_char(&str, +1, str_end); - if (IS_UPPER(ch)) - return (1); - } - return (0); + char *str_end = str + strlen(str); + LWCHAR ch; + + while (str < str_end) + { + ch = step_char(&str, +1, str_end); + if (IS_UPPER(ch)) + return (1); + } + return (0); } /* * Discard a saved pattern. */ - static void + static void clear_pattern(info) - struct pattern_info *info; + struct pattern_info *info; { - if (info->text != NULL) - free(info->text); - info->text = NULL; + if (info->text != NULL) + free(info->text); + info->text = NULL; #if !NO_REGEX - uncompile_pattern(&info->compiled); + uncompile_pattern(&info->compiled); #endif } /* * Compile and save a search pattern. */ - static int + static int set_pattern(info, pattern, search_type, show_error) - struct pattern_info *info; - char *pattern; - int search_type; - int show_error; + struct pattern_info *info; + char *pattern; + int search_type; + int show_error; { - /* - * Ignore case if -I is set OR - * -i is set AND the pattern is all lowercase. - */ - is_ucase_pattern = (pattern == NULL) ? FALSE : is_ucase(pattern); - is_caseless = (is_ucase_pattern && caseless != OPT_ONPLUS) ? 0 : caseless; + /* + * Ignore case if -I is set OR + * -i is set AND the pattern is all lowercase. + */ + is_ucase_pattern = (pattern == NULL) ? FALSE : is_ucase(pattern); + is_caseless = (is_ucase_pattern && caseless != OPT_ONPLUS) ? 0 : caseless; #if !NO_REGEX - if (pattern == NULL) - SET_NULL_PATTERN(info->compiled); - else if (compile_pattern(pattern, search_type, show_error, &info->compiled) < 0) - return -1; + if (pattern == NULL) + SET_NULL_PATTERN(info->compiled); + else if (compile_pattern(pattern, search_type, show_error, &info->compiled) < 0) + return -1; #endif - /* Pattern compiled successfully; save the text too. */ - if (info->text != NULL) - free(info->text); - info->text = NULL; - if (pattern != NULL) - { - info->text = (char *) ecalloc(1, strlen(pattern)+1); - strcpy(info->text, pattern); - } - info->search_type = search_type; - return 0; + /* Pattern compiled successfully; save the text too. */ + if (info->text != NULL) + free(info->text); + info->text = NULL; + if (pattern != NULL) + { + info->text = (char *) ecalloc(1, strlen(pattern)+1); + strcpy(info->text, pattern); + } + info->search_type = search_type; + return 0; } /* * Initialize saved pattern to nothing. */ - static void + static void init_pattern(info) - struct pattern_info *info; + struct pattern_info *info; { - SET_NULL_PATTERN(info->compiled); - info->text = NULL; - info->search_type = 0; - info->next = NULL; + SET_NULL_PATTERN(info->compiled); + info->text = NULL; + info->search_type = 0; + info->next = NULL; } /* * Initialize search variables. */ - public void + public void init_search(VOID_PARAM) { - init_pattern(&search_info); + init_pattern(&search_info); } /* * Determine which text conversions to perform before pattern matching. */ - static int + static int get_cvt_ops(VOID_PARAM) { - int ops = 0; - - if (is_caseless && !re_handles_caseless) - ops |= CVT_TO_LC; - if (bs_mode == BS_SPECIAL) - ops |= CVT_BS; - if (bs_mode != BS_CONTROL) - ops |= CVT_CRLF; - if (ctldisp == OPT_ONPLUS) - ops |= CVT_ANSI; - return (ops); + int ops = 0; + + if (is_caseless && !re_handles_caseless) + ops |= CVT_TO_LC; + if (bs_mode == BS_SPECIAL) + ops |= CVT_BS; + if (bs_mode != BS_CONTROL) + ops |= CVT_CRLF; + if (ctldisp == OPT_ONPLUS) + ops |= CVT_ANSI; + return (ops); } /* * Is there a previous (remembered) search pattern? */ - static int + static int prev_pattern(info) - struct pattern_info *info; + struct pattern_info *info; { #if !NO_REGEX - if ((info->search_type & SRCH_NO_REGEX) == 0) - return (!is_null_pattern(info->compiled)); + if ((info->search_type & SRCH_NO_REGEX) == 0) + return (!is_null_pattern(info->compiled)); #endif - return (info->text != NULL); + return (info->text != NULL); } #if HILITE_SEARCH @@ -251,119 +251,119 @@ prev_pattern(info) * Repaint each line which contains highlighted text. * If on==0, force all hilites off. */ - public void + public void repaint_hilite(on) - int on; + int on; { - int sindex; - POSITION pos; - int save_hide_hilite; - - if (squished) - repaint(); - - save_hide_hilite = hide_hilite; - if (!on) - { - if (hide_hilite) - return; - hide_hilite = 1; - } - - if (!can_goto_line) - { - repaint(); - hide_hilite = save_hide_hilite; - return; - } - - for (sindex = TOP; sindex < TOP + sc_height-1; sindex++) - { - pos = position(sindex); - if (pos == NULL_POSITION) - continue; - (void) forw_line(pos); - goto_line(sindex); - put_line(); - } - overlay_header(); - lower_left(); - hide_hilite = save_hide_hilite; + int sindex; + POSITION pos; + int save_hide_hilite; + + if (squished) + repaint(); + + save_hide_hilite = hide_hilite; + if (!on) + { + if (hide_hilite) + return; + hide_hilite = 1; + } + + if (!can_goto_line) + { + repaint(); + hide_hilite = save_hide_hilite; + return; + } + + for (sindex = TOP; sindex < TOP + sc_height-1; sindex++) + { + pos = position(sindex); + if (pos == NULL_POSITION) + continue; + (void) forw_line(pos); + goto_line(sindex); + put_line(); + } + overlay_header(); + lower_left(); + hide_hilite = save_hide_hilite; } #endif /* * Clear the attn hilite. */ - public void + public void clear_attn(VOID_PARAM) { #if HILITE_SEARCH - int sindex; - POSITION old_start_attnpos; - POSITION old_end_attnpos; - POSITION pos; - POSITION epos; - int moved = 0; - - if (start_attnpos == NULL_POSITION) - return; - old_start_attnpos = start_attnpos; - old_end_attnpos = end_attnpos; - start_attnpos = end_attnpos = NULL_POSITION; - - if (!can_goto_line) - { - repaint(); - return; - } - if (squished) - repaint(); - - for (sindex = TOP; sindex < TOP + sc_height-1; sindex++) - { - pos = position(sindex); - if (pos == NULL_POSITION) - continue; - epos = position(sindex+1); - if (pos <= old_end_attnpos && - (epos == NULL_POSITION || epos > old_start_attnpos)) - { - (void) forw_line(pos); - goto_line(sindex); - put_line(); - moved = 1; - } - } - if (overlay_header()) - moved = 1; - if (moved) - lower_left(); + int sindex; + POSITION old_start_attnpos; + POSITION old_end_attnpos; + POSITION pos; + POSITION epos; + int moved = 0; + + if (start_attnpos == NULL_POSITION) + return; + old_start_attnpos = start_attnpos; + old_end_attnpos = end_attnpos; + start_attnpos = end_attnpos = NULL_POSITION; + + if (!can_goto_line) + { + repaint(); + return; + } + if (squished) + repaint(); + + for (sindex = TOP; sindex < TOP + sc_height-1; sindex++) + { + pos = position(sindex); + if (pos == NULL_POSITION) + continue; + epos = position(sindex+1); + if (pos <= old_end_attnpos && + (epos == NULL_POSITION || epos > old_start_attnpos)) + { + (void) forw_line(pos); + goto_line(sindex); + put_line(); + moved = 1; + } + } + if (overlay_header()) + moved = 1; + if (moved) + lower_left(); #endif } /* * Toggle or clear search string highlighting. */ - public void + public void undo_search(clear) - int clear; + int clear; { - clear_pattern(&search_info); + clear_pattern(&search_info); #if HILITE_SEARCH - if (clear) - { - clr_hilite(); - } else - { - if (hilite_anchor.first == NULL) - { - error("No previous regular expression", NULL_PARG); - return; - } - hide_hilite = !hide_hilite; - } - repaint_hilite(1); + if (clear) + { + clr_hilite(); + } else + { + if (hilite_anchor.first == NULL) + { + error("No previous regular expression", NULL_PARG); + return; + } + hide_hilite = !hide_hilite; + } + repaint_hilite(1); #endif } @@ -371,62 +371,62 @@ undo_search(clear) /* * Clear the hilite list. */ - public void + public void clr_hlist(anchor) - struct hilite_tree *anchor; + struct hilite_tree *anchor; { - struct hilite_storage *hls; - struct hilite_storage *nexthls; - - for (hls = anchor->first; hls != NULL; hls = nexthls) - { - nexthls = hls->next; - free((void*)hls->nodes); - free((void*)hls); - } - anchor->first = NULL; - anchor->current = NULL; - anchor->root = NULL; - - anchor->lookaside = NULL; - - prep_startpos = prep_endpos = NULL_POSITION; + struct hilite_storage *hls; + struct hilite_storage *nexthls; + + for (hls = anchor->first; hls != NULL; hls = nexthls) + { + nexthls = hls->next; + free((void*)hls->nodes); + free((void*)hls); + } + anchor->first = NULL; + anchor->current = NULL; + anchor->root = NULL; + + anchor->lookaside = NULL; + + prep_startpos = prep_endpos = NULL_POSITION; } - public void + public void clr_hilite(VOID_PARAM) { - clr_hlist(&hilite_anchor); + clr_hlist(&hilite_anchor); } - public void + public void clr_filter(VOID_PARAM) { - clr_hlist(&filter_anchor); + clr_hlist(&filter_anchor); } - struct hilite_node* + struct hilite_node* hlist_last(anchor) - struct hilite_tree *anchor; + struct hilite_tree *anchor; { - struct hilite_node *n = anchor->root; - while (n != NULL && n->right != NULL) - n = n->right; - return n; + struct hilite_node *n = anchor->root; + while (n != NULL && n->right != NULL) + n = n->right; + return n; } - struct hilite_node* + struct hilite_node* hlist_next(n) - struct hilite_node *n; + struct hilite_node *n; { - return n->next; + return n->next; } - struct hilite_node* + struct hilite_node* hlist_prev(n) - struct hilite_node *n; + struct hilite_node *n; { - return n->prev; + return n->prev; } /* @@ -435,169 +435,169 @@ hlist_prev(n) * to speed up subsequent searches for the same or similar positions (if * we return NULL, remember the last node.) */ - struct hilite_node* + struct hilite_node* hlist_find(anchor, pos) - struct hilite_tree *anchor; - POSITION pos; + struct hilite_tree *anchor; + POSITION pos; { - struct hilite_node *n, *m; - - if (anchor->lookaside) - { - int steps = 0; - int hit = 0; - - n = anchor->lookaside; - - for (;;) - { - if (pos < n->r.hl_endpos) - { - if (n->prev == NULL || pos >= n->prev->r.hl_endpos) - { - hit = 1; - break; - } - } else if (n->next == NULL) - { - n = NULL; - hit = 1; - break; - } - - /* - * If we don't find the right node within a small - * distance, don't keep doing a linear search! - */ - if (steps >= HILITE_LOOKASIDE_STEPS) - break; - steps++; - - if (pos < n->r.hl_endpos) - anchor->lookaside = n = n->prev; - else - anchor->lookaside = n = n->next; - } - - if (hit) - return n; - } - - n = anchor->root; - m = NULL; - - while (n != NULL) - { - if (pos < n->r.hl_startpos) - { - if (n->left != NULL) - { - m = n; - n = n->left; - continue; - } - break; - } - if (pos >= n->r.hl_endpos) - { - if (n->right != NULL) - { - n = n->right; - continue; - } - if (m != NULL) - { - n = m; - } else - { - m = n; - n = NULL; - } - } - break; - } - - if (n != NULL) - anchor->lookaside = n; - else if (m != NULL) - anchor->lookaside = m; - - return n; + struct hilite_node *n, *m; + + if (anchor->lookaside) + { + int steps = 0; + int hit = 0; + + n = anchor->lookaside; + + for (;;) + { + if (pos < n->r.hl_endpos) + { + if (n->prev == NULL || pos >= n->prev->r.hl_endpos) + { + hit = 1; + break; + } + } else if (n->next == NULL) + { + n = NULL; + hit = 1; + break; + } + + /* + * If we don't find the right node within a small + * distance, don't keep doing a linear search! + */ + if (steps >= HILITE_LOOKASIDE_STEPS) + break; + steps++; + + if (pos < n->r.hl_endpos) + anchor->lookaside = n = n->prev; + else + anchor->lookaside = n = n->next; + } + + if (hit) + return n; + } + + n = anchor->root; + m = NULL; + + while (n != NULL) + { + if (pos < n->r.hl_startpos) + { + if (n->left != NULL) + { + m = n; + n = n->left; + continue; + } + break; + } + if (pos >= n->r.hl_endpos) + { + if (n->right != NULL) + { + n = n->right; + continue; + } + if (m != NULL) + { + n = m; + } else + { + m = n; + n = NULL; + } + } + break; + } + + if (n != NULL) + anchor->lookaside = n; + else if (m != NULL) + anchor->lookaside = m; + + return n; } /* * Should any characters in a specified range be highlighted? */ - static int + static int is_hilited_range(pos, epos) - POSITION pos; - POSITION epos; + POSITION pos; + POSITION epos; { - struct hilite_node *n = hlist_find(&hilite_anchor, pos); - return (n != NULL && (epos == NULL_POSITION || epos > n->r.hl_startpos)); + struct hilite_node *n = hlist_find(&hilite_anchor, pos); + return (n != NULL && (epos == NULL_POSITION || epos > n->r.hl_startpos)); } -/* +/* * Is a line "filtered" -- that is, should it be hidden? */ - public int + public int is_filtered(pos) - POSITION pos; + POSITION pos; { - struct hilite_node *n; + struct hilite_node *n; - if (ch_getflags() & CH_HELPFILE) - return (0); + if (ch_getflags() & CH_HELPFILE) + return (0); - n = hlist_find(&filter_anchor, pos); - return (n != NULL && pos >= n->r.hl_startpos); + n = hlist_find(&filter_anchor, pos); + return (n != NULL && pos >= n->r.hl_startpos); } /* * If pos is hidden, return the next position which isn't, otherwise * just return pos. */ - public POSITION + public POSITION next_unfiltered(pos) - POSITION pos; + POSITION pos; { - struct hilite_node *n; - - if (ch_getflags() & CH_HELPFILE) - return (pos); - - n = hlist_find(&filter_anchor, pos); - while (n != NULL && pos >= n->r.hl_startpos) - { - pos = n->r.hl_endpos; - n = n->next; - } - return (pos); + struct hilite_node *n; + + if (ch_getflags() & CH_HELPFILE) + return (pos); + + n = hlist_find(&filter_anchor, pos); + while (n != NULL && pos >= n->r.hl_startpos) + { + pos = n->r.hl_endpos; + n = n->next; + } + return (pos); } /* * If pos is hidden, return the previous position which isn't or 0 if * we're filtered right to the beginning, otherwise just return pos. */ - public POSITION + public POSITION prev_unfiltered(pos) - POSITION pos; + POSITION pos; { - struct hilite_node *n; - - if (ch_getflags() & CH_HELPFILE) - return (pos); - - n = hlist_find(&filter_anchor, pos); - while (n != NULL && pos >= n->r.hl_startpos) - { - pos = n->r.hl_startpos; - if (pos == 0) - break; - pos--; - n = n->prev; - } - return (pos); + struct hilite_node *n; + + if (ch_getflags() & CH_HELPFILE) + return (pos); + + n = hlist_find(&filter_anchor, pos); + while (n != NULL && pos >= n->r.hl_startpos) + { + pos = n->r.hl_startpos; + if (pos == 0) + break; + pos--; + n = n->prev; + } + return (pos); } @@ -605,429 +605,429 @@ prev_unfiltered(pos) * Should any characters in a specified range be highlighted? * If nohide is nonzero, don't consider hide_hilite. */ - public int + public int is_hilited_attr(pos, epos, nohide, p_matches) - POSITION pos; - POSITION epos; - int nohide; - int *p_matches; + POSITION pos; + POSITION epos; + int nohide; + int *p_matches; { - int match; - - if (p_matches != NULL) - *p_matches = 0; - - if (!status_col && - start_attnpos != NULL_POSITION && - pos <= end_attnpos && - (epos == NULL_POSITION || epos >= start_attnpos)) - /* - * The attn line overlaps this range. - */ - return (AT_HILITE|AT_COLOR_ATTN); - - match = is_hilited_range(pos, epos); - if (!match) - return (0); - - if (p_matches == NULL) - /* - * Kinda kludgy way to recognize that caller is checking for - * hilite in status column. In this case we want to return - * hilite status even if hiliting is disabled or hidden. - */ - return (AT_HILITE|AT_COLOR_SEARCH); - - /* - * Report matches, even if we're hiding highlights. - */ - *p_matches = 1; - - if (hilite_search == 0) - /* - * Not doing highlighting. - */ - return (0); - - if (!nohide && hide_hilite) - /* - * Highlighting is hidden. - */ - return (0); - - return (AT_HILITE|AT_COLOR_SEARCH); + int match; + + if (p_matches != NULL) + *p_matches = 0; + + if (!status_col && + start_attnpos != NULL_POSITION && + pos <= end_attnpos && + (epos == NULL_POSITION || epos >= start_attnpos)) + /* + * The attn line overlaps this range. + */ + return (AT_HILITE|AT_COLOR_ATTN); + + match = is_hilited_range(pos, epos); + if (!match) + return (0); + + if (p_matches == NULL) + /* + * Kinda kludgy way to recognize that caller is checking for + * hilite in status column. In this case we want to return + * hilite status even if hiliting is disabled or hidden. + */ + return (AT_HILITE|AT_COLOR_SEARCH); + + /* + * Report matches, even if we're hiding highlights. + */ + *p_matches = 1; + + if (hilite_search == 0) + /* + * Not doing highlighting. + */ + return (0); + + if (!nohide && hide_hilite) + /* + * Highlighting is hidden. + */ + return (0); + + return (AT_HILITE|AT_COLOR_SEARCH); } /* * Tree node storage: get the current block of nodes if it has spare * capacity, or create a new one if not. */ - static struct hilite_storage* + static struct hilite_storage* hlist_getstorage(anchor) - struct hilite_tree *anchor; + struct hilite_tree *anchor; { - int capacity = 1; - struct hilite_storage *s; - - if (anchor->current) - { - if (anchor->current->used < anchor->current->capacity) - return anchor->current; - capacity = anchor->current->capacity * 2; - } - - s = (struct hilite_storage *) ecalloc(1, sizeof(struct hilite_storage)); - s->nodes = (struct hilite_node *) ecalloc(capacity, sizeof(struct hilite_node)); - s->capacity = capacity; - s->used = 0; - s->next = NULL; - if (anchor->current) - anchor->current->next = s; - else - anchor->first = s; - anchor->current = s; - return s; + int capacity = 1; + struct hilite_storage *s; + + if (anchor->current) + { + if (anchor->current->used < anchor->current->capacity) + return anchor->current; + capacity = anchor->current->capacity * 2; + } + + s = (struct hilite_storage *) ecalloc(1, sizeof(struct hilite_storage)); + s->nodes = (struct hilite_node *) ecalloc(capacity, sizeof(struct hilite_node)); + s->capacity = capacity; + s->used = 0; + s->next = NULL; + if (anchor->current) + anchor->current->next = s; + else + anchor->first = s; + anchor->current = s; + return s; } /* * Tree node storage: retrieve a new empty node to be inserted into the * tree. */ - static struct hilite_node* + static struct hilite_node* hlist_getnode(anchor) - struct hilite_tree *anchor; + struct hilite_tree *anchor; { - struct hilite_storage *s = hlist_getstorage(anchor); - return &s->nodes[s->used++]; + struct hilite_storage *s = hlist_getstorage(anchor); + return &s->nodes[s->used++]; } /* * Rotate the tree left around a pivot node. */ - static void + static void hlist_rotate_left(anchor, n) - struct hilite_tree *anchor; - struct hilite_node *n; + struct hilite_tree *anchor; + struct hilite_node *n; { - struct hilite_node *np = n->parent; - struct hilite_node *nr = n->right; - struct hilite_node *nrl = n->right->left; - - if (np != NULL) - { - if (n == np->left) - np->left = nr; - else - np->right = nr; - } else - { - anchor->root = nr; - } - nr->left = n; - n->right = nrl; - - nr->parent = np; - n->parent = nr; - if (nrl != NULL) - nrl->parent = n; + struct hilite_node *np = n->parent; + struct hilite_node *nr = n->right; + struct hilite_node *nrl = n->right->left; + + if (np != NULL) + { + if (n == np->left) + np->left = nr; + else + np->right = nr; + } else + { + anchor->root = nr; + } + nr->left = n; + n->right = nrl; + + nr->parent = np; + n->parent = nr; + if (nrl != NULL) + nrl->parent = n; } /* * Rotate the tree right around a pivot node. */ - static void + static void hlist_rotate_right(anchor, n) - struct hilite_tree *anchor; - struct hilite_node *n; + struct hilite_tree *anchor; + struct hilite_node *n; { - struct hilite_node *np = n->parent; - struct hilite_node *nl = n->left; - struct hilite_node *nlr = n->left->right; - - if (np != NULL) - { - if (n == np->right) - np->right = nl; - else - np->left = nl; - } else - { - anchor->root = nl; - } - nl->right = n; - n->left = nlr; - - nl->parent = np; - n->parent = nl; - if (nlr != NULL) - nlr->parent = n; + struct hilite_node *np = n->parent; + struct hilite_node *nl = n->left; + struct hilite_node *nlr = n->left->right; + + if (np != NULL) + { + if (n == np->right) + np->right = nl; + else + np->left = nl; + } else + { + anchor->root = nl; + } + nl->right = n; + n->left = nlr; + + nl->parent = np; + n->parent = nl; + if (nlr != NULL) + nlr->parent = n; } /* * Add a new hilite to a hilite list. */ - static void + static void add_hilite(anchor, hl) - struct hilite_tree *anchor; - struct hilite *hl; + struct hilite_tree *anchor; + struct hilite *hl; { - struct hilite_node *p, *n, *u; - - /* Ignore empty ranges. */ - if (hl->hl_startpos >= hl->hl_endpos) - return; - - p = anchor->root; - - /* Inserting the very first node is trivial. */ - if (p == NULL) - { - n = hlist_getnode(anchor); - n->r = *hl; - anchor->root = n; - anchor->lookaside = n; - return; - } - - /* - * Find our insertion point. If we come across any overlapping - * or adjoining existing ranges, shrink our range and discard - * if it become empty. - */ - for (;;) - { - if (hl->hl_startpos < p->r.hl_startpos) - { - if (hl->hl_endpos > p->r.hl_startpos) - hl->hl_endpos = p->r.hl_startpos; - if (p->left != NULL) - { - p = p->left; - continue; - } - break; - } - if (hl->hl_startpos < p->r.hl_endpos) { - hl->hl_startpos = p->r.hl_endpos; - if (hl->hl_startpos >= hl->hl_endpos) - return; - } - if (p->right != NULL) - { - p = p->right; - continue; - } - break; - } - - /* - * Now we're at the right leaf, again check for contiguous ranges - * and extend the existing node if possible to avoid the - * insertion. Otherwise insert a new node at the leaf. - */ - if (hl->hl_startpos < p->r.hl_startpos) { - if (hl->hl_endpos == p->r.hl_startpos) - { - p->r.hl_startpos = hl->hl_startpos; - return; - } - if (p->prev != NULL && p->prev->r.hl_endpos == hl->hl_startpos) - { - p->prev->r.hl_endpos = hl->hl_endpos; - return; - } - - p->left = n = hlist_getnode(anchor); - n->next = p; - if (p->prev != NULL) - { - n->prev = p->prev; - p->prev->next = n; - } - p->prev = n; - } else { - if (p->r.hl_endpos == hl->hl_startpos) - { - p->r.hl_endpos = hl->hl_endpos; - return; - } - if (p->next != NULL && hl->hl_endpos == p->next->r.hl_startpos) { - p->next->r.hl_startpos = hl->hl_startpos; - return; - } - - p->right = n = hlist_getnode(anchor); - n->prev = p; - if (p->next != NULL) - { - n->next = p->next; - p->next->prev = n; - } - p->next = n; - } - n->parent = p; - n->red = 1; - n->r = *hl; - - /* - * The tree is in the correct order and covers the right ranges - * now, but may have become unbalanced. Rebalance it using the - * standard red-black tree constraints and operations. - */ - for (;;) - { - /* case 1 - current is root, root is always black */ - if (n->parent == NULL) - { - n->red = 0; - break; - } - - /* case 2 - parent is black, we can always be red */ - if (!n->parent->red) - break; - - /* - * constraint: because the root must be black, if our - * parent is red it cannot be the root therefore we must - * have a grandparent - */ - - /* - * case 3 - parent and uncle are red, repaint them black, - * the grandparent red, and start again at the grandparent. - */ - u = n->parent->parent->left; - if (n->parent == u) - u = n->parent->parent->right; - if (u != NULL && u->red) - { - n->parent->red = 0; - u->red = 0; - n = n->parent->parent; - n->red = 1; - continue; - } - - /* - * case 4 - parent is red but uncle is black, parent and - * grandparent on opposite sides. We need to start - * changing the structure now. This and case 5 will shorten - * our branch and lengthen the sibling, between them - * restoring balance. - */ - if (n == n->parent->right && - n->parent == n->parent->parent->left) - { - hlist_rotate_left(anchor, n->parent); - n = n->left; - } else if (n == n->parent->left && - n->parent == n->parent->parent->right) - { - hlist_rotate_right(anchor, n->parent); - n = n->right; - } - - /* - * case 5 - parent is red but uncle is black, parent and - * grandparent on same side - */ - n->parent->red = 0; - n->parent->parent->red = 1; - if (n == n->parent->left) - hlist_rotate_right(anchor, n->parent->parent); - else - hlist_rotate_left(anchor, n->parent->parent); - break; - } + struct hilite_node *p, *n, *u; + + /* Ignore empty ranges. */ + if (hl->hl_startpos >= hl->hl_endpos) + return; + + p = anchor->root; + + /* Inserting the very first node is trivial. */ + if (p == NULL) + { + n = hlist_getnode(anchor); + n->r = *hl; + anchor->root = n; + anchor->lookaside = n; + return; + } + + /* + * Find our insertion point. If we come across any overlapping + * or adjoining existing ranges, shrink our range and discard + * if it become empty. + */ + for (;;) + { + if (hl->hl_startpos < p->r.hl_startpos) + { + if (hl->hl_endpos > p->r.hl_startpos) + hl->hl_endpos = p->r.hl_startpos; + if (p->left != NULL) + { + p = p->left; + continue; + } + break; + } + if (hl->hl_startpos < p->r.hl_endpos) { + hl->hl_startpos = p->r.hl_endpos; + if (hl->hl_startpos >= hl->hl_endpos) + return; + } + if (p->right != NULL) + { + p = p->right; + continue; + } + break; + } + + /* + * Now we're at the right leaf, again check for contiguous ranges + * and extend the existing node if possible to avoid the + * insertion. Otherwise insert a new node at the leaf. + */ + if (hl->hl_startpos < p->r.hl_startpos) { + if (hl->hl_endpos == p->r.hl_startpos) + { + p->r.hl_startpos = hl->hl_startpos; + return; + } + if (p->prev != NULL && p->prev->r.hl_endpos == hl->hl_startpos) + { + p->prev->r.hl_endpos = hl->hl_endpos; + return; + } + + p->left = n = hlist_getnode(anchor); + n->next = p; + if (p->prev != NULL) + { + n->prev = p->prev; + p->prev->next = n; + } + p->prev = n; + } else { + if (p->r.hl_endpos == hl->hl_startpos) + { + p->r.hl_endpos = hl->hl_endpos; + return; + } + if (p->next != NULL && hl->hl_endpos == p->next->r.hl_startpos) { + p->next->r.hl_startpos = hl->hl_startpos; + return; + } + + p->right = n = hlist_getnode(anchor); + n->prev = p; + if (p->next != NULL) + { + n->next = p->next; + p->next->prev = n; + } + p->next = n; + } + n->parent = p; + n->red = 1; + n->r = *hl; + + /* + * The tree is in the correct order and covers the right ranges + * now, but may have become unbalanced. Rebalance it using the + * standard red-black tree constraints and operations. + */ + for (;;) + { + /* case 1 - current is root, root is always black */ + if (n->parent == NULL) + { + n->red = 0; + break; + } + + /* case 2 - parent is black, we can always be red */ + if (!n->parent->red) + break; + + /* + * constraint: because the root must be black, if our + * parent is red it cannot be the root therefore we must + * have a grandparent + */ + + /* + * case 3 - parent and uncle are red, repaint them black, + * the grandparent red, and start again at the grandparent. + */ + u = n->parent->parent->left; + if (n->parent == u) + u = n->parent->parent->right; + if (u != NULL && u->red) + { + n->parent->red = 0; + u->red = 0; + n = n->parent->parent; + n->red = 1; + continue; + } + + /* + * case 4 - parent is red but uncle is black, parent and + * grandparent on opposite sides. We need to start + * changing the structure now. This and case 5 will shorten + * our branch and lengthen the sibling, between them + * restoring balance. + */ + if (n == n->parent->right && + n->parent == n->parent->parent->left) + { + hlist_rotate_left(anchor, n->parent); + n = n->left; + } else if (n == n->parent->left && + n->parent == n->parent->parent->right) + { + hlist_rotate_right(anchor, n->parent); + n = n->right; + } + + /* + * case 5 - parent is red but uncle is black, parent and + * grandparent on same side + */ + n->parent->red = 0; + n->parent->parent->red = 1; + if (n == n->parent->left) + hlist_rotate_right(anchor, n->parent->parent); + else + hlist_rotate_left(anchor, n->parent->parent); + break; + } } /* * Highlight every character in a range of displayed characters. */ - static void + static void create_hilites(linepos, start_index, end_index, chpos) - POSITION linepos; - int start_index; - int end_index; - int *chpos; + POSITION linepos; + int start_index; + int end_index; + int *chpos; { - struct hilite hl; - int i; - - /* Start the first hilite. */ - hl.hl_startpos = linepos + chpos[start_index]; - - /* - * Step through the displayed chars. - * If the source position (before cvt) of the char is one more - * than the source pos of the previous char (the usual case), - * just increase the size of the current hilite by one. - * Otherwise (there are backspaces or something involved), - * finish the current hilite and start a new one. - */ - for (i = start_index+1; i <= end_index; i++) - { - if (chpos[i] != chpos[i-1] + 1 || i == end_index) - { - hl.hl_endpos = linepos + chpos[i-1] + 1; - add_hilite(&hilite_anchor, &hl); - /* Start new hilite unless this is the last char. */ - if (i < end_index) - { - hl.hl_startpos = linepos + chpos[i]; - } - } - } + struct hilite hl; + int i; + + /* Start the first hilite. */ + hl.hl_startpos = linepos + chpos[start_index]; + + /* + * Step through the displayed chars. + * If the source position (before cvt) of the char is one more + * than the source pos of the previous char (the usual case), + * just increase the size of the current hilite by one. + * Otherwise (there are backspaces or something involved), + * finish the current hilite and start a new one. + */ + for (i = start_index+1; i <= end_index; i++) + { + if (chpos[i] != chpos[i-1] + 1 || i == end_index) + { + hl.hl_endpos = linepos + chpos[i-1] + 1; + add_hilite(&hilite_anchor, &hl); + /* Start new hilite unless this is the last char. */ + if (i < end_index) + { + hl.hl_startpos = linepos + chpos[i]; + } + } + } } /* - * Make a hilite for each string in a physical line which matches + * Make a hilite for each string in a physical line which matches * the current pattern. * sp,ep delimit the first match already found. */ - static void + static void hilite_line(linepos, line, line_len, chpos, sp, ep, cvt_ops) - POSITION linepos; - char *line; - int line_len; - int *chpos; - char *sp; - char *ep; - int cvt_ops; + POSITION linepos; + char *line; + int line_len; + int *chpos; + char *sp; + char *ep; + int cvt_ops; { - char *searchp; - char *line_end = line + line_len; - - /* - * sp and ep delimit the first match in the line. - * Mark the corresponding file positions, then - * look for further matches and mark them. - * {{ This technique, of calling match_pattern on subsequent - * substrings of the line, may mark more than is correct - * if the pattern starts with "^". This bug is fixed - * for those regex functions that accept a notbol parameter - * (currently POSIX, PCRE and V8-with-regexec2). }} - */ - searchp = line; - do { - if (sp == NULL || ep == NULL) - return; - create_hilites(linepos, sp-line, ep-line, chpos); - /* - * If we matched more than zero characters, - * move to the first char after the string we matched. - * If we matched zero, just move to the next char. - */ - if (ep > searchp) - searchp = ep; - else if (searchp != line_end) - searchp++; - else /* end of line */ - break; - } while (match_pattern(info_compiled(&search_info), search_info.text, - searchp, line_end - searchp, &sp, &ep, 1, search_info.search_type)); + char *searchp; + char *line_end = line + line_len; + + /* + * sp and ep delimit the first match in the line. + * Mark the corresponding file positions, then + * look for further matches and mark them. + * {{ This technique, of calling match_pattern on subsequent + * substrings of the line, may mark more than is correct + * if the pattern starts with "^". This bug is fixed + * for those regex functions that accept a notbol parameter + * (currently POSIX, PCRE and V8-with-regexec2). }} + */ + searchp = line; + do { + if (sp == NULL || ep == NULL) + return; + create_hilites(linepos, sp-line, ep-line, chpos); + /* + * If we matched more than zero characters, + * move to the first char after the string we matched. + * If we matched zero, just move to the next char. + */ + if (ep > searchp) + searchp = ep; + else if (searchp != line_end) + searchp++; + else /* end of line */ + break; + } while (match_pattern(info_compiled(&search_info), search_info.text, + searchp, line_end - searchp, &sp, &ep, 1, search_info.search_type)); } #endif @@ -1035,129 +1035,129 @@ hilite_line(linepos, line, line_len, chpos, sp, ep, cvt_ops) /* * Find matching text which is currently on screen and highlight it. */ - static void + static void hilite_screen(VOID_PARAM) { - struct scrpos scrpos; + struct scrpos scrpos; - get_scrpos(&scrpos, TOP); - if (scrpos.pos == NULL_POSITION) - return; - prep_hilite(scrpos.pos, position(BOTTOM_PLUS_ONE), -1); - repaint_hilite(1); + get_scrpos(&scrpos, TOP); + if (scrpos.pos == NULL_POSITION) + return; + prep_hilite(scrpos.pos, position(BOTTOM_PLUS_ONE), -1); + repaint_hilite(1); } /* * Change highlighting parameters. */ - public void + public void chg_hilite(VOID_PARAM) { - /* - * Erase any highlights currently on screen. - */ - clr_hilite(); - hide_hilite = 0; - - if (hilite_search == OPT_ONPLUS) - /* - * Display highlights. - */ - hilite_screen(); + /* + * Erase any highlights currently on screen. + */ + clr_hilite(); + hide_hilite = 0; + + if (hilite_search == OPT_ONPLUS) + /* + * Display highlights. + */ + hilite_screen(); } #endif /* * Figure out where to start a search. */ - static POSITION + static POSITION search_pos(search_type) - int search_type; + int search_type; { - POSITION pos; - int sindex; - - if (empty_screen()) - { - /* - * Start at the beginning (or end) of the file. - * The empty_screen() case is mainly for - * command line initiated searches; - * for example, "+/xyz" on the command line. - * Also for multi-file (SRCH_PAST_EOF) searches. - */ - if (search_type & SRCH_FORW) - { - pos = ch_zero(); - } else - { - pos = ch_length(); - if (pos == NULL_POSITION) - { - (void) ch_end_seek(); - pos = ch_length(); - } - } - sindex = 0; - } else - { - int add_one = 0; - - if (how_search == OPT_ON) - { - /* - * Search does not include current screen. - */ - if (search_type & SRCH_FORW) - sindex = sc_height-1; /* BOTTOM_PLUS_ONE */ - else - sindex = 0; /* TOP */ - } else if (how_search == OPT_ONPLUS && !(search_type & SRCH_AFTER_TARGET)) - { - /* - * Search includes all of displayed screen. - */ - if (search_type & SRCH_FORW) - sindex = 0; /* TOP */ - else - sindex = sc_height-1; /* BOTTOM_PLUS_ONE */ - } else - { - /* - * Search includes the part of current screen beyond the jump target. - * It starts at the jump target (if searching backwards), - * or at the jump target plus one (if forwards). - */ - sindex = sindex_from_sline(jump_sline); - if (search_type & SRCH_FORW) - add_one = 1; - } - pos = position(sindex); - if (add_one) - pos = forw_raw_line(pos, (char **)NULL, (int *)NULL); - } - - /* - * If the line is empty, look around for a plausible starting place. - */ - if (search_type & SRCH_FORW) - { - while (pos == NULL_POSITION) - { - if (++sindex >= sc_height) - break; - pos = position(sindex); - } - } else - { - while (pos == NULL_POSITION) - { - if (--sindex < 0) - break; - pos = position(sindex); - } - } - return (pos); + POSITION pos; + int sindex; + + if (empty_screen()) + { + /* + * Start at the beginning (or end) of the file. + * The empty_screen() case is mainly for + * command line initiated searches; + * for example, "+/xyz" on the command line. + * Also for multi-file (SRCH_PAST_EOF) searches. + */ + if (search_type & SRCH_FORW) + { + pos = ch_zero(); + } else + { + pos = ch_length(); + if (pos == NULL_POSITION) + { + (void) ch_end_seek(); + pos = ch_length(); + } + } + sindex = 0; + } else + { + int add_one = 0; + + if (how_search == OPT_ON) + { + /* + * Search does not include current screen. + */ + if (search_type & SRCH_FORW) + sindex = sc_height-1; /* BOTTOM_PLUS_ONE */ + else + sindex = 0; /* TOP */ + } else if (how_search == OPT_ONPLUS && !(search_type & SRCH_AFTER_TARGET)) + { + /* + * Search includes all of displayed screen. + */ + if (search_type & SRCH_FORW) + sindex = 0; /* TOP */ + else + sindex = sc_height-1; /* BOTTOM_PLUS_ONE */ + } else + { + /* + * Search includes the part of current screen beyond the jump target. + * It starts at the jump target (if searching backwards), + * or at the jump target plus one (if forwards). + */ + sindex = sindex_from_sline(jump_sline); + if (search_type & SRCH_FORW) + add_one = 1; + } + pos = position(sindex); + if (add_one) + pos = forw_raw_line(pos, (char **)NULL, (int *)NULL); + } + + /* + * If the line is empty, look around for a plausible starting place. + */ + if (search_type & SRCH_FORW) + { + while (pos == NULL_POSITION) + { + if (++sindex >= sc_height) + break; + pos = position(sindex); + } + } else + { + while (pos == NULL_POSITION) + { + if (--sindex < 0) + break; + pos = position(sindex); + } + } + return (pos); } /* @@ -1165,34 +1165,34 @@ search_pos(search_type) * If so, add an entry to the filter list. */ #if HILITE_SEARCH - static int + static int matches_filters(pos, cline, line_len, chpos, linepos, sp, ep) - POSITION pos; - char *cline; - int line_len; - int *chpos; - POSITION linepos; - char **sp; - char **ep; + POSITION pos; + char *cline; + int line_len; + int *chpos; + POSITION linepos; + char **sp; + char **ep; { - struct pattern_info *filter; - - for (filter = filter_infos; filter != NULL; filter = filter->next) - { - int line_filter = match_pattern(info_compiled(filter), filter->text, - cline, line_len, sp, ep, 0, filter->search_type); - if (line_filter) - { - struct hilite hl; - hl.hl_startpos = linepos; - hl.hl_endpos = pos; - add_hilite(&filter_anchor, &hl); - free(cline); - free(chpos); - return (1); - } - } - return (0); + struct pattern_info *filter; + + for (filter = filter_infos; filter != NULL; filter = filter->next) + { + int line_filter = match_pattern(info_compiled(filter), filter->text, + cline, line_len, sp, ep, 0, filter->search_type); + if (line_filter) + { + struct hilite hl; + hl.hl_startpos = linepos; + hl.hl_endpos = pos; + add_hilite(&filter_anchor, &hl); + free(cline); + free(chpos); + return (1); + } + } + return (0); } #endif @@ -1200,508 +1200,508 @@ matches_filters(pos, cline, line_len, chpos, linepos, sp, ep) * Get the position of the first char in the screen line which * puts tpos on screen. */ - static POSITION + static POSITION get_lastlinepos(pos, tpos, sheight) - POSITION pos; - POSITION tpos; - int sheight; + POSITION pos; + POSITION tpos; + int sheight; { - int nlines; - - for (nlines = 0;; nlines++) - { - POSITION npos = forw_line(pos); - if (npos > tpos) - { - if (nlines < sheight) - return NULL_POSITION; - return pos; - } - pos = npos; - } + int nlines; + + for (nlines = 0;; nlines++) + { + POSITION npos = forw_line(pos); + if (npos > tpos) + { + if (nlines < sheight) + return NULL_POSITION; + return pos; + } + pos = npos; + } } /* * Get the segment index of tpos in the line starting at pos. * A segment is a string of printable chars that fills the screen width. */ - static int + static int get_seg(pos, tpos) - POSITION pos; - POSITION tpos; + POSITION pos; + POSITION tpos; { - int seg; - - for (seg = 0;; seg++) - { - POSITION npos = forw_line_seg(pos, FALSE, FALSE, TRUE); - if (npos > tpos) - return seg; - pos = npos; - } + int seg; + + for (seg = 0;; seg++) + { + POSITION npos = forw_line_seg(pos, FALSE, FALSE, TRUE); + if (npos > tpos) + return seg; + pos = npos; + } } /* * Search a subset of the file, specified by start/end position. */ - static int + static int search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos, plastlinepos) - POSITION pos; - POSITION endpos; - int search_type; - int matches; - int maxlines; - POSITION *plinepos; - POSITION *pendpos; - POSITION *plastlinepos; + POSITION pos; + POSITION endpos; + int search_type; + int matches; + int maxlines; + POSITION *plinepos; + POSITION *pendpos; + POSITION *plastlinepos; { - char *line; - char *cline; - int line_len; - LINENUM linenum; - char *sp, *ep; - int line_match; - int cvt_ops; - int cvt_len; - int *chpos; - POSITION linepos, oldpos; - int swidth = sc_width - line_pfx_width(); - int sheight = sc_height - sindex_from_sline(jump_sline); - - linenum = find_linenum(pos); - oldpos = pos; - /* When the search wraps around, end at starting position. */ - if ((search_type & SRCH_WRAP) && endpos == NULL_POSITION) - endpos = pos; - for (;;) - { - /* - * Get lines until we find a matching one or until - * we hit end-of-file (or beginning-of-file if we're - * going backwards), or until we hit the end position. - */ - if (ABORT_SIGS()) - { - /* - * A signal aborts the search. - */ - return (-1); - } - - if ((endpos != NULL_POSITION && !(search_type & SRCH_WRAP) && - (((search_type & SRCH_FORW) && pos >= endpos) || - ((search_type & SRCH_BACK) && pos <= endpos))) || maxlines == 0) - { - /* - * Reached end position without a match. - */ - if (pendpos != NULL) - *pendpos = pos; - return (matches); - } - if (maxlines > 0) - maxlines--; - - if (search_type & SRCH_FORW) - { - /* - * Read the next line, and save the - * starting position of that line in linepos. - */ - linepos = pos; - pos = forw_raw_line(pos, &line, &line_len); - if (linenum != 0) - linenum++; - } else - { - /* - * Read the previous line and save the - * starting position of that line in linepos. - */ - pos = back_raw_line(pos, &line, &line_len); - linepos = pos; - if (linenum != 0) - linenum--; - } - - if (pos == NULL_POSITION) - { - /* - * Reached EOF/BOF without a match. - */ - if (search_type & SRCH_WRAP) - { - /* - * The search wraps around the current file, so - * try to continue at BOF/EOF. - */ - if (search_type & SRCH_FORW) - { - pos = ch_zero(); - } else - { - pos = ch_length(); - if (pos == NULL_POSITION) - { - (void) ch_end_seek(); - pos = ch_length(); - } - } - if (pos != NULL_POSITION) { - /* - * Wrap-around was successful. Clear - * the flag so we don't wrap again, and - * continue the search at new pos. - */ - search_type &= ~SRCH_WRAP; - linenum = find_linenum(pos); - continue; - } - } - if (pendpos != NULL) - *pendpos = oldpos; - return (matches); - } - - /* - * If we're using line numbers, we might as well - * remember the information we have now (the position - * and line number of the current line). - * Don't do it for every line because it slows down - * the search. Remember the line number only if - * we're "far" from the last place we remembered it. - */ - if (linenums && abs((int)(pos - oldpos)) > 2048) - add_lnum(linenum, pos); - oldpos = pos; + char *line; + char *cline; + int line_len; + LINENUM linenum; + char *sp, *ep; + int line_match; + int cvt_ops; + int cvt_len; + int *chpos; + POSITION linepos, oldpos; + int swidth = sc_width - line_pfx_width(); + int sheight = sc_height - sindex_from_sline(jump_sline); + + linenum = find_linenum(pos); + oldpos = pos; + /* When the search wraps around, end at starting position. */ + if ((search_type & SRCH_WRAP) && endpos == NULL_POSITION) + endpos = pos; + for (;;) + { + /* + * Get lines until we find a matching one or until + * we hit end-of-file (or beginning-of-file if we're + * going backwards), or until we hit the end position. + */ + if (ABORT_SIGS()) + { + /* + * A signal aborts the search. + */ + return (-1); + } + + if ((endpos != NULL_POSITION && !(search_type & SRCH_WRAP) && + (((search_type & SRCH_FORW) && pos >= endpos) || + ((search_type & SRCH_BACK) && pos <= endpos))) || maxlines == 0) + { + /* + * Reached end position without a match. + */ + if (pendpos != NULL) + *pendpos = pos; + return (matches); + } + if (maxlines > 0) + maxlines--; + + if (search_type & SRCH_FORW) + { + /* + * Read the next line, and save the + * starting position of that line in linepos. + */ + linepos = pos; + pos = forw_raw_line(pos, &line, &line_len); + if (linenum != 0) + linenum++; + } else + { + /* + * Read the previous line and save the + * starting position of that line in linepos. + */ + pos = back_raw_line(pos, &line, &line_len); + linepos = pos; + if (linenum != 0) + linenum--; + } + + if (pos == NULL_POSITION) + { + /* + * Reached EOF/BOF without a match. + */ + if (search_type & SRCH_WRAP) + { + /* + * The search wraps around the current file, so + * try to continue at BOF/EOF. + */ + if (search_type & SRCH_FORW) + { + pos = ch_zero(); + } else + { + pos = ch_length(); + if (pos == NULL_POSITION) + { + (void) ch_end_seek(); + pos = ch_length(); + } + } + if (pos != NULL_POSITION) { + /* + * Wrap-around was successful. Clear + * the flag so we don't wrap again, and + * continue the search at new pos. + */ + search_type &= ~SRCH_WRAP; + linenum = find_linenum(pos); + continue; + } + } + if (pendpos != NULL) + *pendpos = oldpos; + return (matches); + } + + /* + * If we're using line numbers, we might as well + * remember the information we have now (the position + * and line number of the current line). + * Don't do it for every line because it slows down + * the search. Remember the line number only if + * we're "far" from the last place we remembered it. + */ + if (linenums && abs((int)(pos - oldpos)) > 2048) + add_lnum(linenum, pos); + oldpos = pos; #if HILITE_SEARCH - if (is_filtered(linepos)) - continue; + if (is_filtered(linepos)) + continue; #endif - /* - * If it's a caseless search, convert the line to lowercase. - * If we're doing backspace processing, delete backspaces. - */ - cvt_ops = get_cvt_ops(); - cvt_len = cvt_length(line_len, cvt_ops); - cline = (char *) ecalloc(1, cvt_len); - chpos = cvt_alloc_chpos(cvt_len); - cvt_text(cline, line, chpos, &line_len, cvt_ops); + /* + * If it's a caseless search, convert the line to lowercase. + * If we're doing backspace processing, delete backspaces. + */ + cvt_ops = get_cvt_ops(); + cvt_len = cvt_length(line_len, cvt_ops); + cline = (char *) ecalloc(1, cvt_len); + chpos = cvt_alloc_chpos(cvt_len); + cvt_text(cline, line, chpos, &line_len, cvt_ops); #if HILITE_SEARCH - /* - * If any filters are in effect, ignore non-matching lines. - */ - if (filter_infos != NULL && - ((search_type & SRCH_FIND_ALL) || - prep_startpos == NULL_POSITION || - linepos < prep_startpos || linepos >= prep_endpos)) { - if (matches_filters(pos, cline, line_len, chpos, linepos, &sp, &ep)) - continue; - } + /* + * If any filters are in effect, ignore non-matching lines. + */ + if (filter_infos != NULL && + ((search_type & SRCH_FIND_ALL) || + prep_startpos == NULL_POSITION || + linepos < prep_startpos || linepos >= prep_endpos)) { + if (matches_filters(pos, cline, line_len, chpos, linepos, &sp, &ep)) + continue; + } #endif - /* - * Test the next line to see if we have a match. - * We are successful if we either want a match and got one, - * or if we want a non-match and got one. - */ - if (prev_pattern(&search_info)) - { - line_match = match_pattern(info_compiled(&search_info), search_info.text, - cline, line_len, &sp, &ep, 0, search_type); - if (line_match) - { - /* - * Got a match. - */ - if (search_type & SRCH_FIND_ALL) - { + /* + * Test the next line to see if we have a match. + * We are successful if we either want a match and got one, + * or if we want a non-match and got one. + */ + if (prev_pattern(&search_info)) + { + line_match = match_pattern(info_compiled(&search_info), search_info.text, + cline, line_len, &sp, &ep, 0, search_type); + if (line_match) + { + /* + * Got a match. + */ + if (search_type & SRCH_FIND_ALL) + { #if HILITE_SEARCH - /* - * We are supposed to find all matches in the range. - * Just add the matches in this line to the - * hilite list and keep searching. - */ - hilite_line(linepos, cline, line_len, chpos, sp, ep, cvt_ops); + /* + * We are supposed to find all matches in the range. + * Just add the matches in this line to the + * hilite list and keep searching. + */ + hilite_line(linepos, cline, line_len, chpos, sp, ep, cvt_ops); #endif - } else if (--matches <= 0) - { - /* - * Found the one match we're looking for. - * Return it. - */ + } else if (--matches <= 0) + { + /* + * Found the one match we're looking for. + * Return it. + */ #if HILITE_SEARCH - if (hilite_search == OPT_ON) - { - /* - * Clear the hilite list and add only - * the matches in this one line. - */ - clr_hilite(); - hilite_line(linepos, cline, line_len, chpos, sp, ep, cvt_ops); - } + if (hilite_search == OPT_ON) + { + /* + * Clear the hilite list and add only + * the matches in this one line. + */ + clr_hilite(); + hilite_line(linepos, cline, line_len, chpos, sp, ep, cvt_ops); + } #endif - if (chop_line()) - { - /* - * If necessary, shift horizontally to make sure - * search match is fully visible. - */ - if (sp != NULL && ep != NULL) - { - int start_off = sp - cline; - int end_off = ep - cline; - int save_hshift = hshift; - int sshift; - int eshift; - hshift = 0; /* make get_seg count screen lines */ - sshift = swidth * get_seg(linepos, linepos + chpos[start_off]); - eshift = swidth * get_seg(linepos, linepos + chpos[end_off]); - if (sshift >= save_hshift && eshift <= save_hshift) - { - hshift = save_hshift; - } else - { - hshift = sshift; - screen_trashed = 1; - } - } - } else if (plastlinepos != NULL) - { - /* - * If the line is so long that the highlighted match - * won't be seen when the line is displayed normally - * (starting at the first char) because it fills the whole - * screen and more, scroll forward until the last char - * of the match appears in the last line on the screen. - * lastlinepos is the position of the first char of that last line. - */ - if (ep != NULL) - { - int end_off = ep - cline; - if (end_off >= swidth * sheight / 4) /* heuristic */ - *plastlinepos = get_lastlinepos(linepos, linepos + chpos[end_off], sheight); - } - } - free(cline); - free(chpos); - if (plinepos != NULL) - *plinepos = linepos; - return (0); - } - } - } - free(cline); - free(chpos); - } + if (chop_line()) + { + /* + * If necessary, shift horizontally to make sure + * search match is fully visible. + */ + if (sp != NULL && ep != NULL) + { + int start_off = sp - cline; + int end_off = ep - cline; + int save_hshift = hshift; + int sshift; + int eshift; + hshift = 0; /* make get_seg count screen lines */ + sshift = swidth * get_seg(linepos, linepos + chpos[start_off]); + eshift = swidth * get_seg(linepos, linepos + chpos[end_off]); + if (sshift >= save_hshift && eshift <= save_hshift) + { + hshift = save_hshift; + } else + { + hshift = sshift; + screen_trashed = 1; + } + } + } else if (plastlinepos != NULL) + { + /* + * If the line is so long that the highlighted match + * won't be seen when the line is displayed normally + * (starting at the first char) because it fills the whole + * screen and more, scroll forward until the last char + * of the match appears in the last line on the screen. + * lastlinepos is the position of the first char of that last line. + */ + if (ep != NULL) + { + int end_off = ep - cline; + if (end_off >= swidth * sheight / 4) /* heuristic */ + *plastlinepos = get_lastlinepos(linepos, linepos + chpos[end_off], sheight); + } + } + free(cline); + free(chpos); + if (plinepos != NULL) + *plinepos = linepos; + return (0); + } + } + } + free(cline); + free(chpos); + } } /* * search for a pattern in history. If found, compile that pattern. */ - static int -hist_pattern(search_type) - int search_type; + static int +hist_pattern(search_type) + int search_type; { #if CMD_HISTORY - char *pattern; + char *pattern; - set_mlist(ml_search, 0); - pattern = cmd_lastpattern(); - if (pattern == NULL) - return (0); + set_mlist(ml_search, 0); + pattern = cmd_lastpattern(); + if (pattern == NULL) + return (0); - if (set_pattern(&search_info, pattern, search_type, 1) < 0) - return (-1); + if (set_pattern(&search_info, pattern, search_type, 1) < 0) + return (-1); #if HILITE_SEARCH - if (hilite_search == OPT_ONPLUS && !hide_hilite) - hilite_screen(); + if (hilite_search == OPT_ONPLUS && !hide_hilite) + hilite_screen(); #endif - return (1); + return (1); #else /* CMD_HISTORY */ - return (0); + return (0); #endif /* CMD_HISTORY */ } /* - * Change the caseless-ness of searches. + * Change the caseless-ness of searches. * Updates the internal search state to reflect a change in the -i flag. */ - public void + public void chg_caseless(VOID_PARAM) { - if (!is_ucase_pattern) - { - /* - * Pattern did not have uppercase. - * Set the search caselessness to the global caselessness. - */ - is_caseless = caseless; - /* - * If regex handles caseless, we need to discard - * the pattern which was compiled with the old caseless. - */ - if (!re_handles_caseless) - /* We handle caseless, so the pattern doesn't change. */ - return; - } - /* - * Regenerate the pattern using the new state. - */ - clear_pattern(&search_info); - (void) hist_pattern(search_info.search_type); + if (!is_ucase_pattern) + { + /* + * Pattern did not have uppercase. + * Set the search caselessness to the global caselessness. + */ + is_caseless = caseless; + /* + * If regex handles caseless, we need to discard + * the pattern which was compiled with the old caseless. + */ + if (!re_handles_caseless) + /* We handle caseless, so the pattern doesn't change. */ + return; + } + /* + * Regenerate the pattern using the new state. + */ + clear_pattern(&search_info); + (void) hist_pattern(search_info.search_type); } /* - * Search for the n-th occurrence of a specified pattern, + * Search for the n-th occurrence of a specified pattern, * either forward or backward. * Return the number of matches not yet found in this file * (that is, n minus the number of matches found). * Return -1 if the search should be aborted. - * Caller may continue the search in another file + * Caller may continue the search in another file * if less than n matches are found in this file. */ - public int + public int search(search_type, pattern, n) - int search_type; - char *pattern; - int n; + int search_type; + char *pattern; + int n; { - POSITION pos; - POSITION opos; - POSITION lastlinepos = NULL_POSITION; - - if (pattern == NULL || *pattern == '\0') - { - /* - * A null pattern means use the previously compiled pattern. - */ - search_type |= SRCH_AFTER_TARGET; - if (!prev_pattern(&search_info)) - { - int r = hist_pattern(search_type); - if (r == 0) - error("No previous regular expression", NULL_PARG); - if (r <= 0) - return (-1); - } - if ((search_type & SRCH_NO_REGEX) != - (search_info.search_type & SRCH_NO_REGEX)) - { - error("Please re-enter search pattern", NULL_PARG); - return -1; - } + POSITION pos; + POSITION opos; + POSITION lastlinepos = NULL_POSITION; + + if (pattern == NULL || *pattern == '\0') + { + /* + * A null pattern means use the previously compiled pattern. + */ + search_type |= SRCH_AFTER_TARGET; + if (!prev_pattern(&search_info)) + { + int r = hist_pattern(search_type); + if (r == 0) + error("No previous regular expression", NULL_PARG); + if (r <= 0) + return (-1); + } + if ((search_type & SRCH_NO_REGEX) != + (search_info.search_type & SRCH_NO_REGEX)) + { + error("Please re-enter search pattern", NULL_PARG); + return -1; + } #if HILITE_SEARCH - if (hilite_search == OPT_ON || status_col) - { - /* - * Erase the highlights currently on screen. - * If the search fails, we'll redisplay them later. - */ - repaint_hilite(0); - } - if (hilite_search == OPT_ONPLUS && hide_hilite) - { - /* - * Highlight any matches currently on screen, - * before we actually start the search. - */ - hide_hilite = 0; - hilite_screen(); - } - hide_hilite = 0; + if (hilite_search == OPT_ON || status_col) + { + /* + * Erase the highlights currently on screen. + * If the search fails, we'll redisplay them later. + */ + repaint_hilite(0); + } + if (hilite_search == OPT_ONPLUS && hide_hilite) + { + /* + * Highlight any matches currently on screen, + * before we actually start the search. + */ + hide_hilite = 0; + hilite_screen(); + } + hide_hilite = 0; #endif - } else - { - /* - * Compile the pattern. - */ - int show_error = !(search_type & SRCH_INCR); - if (set_pattern(&search_info, pattern, search_type, show_error) < 0) - return (-1); + } else + { + /* + * Compile the pattern. + */ + int show_error = !(search_type & SRCH_INCR); + if (set_pattern(&search_info, pattern, search_type, show_error) < 0) + return (-1); #if HILITE_SEARCH - if (hilite_search || status_col) - { - /* - * Erase the highlights currently on screen. - * Also permanently delete them from the hilite list. - */ - repaint_hilite(0); - hide_hilite = 0; - clr_hilite(); - } - if (hilite_search == OPT_ONPLUS || status_col) - { - /* - * Highlight any matches currently on screen, - * before we actually start the search. - */ - hilite_screen(); - } + if (hilite_search || status_col) + { + /* + * Erase the highlights currently on screen. + * Also permanently delete them from the hilite list. + */ + repaint_hilite(0); + hide_hilite = 0; + clr_hilite(); + } + if (hilite_search == OPT_ONPLUS || status_col) + { + /* + * Highlight any matches currently on screen, + * before we actually start the search. + */ + hilite_screen(); + } #endif - } - - /* - * Figure out where to start the search. - */ - pos = search_pos(search_type); - opos = position(sindex_from_sline(jump_sline)); - if (pos == NULL_POSITION) - { - /* - * Can't find anyplace to start searching from. - */ - if (search_type & SRCH_PAST_EOF) - return (n); + } + + /* + * Figure out where to start the search. + */ + pos = search_pos(search_type); + opos = position(sindex_from_sline(jump_sline)); + if (pos == NULL_POSITION) + { + /* + * Can't find anyplace to start searching from. + */ + if (search_type & SRCH_PAST_EOF) + return (n); #if HILITE_SEARCH - if (hilite_search == OPT_ON || status_col) - repaint_hilite(1); + if (hilite_search == OPT_ON || status_col) + repaint_hilite(1); #endif - error("Nothing to search", NULL_PARG); - return (-1); - } - - n = search_range(pos, NULL_POSITION, search_type, n, -1, - &pos, (POSITION*)NULL, &lastlinepos); - if (n != 0) - { - /* - * Search was unsuccessful. - */ + error("Nothing to search", NULL_PARG); + return (-1); + } + + n = search_range(pos, NULL_POSITION, search_type, n, -1, + &pos, (POSITION*)NULL, &lastlinepos); + if (n != 0) + { + /* + * Search was unsuccessful. + */ #if HILITE_SEARCH - if ((hilite_search == OPT_ON || status_col) && n > 0) - /* - * Redisplay old hilites. - */ - repaint_hilite(1); + if ((hilite_search == OPT_ON || status_col) && n > 0) + /* + * Redisplay old hilites. + */ + repaint_hilite(1); #endif - return (n); - } - - if (!(search_type & SRCH_NO_MOVE)) - { - /* - * Go to the matching line. - */ - if (lastlinepos != NULL_POSITION) - jump_loc(lastlinepos, BOTTOM); - else if (pos != opos) - jump_loc(pos, jump_sline); - } + return (n); + } + + if (!(search_type & SRCH_NO_MOVE)) + { + /* + * Go to the matching line. + */ + if (lastlinepos != NULL_POSITION) + jump_loc(lastlinepos, BOTTOM); + else if (pos != opos) + jump_loc(pos, jump_sline); + } #if HILITE_SEARCH - if (hilite_search == OPT_ON || status_col) - /* - * Display new hilites in the matching line. - */ - repaint_hilite(1); + if (hilite_search == OPT_ON || status_col) + /* + * Display new hilites in the matching line. + */ + repaint_hilite(1); #endif - return (0); + return (0); } #if HILITE_SEARCH @@ -1715,18 +1715,18 @@ search(search_type, pattern, n) * If prep_endpos == NULL_POSITION, the prep region extends to EOF. * prep_hilite asks that the range (spos,epos) be covered by the prep region. */ - public void + public void prep_hilite(spos, epos, maxlines) - POSITION spos; - POSITION epos; - int maxlines; + POSITION spos; + POSITION epos; + int maxlines; { - POSITION nprep_startpos = prep_startpos; - POSITION nprep_endpos = prep_endpos; - POSITION new_epos; - POSITION max_epos; - int result; - int i; + POSITION nprep_startpos = prep_startpos; + POSITION nprep_endpos = prep_endpos; + POSITION new_epos; + POSITION max_epos; + int result; + int i; /* * Search beyond where we're asked to search, so the prep region covers @@ -1734,221 +1734,220 @@ prep_hilite(spos, epos, maxlines) */ #define SEARCH_MORE (3*size_linebuf) - if (!prev_pattern(&search_info) && !is_filtering()) - return; - - /* - * Make sure our prep region always starts at the beginning of - * a line. (search_range takes care of the end boundary below.) - */ - spos = back_raw_line(spos+1, (char **)NULL, (int *)NULL); - - /* - * If we're limited to a max number of lines, figure out the - * file position we should stop at. - */ - if (maxlines < 0) - max_epos = NULL_POSITION; - else - { - max_epos = spos; - for (i = 0; i < maxlines; i++) - max_epos = forw_raw_line(max_epos, (char **)NULL, (int *)NULL); - } - - /* - * Find two ranges: - * The range that we need to search (spos,epos); and the range that - * the "prep" region will then cover (nprep_startpos,nprep_endpos). - */ - - if (prep_startpos == NULL_POSITION || - (epos != NULL_POSITION && epos < prep_startpos) || - spos > prep_endpos) - { - /* - * New range is not contiguous with old prep region. - * Discard the old prep region and start a new one. - */ - clr_hilite(); - clr_filter(); - if (epos != NULL_POSITION) - epos += SEARCH_MORE; - nprep_startpos = spos; - } else - { - /* - * New range partially or completely overlaps old prep region. - */ - if (epos == NULL_POSITION) - { - /* - * New range goes to end of file. - */ - ; - } else if (epos > prep_endpos) - { - /* - * New range ends after old prep region. - * Extend prep region to end at end of new range. - */ - epos += SEARCH_MORE; - } else /* (epos <= prep_endpos) */ - { - /* - * New range ends within old prep region. - * Truncate search to end at start of old prep region. - */ - epos = prep_startpos; - } - - if (spos < prep_startpos) - { - /* - * New range starts before old prep region. - * Extend old prep region backwards to start at - * start of new range. - */ - if (spos < SEARCH_MORE) - spos = 0; - else - spos -= SEARCH_MORE; - nprep_startpos = spos; - } else /* (spos >= prep_startpos) */ - { - /* - * New range starts within or after old prep region. - * Trim search to start at end of old prep region. - */ - spos = prep_endpos; - } - } - - if (epos != NULL_POSITION && max_epos != NULL_POSITION && - epos > max_epos) - /* - * Don't go past the max position we're allowed. - */ - epos = max_epos; - - if (epos == NULL_POSITION || epos > spos) - { - int search_type = SRCH_FORW | SRCH_FIND_ALL; - search_type |= (search_info.search_type & SRCH_NO_REGEX); - for (;;) - { - result = search_range(spos, epos, search_type, 0, maxlines, (POSITION*)NULL, &new_epos, (POSITION*)NULL); - if (result < 0) - return; - if (prep_endpos == NULL_POSITION || new_epos > prep_endpos) - nprep_endpos = new_epos; - - /* - * Check both ends of the resulting prep region to - * make sure they're not filtered. If they are, - * keep going at least one more line until we find - * something that isn't filtered, or hit the end. - */ - if (prep_endpos == NULL_POSITION || nprep_endpos > prep_endpos) - { - if (new_epos >= nprep_endpos && is_filtered(new_epos-1)) - { - spos = nprep_endpos; - epos = forw_raw_line(nprep_endpos, (char **)NULL, (int *)NULL); - if (epos == NULL_POSITION) - break; - maxlines = 1; - continue; - } - } - - if (prep_startpos == NULL_POSITION || nprep_startpos < prep_startpos) - { - if (nprep_startpos > 0 && is_filtered(nprep_startpos)) - { - epos = nprep_startpos; - spos = back_raw_line(nprep_startpos, (char **)NULL, (int *)NULL); - if (spos == NULL_POSITION) - break; - nprep_startpos = spos; - maxlines = 1; - continue; - } - } - break; - } - } - prep_startpos = nprep_startpos; - prep_endpos = nprep_endpos; + if (!prev_pattern(&search_info) && !is_filtering()) + return; + + /* + * Make sure our prep region always starts at the beginning of + * a line. (search_range takes care of the end boundary below.) + */ + spos = back_raw_line(spos+1, (char **)NULL, (int *)NULL); + + /* + * If we're limited to a max number of lines, figure out the + * file position we should stop at. + */ + if (maxlines < 0) + max_epos = NULL_POSITION; + else + { + max_epos = spos; + for (i = 0; i < maxlines; i++) + max_epos = forw_raw_line(max_epos, (char **)NULL, (int *)NULL); + } + + /* + * Find two ranges: + * The range that we need to search (spos,epos); and the range that + * the "prep" region will then cover (nprep_startpos,nprep_endpos). + */ + + if (prep_startpos == NULL_POSITION || + (epos != NULL_POSITION && epos < prep_startpos) || + spos > prep_endpos) + { + /* + * New range is not contiguous with old prep region. + * Discard the old prep region and start a new one. + */ + clr_hilite(); + clr_filter(); + if (epos != NULL_POSITION) + epos += SEARCH_MORE; + nprep_startpos = spos; + } else + { + /* + * New range partially or completely overlaps old prep region. + */ + if (epos == NULL_POSITION) + { + /* + * New range goes to end of file. + */ + ; + } else if (epos > prep_endpos) + { + /* + * New range ends after old prep region. + * Extend prep region to end at end of new range. + */ + epos += SEARCH_MORE; + } else /* (epos <= prep_endpos) */ + { + /* + * New range ends within old prep region. + * Truncate search to end at start of old prep region. + */ + epos = prep_startpos; + } + + if (spos < prep_startpos) + { + /* + * New range starts before old prep region. + * Extend old prep region backwards to start at + * start of new range. + */ + if (spos < SEARCH_MORE) + spos = 0; + else + spos -= SEARCH_MORE; + nprep_startpos = spos; + } else /* (spos >= prep_startpos) */ + { + /* + * New range starts within or after old prep region. + * Trim search to start at end of old prep region. + */ + spos = prep_endpos; + } + } + + if (epos != NULL_POSITION && max_epos != NULL_POSITION && + epos > max_epos) + /* + * Don't go past the max position we're allowed. + */ + epos = max_epos; + + if (epos == NULL_POSITION || epos > spos) + { + int search_type = SRCH_FORW | SRCH_FIND_ALL; + search_type |= (search_info.search_type & SRCH_NO_REGEX); + for (;;) + { + result = search_range(spos, epos, search_type, 0, maxlines, (POSITION*)NULL, &new_epos, (POSITION*)NULL); + if (result < 0) + return; + if (prep_endpos == NULL_POSITION || new_epos > prep_endpos) + nprep_endpos = new_epos; + + /* + * Check both ends of the resulting prep region to + * make sure they're not filtered. If they are, + * keep going at least one more line until we find + * something that isn't filtered, or hit the end. + */ + if (prep_endpos == NULL_POSITION || nprep_endpos > prep_endpos) + { + if (new_epos >= nprep_endpos && is_filtered(new_epos-1)) + { + spos = nprep_endpos; + epos = forw_raw_line(nprep_endpos, (char **)NULL, (int *)NULL); + if (epos == NULL_POSITION) + break; + maxlines = 1; + continue; + } + } + + if (prep_startpos == NULL_POSITION || nprep_startpos < prep_startpos) + { + if (nprep_startpos > 0 && is_filtered(nprep_startpos)) + { + epos = nprep_startpos; + spos = back_raw_line(nprep_startpos, (char **)NULL, (int *)NULL); + if (spos == NULL_POSITION) + break; + nprep_startpos = spos; + maxlines = 1; + continue; + } + } + break; + } + } + prep_startpos = nprep_startpos; + prep_endpos = nprep_endpos; } /* * Set the pattern to be used for line filtering. */ - public void + public void set_filter_pattern(pattern, search_type) - char *pattern; - int search_type; + char *pattern; + int search_type; { - struct pattern_info *filter; - - clr_filter(); - if (pattern == NULL || *pattern == '\0') - { - /* Clear and free all filters. */ - for (filter = filter_infos; filter != NULL; ) - { - struct pattern_info *next_filter = filter->next; - clear_pattern(filter); - free(filter); - filter = next_filter; - } - filter_infos = NULL; - } else - { - /* Create a new filter and add it to the filter_infos list. */ - filter = ecalloc(1, sizeof(struct pattern_info)); - init_pattern(filter); - if (set_pattern(filter, pattern, search_type, 1) < 0) - { - free(filter); - return; - } - filter->next = filter_infos; - filter_infos = filter; - } - screen_trashed = 1; + struct pattern_info *filter; + + clr_filter(); + if (pattern == NULL || *pattern == '\0') + { + /* Clear and free all filters. */ + for (filter = filter_infos; filter != NULL; ) + { + struct pattern_info *next_filter = filter->next; + clear_pattern(filter); + free(filter); + filter = next_filter; + } + filter_infos = NULL; + } else + { + /* Create a new filter and add it to the filter_infos list. */ + filter = ecalloc(1, sizeof(struct pattern_info)); + init_pattern(filter); + if (set_pattern(filter, pattern, search_type, 1) < 0) + { + free(filter); + return; + } + filter->next = filter_infos; + filter_infos = filter; + } + screen_trashed = 1; } /* * Is there a line filter in effect? */ - public int + public int is_filtering(VOID_PARAM) { - if (ch_getflags() & CH_HELPFILE) - return (0); - return (filter_infos != NULL); + if (ch_getflags() & CH_HELPFILE) + return (0); + return (filter_infos != NULL); } #endif #if HAVE_V8_REGCOMP /* - * This function is called by the V8 regcomp to report + * This function is called by the V8 regcomp to report * errors in regular expressions. */ public int reg_show_error = 1; - void -regerror(s) - char *s; + void +regerror(s) + char *s; { - PARG parg; + PARG parg; - if (!reg_show_error) - return; - parg.p_string = s; - error("%s", &parg); + if (!reg_show_error) + return; + parg.p_string = s; + error("%s", &parg); } #endif - diff --git a/signal.c b/signal.c index 294fa6a..a4d77f7 100644 --- a/signal.c +++ b/signal.c @@ -40,31 +40,31 @@ extern long jump_sline_fraction; * Interrupt signal handler. */ #if MSDOS_COMPILER!=WIN32C - /* ARGSUSED*/ - static RETSIGTYPE + /* ARGSUSED*/ + static RETSIGTYPE u_interrupt(type) - int type; + int type; { - bell(); + bell(); #if OS2 - LSIGNAL(SIGINT, SIG_ACK); + LSIGNAL(SIGINT, SIG_ACK); #endif - LSIGNAL(SIGINT, u_interrupt); - sigs |= S_INTERRUPT; + LSIGNAL(SIGINT, u_interrupt); + sigs |= S_INTERRUPT; #if MSDOS_COMPILER==DJGPPC - /* - * If a keyboard has been hit, it must be Ctrl-C - * (as opposed to Ctrl-Break), so consume it. - * (Otherwise, Less will beep when it sees Ctrl-C from keyboard.) - */ - if (kbhit()) - getkey(); + /* + * If a keyboard has been hit, it must be Ctrl-C + * (as opposed to Ctrl-Break), so consume it. + * (Otherwise, Less will beep when it sees Ctrl-C from keyboard.) + */ + if (kbhit()) + getkey(); #endif #if HILITE_SEARCH - set_filter_pattern(NULL, 0); + set_filter_pattern(NULL, 0); #endif - if (reading) - intread(); /* May longjmp */ + if (reading) + intread(); /* May longjmp */ } #endif @@ -72,15 +72,15 @@ u_interrupt(type) /* * "Stop" (^Z) signal handler. */ - /* ARGSUSED*/ - static RETSIGTYPE + /* ARGSUSED*/ + static RETSIGTYPE stop(type) - int type; + int type; { - LSIGNAL(SIGTSTP, stop); - sigs |= S_STOP; - if (reading) - intread(); + LSIGNAL(SIGTSTP, stop); + sigs |= S_STOP; + if (reading) + intread(); } #endif @@ -97,15 +97,15 @@ stop(type) /* * "Window" change handler */ - /* ARGSUSED*/ - public RETSIGTYPE + /* ARGSUSED*/ + public RETSIGTYPE winch(type) - int type; + int type; { - LSIGNAL(SIG_LESSWINDOW, winch); - sigs |= S_WINCH; - if (reading) - intread(); + LSIGNAL(SIG_LESSWINDOW, winch); + sigs |= S_WINCH; + if (reading) + intread(); } #endif @@ -116,159 +116,159 @@ winch(type) #define WIN32_LEAN_AND_MEAN #include - static BOOL WINAPI + static BOOL WINAPI wbreak_handler(dwCtrlType) - DWORD dwCtrlType; + DWORD dwCtrlType; { - switch (dwCtrlType) - { - case CTRL_C_EVENT: - case CTRL_BREAK_EVENT: - sigs |= S_INTERRUPT; + switch (dwCtrlType) + { + case CTRL_C_EVENT: + case CTRL_BREAK_EVENT: + sigs |= S_INTERRUPT; #if HILITE_SEARCH - set_filter_pattern(NULL, 0); + set_filter_pattern(NULL, 0); #endif - return (TRUE); - default: - break; - } - return (FALSE); + return (TRUE); + default: + break; + } + return (FALSE); } #endif - static RETSIGTYPE + static RETSIGTYPE terminate(type) - int type; + int type; { - quit(15); + quit(15); } /* * Set up the signal handlers. */ - public void + public void init_signals(on) - int on; + int on; { - if (on) - { - /* - * Set signal handlers. - */ + if (on) + { + /* + * Set signal handlers. + */ #if MSDOS_COMPILER==WIN32C - SetConsoleCtrlHandler(wbreak_handler, TRUE); + SetConsoleCtrlHandler(wbreak_handler, TRUE); #else - (void) LSIGNAL(SIGINT, u_interrupt); + (void) LSIGNAL(SIGINT, u_interrupt); #endif #ifdef SIGTSTP - (void) LSIGNAL(SIGTSTP, secure ? SIG_IGN : stop); + (void) LSIGNAL(SIGTSTP, secure ? SIG_IGN : stop); #endif #ifdef SIGWINCH - (void) LSIGNAL(SIGWINCH, winch); + (void) LSIGNAL(SIGWINCH, winch); #endif #ifdef SIGWIND - (void) LSIGNAL(SIGWIND, winch); + (void) LSIGNAL(SIGWIND, winch); #endif #ifdef SIGQUIT - (void) LSIGNAL(SIGQUIT, SIG_IGN); + (void) LSIGNAL(SIGQUIT, SIG_IGN); #endif #ifdef SIGTERM - (void) LSIGNAL(SIGTERM, terminate); + (void) LSIGNAL(SIGTERM, terminate); #endif - } else - { - /* - * Restore signals to defaults. - */ + } else + { + /* + * Restore signals to defaults. + */ #if MSDOS_COMPILER==WIN32C - SetConsoleCtrlHandler(wbreak_handler, FALSE); + SetConsoleCtrlHandler(wbreak_handler, FALSE); #else - (void) LSIGNAL(SIGINT, SIG_DFL); + (void) LSIGNAL(SIGINT, SIG_DFL); #endif #ifdef SIGTSTP - (void) LSIGNAL(SIGTSTP, SIG_DFL); + (void) LSIGNAL(SIGTSTP, SIG_DFL); #endif #ifdef SIGWINCH - (void) LSIGNAL(SIGWINCH, SIG_IGN); + (void) LSIGNAL(SIGWINCH, SIG_IGN); #endif #ifdef SIGWIND - (void) LSIGNAL(SIGWIND, SIG_IGN); + (void) LSIGNAL(SIGWIND, SIG_IGN); #endif #ifdef SIGQUIT - (void) LSIGNAL(SIGQUIT, SIG_DFL); + (void) LSIGNAL(SIGQUIT, SIG_DFL); #endif #ifdef SIGTERM - (void) LSIGNAL(SIGTERM, SIG_DFL); + (void) LSIGNAL(SIGTERM, SIG_DFL); #endif - } + } } /* * Process any signals we have received. * A received signal cause a bit to be set in "sigs". */ - public void + public void psignals(VOID_PARAM) { - int tsignals; + int tsignals; - if ((tsignals = sigs) == 0) - return; - sigs = 0; + if ((tsignals = sigs) == 0) + return; + sigs = 0; #ifdef SIGTSTP - if (tsignals & S_STOP) - { - /* - * Clean up the terminal. - */ + if (tsignals & S_STOP) + { + /* + * Clean up the terminal. + */ #ifdef SIGTTOU - LSIGNAL(SIGTTOU, SIG_IGN); + LSIGNAL(SIGTTOU, SIG_IGN); #endif - clear_bot(); - deinit(); - flush(); - raw_mode(0); + clear_bot(); + deinit(); + flush(); + raw_mode(0); #ifdef SIGTTOU - LSIGNAL(SIGTTOU, SIG_DFL); + LSIGNAL(SIGTTOU, SIG_DFL); #endif - LSIGNAL(SIGTSTP, SIG_DFL); - kill(getpid(), SIGTSTP); - /* - * ... Bye bye. ... - * Hopefully we'll be back later and resume here... - * Reset the terminal and arrange to repaint the - * screen when we get back to the main command loop. - */ - LSIGNAL(SIGTSTP, stop); - raw_mode(1); - init(); - screen_trashed = 1; - tsignals |= S_WINCH; - } + LSIGNAL(SIGTSTP, SIG_DFL); + kill(getpid(), SIGTSTP); + /* + * ... Bye bye. ... + * Hopefully we'll be back later and resume here... + * Reset the terminal and arrange to repaint the + * screen when we get back to the main command loop. + */ + LSIGNAL(SIGTSTP, stop); + raw_mode(1); + init(); + screen_trashed = 1; + tsignals |= S_WINCH; + } #endif #ifdef S_WINCH - if (tsignals & S_WINCH) - { - int old_width, old_height; - /* - * Re-execute scrsize() to read the new window size. - */ - old_width = sc_width; - old_height = sc_height; - get_term(); - if (sc_width != old_width || sc_height != old_height) - { - wscroll = (sc_height + 1) / 2; - calc_jump_sline(); - calc_shift_count(); - } - screen_trashed = 1; - } + if (tsignals & S_WINCH) + { + int old_width, old_height; + /* + * Re-execute scrsize() to read the new window size. + */ + old_width = sc_width; + old_height = sc_height; + get_term(); + if (sc_width != old_width || sc_height != old_height) + { + wscroll = (sc_height + 1) / 2; + calc_jump_sline(); + calc_shift_count(); + } + screen_trashed = 1; + } #endif - if (tsignals & S_INTERRUPT) - { - if (quit_on_intr) - quit(QUIT_INTERRUPT); - } + if (tsignals & S_INTERRUPT) + { + if (quit_on_intr) + quit(QUIT_INTERRUPT); + } } diff --git a/tags.c b/tags.c index 03e2973..0618d49 100644 --- a/tags.c +++ b/tags.c @@ -25,23 +25,23 @@ extern int sigs; extern int ctldisp; enum tag_result { - TAG_FOUND, - TAG_NOFILE, - TAG_NOTAG, - TAG_NOTYPE, - TAG_INTR + TAG_FOUND, + TAG_NOFILE, + TAG_NOTAG, + TAG_NOTYPE, + TAG_INTR }; /* * Tag type */ enum { - T_CTAGS, /* 'tags': standard and extended format (ctags) */ - T_CTAGS_X, /* stdin: cross reference format (ctags) */ - T_GTAGS, /* 'GTAGS': function definition (global) */ - T_GRTAGS, /* 'GRTAGS': function reference (global) */ - T_GSYMS, /* 'GSYMS': other symbols (global) */ - T_GPATH /* 'GPATH': path name (global) */ + T_CTAGS, /* 'tags': standard and extended format (ctags) */ + T_CTAGS_X, /* stdin: cross reference format (ctags) */ + T_GTAGS, /* 'GTAGS': function definition (global) */ + T_GRTAGS, /* 'GRTAGS': function reference (global) */ + T_GSYMS, /* 'GSYMS': other symbols (global) */ + T_GPATH /* 'GPATH': path name (global) */ }; static enum tag_result findctag LESSPARAMS((char *tag)); @@ -61,107 +61,107 @@ static int getentry LESSPARAMS((char *buf, char **tag, char **file, char **line) * or line number (in which case pattern is NULL). */ struct taglist { - struct tag *tl_first; - struct tag *tl_last; + struct tag *tl_first; + struct tag *tl_last; }; struct tag { - struct tag *next, *prev; /* List links */ - char *tag_file; /* Source file containing the tag */ - LINENUM tag_linenum; /* Appropriate line number in source file */ - char *tag_pattern; /* Pattern used to find the tag */ - char tag_endline; /* True if the pattern includes '$' */ + struct tag *next, *prev; /* List links */ + char *tag_file; /* Source file containing the tag */ + LINENUM tag_linenum; /* Appropriate line number in source file */ + char *tag_pattern; /* Pattern used to find the tag */ + char tag_endline; /* True if the pattern includes '$' */ }; #define TAG_END ((struct tag *) &taglist) static struct taglist taglist = { TAG_END, TAG_END }; static struct tag *curtag; #define TAG_INS(tp) \ - (tp)->next = TAG_END; \ - (tp)->prev = taglist.tl_last; \ - taglist.tl_last->next = (tp); \ - taglist.tl_last = (tp); + (tp)->next = TAG_END; \ + (tp)->prev = taglist.tl_last; \ + taglist.tl_last->next = (tp); \ + taglist.tl_last = (tp); #define TAG_RM(tp) \ - (tp)->next->prev = (tp)->prev; \ - (tp)->prev->next = (tp)->next; + (tp)->next->prev = (tp)->prev; \ + (tp)->prev->next = (tp)->next; /* * Delete tag structures. */ - public void + public void cleantags(VOID_PARAM) { - struct tag *tp; - - /* - * Delete any existing tag list. - * {{ Ideally, we wouldn't do this until after we know that we - * can load some other tag information. }} - */ - while ((tp = taglist.tl_first) != TAG_END) - { - TAG_RM(tp); - free(tp->tag_file); - free(tp->tag_pattern); - free(tp); - } - curtag = NULL; - total = curseq = 0; + struct tag *tp; + + /* + * Delete any existing tag list. + * {{ Ideally, we wouldn't do this until after we know that we + * can load some other tag information. }} + */ + while ((tp = taglist.tl_first) != TAG_END) + { + TAG_RM(tp); + free(tp->tag_file); + free(tp->tag_pattern); + free(tp); + } + curtag = NULL; + total = curseq = 0; } /* * Create a new tag entry. */ - static struct tag * + static struct tag * maketagent(name, file, linenum, pattern, endline) - char *name; - char *file; - LINENUM linenum; - char *pattern; - int endline; + char *name; + char *file; + LINENUM linenum; + char *pattern; + int endline; { - struct tag *tp; - - tp = (struct tag *) ecalloc(sizeof(struct tag), 1); - tp->tag_file = (char *) ecalloc(strlen(file) + 1, sizeof(char)); - strcpy(tp->tag_file, file); - tp->tag_linenum = linenum; - tp->tag_endline = endline; - if (pattern == NULL) - tp->tag_pattern = NULL; - else - { - tp->tag_pattern = (char *) ecalloc(strlen(pattern) + 1, sizeof(char)); - strcpy(tp->tag_pattern, pattern); - } - return (tp); + struct tag *tp; + + tp = (struct tag *) ecalloc(sizeof(struct tag), 1); + tp->tag_file = (char *) ecalloc(strlen(file) + 1, sizeof(char)); + strcpy(tp->tag_file, file); + tp->tag_linenum = linenum; + tp->tag_endline = endline; + if (pattern == NULL) + tp->tag_pattern = NULL; + else + { + tp->tag_pattern = (char *) ecalloc(strlen(pattern) + 1, sizeof(char)); + strcpy(tp->tag_pattern, pattern); + } + return (tp); } /* * Get tag mode. */ - public int + public int gettagtype(VOID_PARAM) { - int f; - - if (strcmp(tags, "GTAGS") == 0) - return T_GTAGS; - if (strcmp(tags, "GRTAGS") == 0) - return T_GRTAGS; - if (strcmp(tags, "GSYMS") == 0) - return T_GSYMS; - if (strcmp(tags, "GPATH") == 0) - return T_GPATH; - if (strcmp(tags, "-") == 0) - return T_CTAGS_X; - f = open(tags, OPEN_READ); - if (f >= 0) - { - close(f); - return T_CTAGS; - } - return T_GTAGS; + int f; + + if (strcmp(tags, "GTAGS") == 0) + return T_GTAGS; + if (strcmp(tags, "GRTAGS") == 0) + return T_GRTAGS; + if (strcmp(tags, "GSYMS") == 0) + return T_GSYMS; + if (strcmp(tags, "GPATH") == 0) + return T_GPATH; + if (strcmp(tags, "-") == 0) + return T_CTAGS_X; + f = open(tags, OPEN_READ); + if (f >= 0) + { + close(f); + return T_CTAGS; + } + return T_GTAGS; } /* @@ -171,92 +171,92 @@ gettagtype(VOID_PARAM) * and "tagpattern" to the search pattern which should be used * to find the tag. */ - public void + public void findtag(tag) - char *tag; + char *tag; { - int type = gettagtype(); - enum tag_result result; - - if (type == T_CTAGS) - result = findctag(tag); - else - result = findgtag(tag, type); - switch (result) - { - case TAG_FOUND: - case TAG_INTR: - break; - case TAG_NOFILE: - error("No tags file", NULL_PARG); - break; - case TAG_NOTAG: - error("No such tag in tags file", NULL_PARG); - break; - case TAG_NOTYPE: - error("unknown tag type", NULL_PARG); - break; - } + int type = gettagtype(); + enum tag_result result; + + if (type == T_CTAGS) + result = findctag(tag); + else + result = findgtag(tag, type); + switch (result) + { + case TAG_FOUND: + case TAG_INTR: + break; + case TAG_NOFILE: + error("No tags file", NULL_PARG); + break; + case TAG_NOTAG: + error("No such tag in tags file", NULL_PARG); + break; + case TAG_NOTYPE: + error("unknown tag type", NULL_PARG); + break; + } } /* * Search for a tag. */ - public POSITION + public POSITION tagsearch(VOID_PARAM) { - if (curtag == NULL) - return (NULL_POSITION); /* No gtags loaded! */ - if (curtag->tag_linenum != 0) - return gtagsearch(); - else - return ctagsearch(); + if (curtag == NULL) + return (NULL_POSITION); /* No gtags loaded! */ + if (curtag->tag_linenum != 0) + return gtagsearch(); + else + return ctagsearch(); } /* * Go to the next tag. */ - public char * + public char * nexttag(n) - int n; + int n; { - char *tagfile = (char *) NULL; + char *tagfile = (char *) NULL; - while (n-- > 0) - tagfile = nextgtag(); - return tagfile; + while (n-- > 0) + tagfile = nextgtag(); + return tagfile; } /* * Go to the previous tag. */ - public char * + public char * prevtag(n) - int n; + int n; { - char *tagfile = (char *) NULL; + char *tagfile = (char *) NULL; - while (n-- > 0) - tagfile = prevgtag(); - return tagfile; + while (n-- > 0) + tagfile = prevgtag(); + return tagfile; } /* * Return the total number of tags. */ - public int + public int ntags(VOID_PARAM) { - return total; + return total; } /* * Return the sequence number of current tag. */ - public int + public int curr_tag(VOID_PARAM) { - return curseq; + return curseq; } /***************************************************************************** @@ -267,154 +267,154 @@ curr_tag(VOID_PARAM) * Find tags in the "tags" file. * Sets curtag to the first tag entry. */ - static enum tag_result + static enum tag_result findctag(tag) - char *tag; + char *tag; { - char *p; - char *q; - FILE *f; - int taglen; - LINENUM taglinenum; - char *tagfile; - char *tagpattern; - int tagendline; - int search_char; - int err; - char tline[TAGLINE_SIZE]; - struct tag *tp; - - p = shell_unquote(tags); - f = fopen(p, "r"); - free(p); - if (f == NULL) - return TAG_NOFILE; - - cleantags(); - total = 0; - taglen = (int) strlen(tag); - - /* - * Search the tags file for the desired tag. - */ - while (fgets(tline, sizeof(tline), f) != NULL) - { - if (tline[0] == '!') - /* Skip header of extended format. */ - continue; - if (strncmp(tag, tline, taglen) != 0 || !WHITESP(tline[taglen])) - continue; - - /* - * Found it. - * The line contains the tag, the filename and the - * location in the file, separated by white space. - * The location is either a decimal line number, - * or a search pattern surrounded by a pair of delimiters. - * Parse the line and extract these parts. - */ - tagpattern = NULL; - - /* - * Skip over the whitespace after the tag name. - */ - p = skipsp(tline+taglen); - if (*p == '\0') - /* File name is missing! */ - continue; - - /* - * Save the file name. - * Skip over the whitespace after the file name. - */ - tagfile = p; - while (!WHITESP(*p) && *p != '\0') - p++; - *p++ = '\0'; - p = skipsp(p); - if (*p == '\0') - /* Pattern is missing! */ - continue; - - /* - * First see if it is a line number. - */ - tagendline = 0; - taglinenum = getnum(&p, 0, &err); - if (err) - { - /* - * No, it must be a pattern. - * Delete the initial "^" (if present) and - * the final "$" from the pattern. - * Delete any backslash in the pattern. - */ - taglinenum = 0; - search_char = *p++; - if (*p == '^') - p++; - tagpattern = q = p; - while (*p != search_char && *p != '\0') - { - if (*p == '\\') - p++; - if (q != p) - { - *q++ = *p++; - } else - { - q++; - p++; - } - } - tagendline = (q[-1] == '$'); - if (tagendline) - q--; - *q = '\0'; - } - tp = maketagent(tag, tagfile, taglinenum, tagpattern, tagendline); - TAG_INS(tp); - total++; - } - fclose(f); - if (total == 0) - return TAG_NOTAG; - curtag = taglist.tl_first; - curseq = 1; - return TAG_FOUND; + char *p; + char *q; + FILE *f; + int taglen; + LINENUM taglinenum; + char *tagfile; + char *tagpattern; + int tagendline; + int search_char; + int err; + char tline[TAGLINE_SIZE]; + struct tag *tp; + + p = shell_unquote(tags); + f = fopen(p, "r"); + free(p); + if (f == NULL) + return TAG_NOFILE; + + cleantags(); + total = 0; + taglen = (int) strlen(tag); + + /* + * Search the tags file for the desired tag. + */ + while (fgets(tline, sizeof(tline), f) != NULL) + { + if (tline[0] == '!') + /* Skip header of extended format. */ + continue; + if (strncmp(tag, tline, taglen) != 0 || !WHITESP(tline[taglen])) + continue; + + /* + * Found it. + * The line contains the tag, the filename and the + * location in the file, separated by white space. + * The location is either a decimal line number, + * or a search pattern surrounded by a pair of delimiters. + * Parse the line and extract these parts. + */ + tagpattern = NULL; + + /* + * Skip over the whitespace after the tag name. + */ + p = skipsp(tline+taglen); + if (*p == '\0') + /* File name is missing! */ + continue; + + /* + * Save the file name. + * Skip over the whitespace after the file name. + */ + tagfile = p; + while (!WHITESP(*p) && *p != '\0') + p++; + *p++ = '\0'; + p = skipsp(p); + if (*p == '\0') + /* Pattern is missing! */ + continue; + + /* + * First see if it is a line number. + */ + tagendline = 0; + taglinenum = getnum(&p, 0, &err); + if (err) + { + /* + * No, it must be a pattern. + * Delete the initial "^" (if present) and + * the final "$" from the pattern. + * Delete any backslash in the pattern. + */ + taglinenum = 0; + search_char = *p++; + if (*p == '^') + p++; + tagpattern = q = p; + while (*p != search_char && *p != '\0') + { + if (*p == '\\') + p++; + if (q != p) + { + *q++ = *p++; + } else + { + q++; + p++; + } + } + tagendline = (q[-1] == '$'); + if (tagendline) + q--; + *q = '\0'; + } + tp = maketagent(tag, tagfile, taglinenum, tagpattern, tagendline); + TAG_INS(tp); + total++; + } + fclose(f); + if (total == 0) + return TAG_NOTAG; + curtag = taglist.tl_first; + curseq = 1; + return TAG_FOUND; } /* * Edit current tagged file. */ - public int + public int edit_tagfile(VOID_PARAM) { - if (curtag == NULL) - return (1); - return (edit(curtag->tag_file)); + if (curtag == NULL) + return (1); + return (edit(curtag->tag_file)); } - static int + static int curtag_match(line, linepos) - char constant *line; - POSITION linepos; + char constant *line; + POSITION linepos; { - /* - * Test the line to see if we have a match. - * Use strncmp because the pattern may be - * truncated (in the tags file) if it is too long. - * If tagendline is set, make sure we match all - * the way to end of line (no extra chars after the match). - */ - int len = (int) strlen(curtag->tag_pattern); - if (strncmp(curtag->tag_pattern, line, len) == 0 && - (!curtag->tag_endline || line[len] == '\0' || line[len] == '\r')) - { - curtag->tag_linenum = find_linenum(linepos); - return 1; - } - return 0; + /* + * Test the line to see if we have a match. + * Use strncmp because the pattern may be + * truncated (in the tags file) if it is too long. + * If tagendline is set, make sure we match all + * the way to end of line (no extra chars after the match). + */ + int len = (int) strlen(curtag->tag_pattern); + if (strncmp(curtag->tag_pattern, line, len) == 0 && + (!curtag->tag_endline || line[len] == '\0' || line[len] == '\r')) + { + curtag->tag_linenum = find_linenum(linepos); + return 1; + } + return 0; } /* @@ -423,75 +423,75 @@ curtag_match(line, linepos) * We don't use search() for several reasons: * - We don't want to blow away any search string we may have saved. * - The various regular-expression functions (from different systems: - * regcmp vs. re_comp) behave differently in the presence of + * regcmp vs. re_comp) behave differently in the presence of * parentheses (which are almost always found in a tag). */ - static POSITION + static POSITION ctagsearch(VOID_PARAM) { - POSITION pos, linepos; - LINENUM linenum; - int line_len; - char *line; - int found; - - pos = ch_zero(); - linenum = find_linenum(pos); - - for (found = 0; !found;) - { - /* - * Get lines until we find a matching one or - * until we hit end-of-file. - */ - if (ABORT_SIGS()) - return (NULL_POSITION); - - /* - * Read the next line, and save the - * starting position of that line in linepos. - */ - linepos = pos; - pos = forw_raw_line(pos, &line, &line_len); - if (linenum != 0) - linenum++; - - if (pos == NULL_POSITION) - { - /* - * We hit EOF without a match. - */ - error("Tag not found", NULL_PARG); - return (NULL_POSITION); - } - - /* - * If we're using line numbers, we might as well - * remember the information we have now (the position - * and line number of the current line). - */ - if (linenums) - add_lnum(linenum, pos); - - if (ctldisp != OPT_ONPLUS) - { - if (curtag_match(line, linepos)) - found = 1; - } else - { - int cvt_ops = CVT_ANSI; - int cvt_len = cvt_length(line_len, cvt_ops); - int *chpos = cvt_alloc_chpos(cvt_len); - char *cline = (char *) ecalloc(1, cvt_len); - cvt_text(cline, line, chpos, &line_len, cvt_ops); - if (curtag_match(cline, linepos)) - found = 1; - free(chpos); - free(cline); - } - } - - return (linepos); + POSITION pos, linepos; + LINENUM linenum; + int line_len; + char *line; + int found; + + pos = ch_zero(); + linenum = find_linenum(pos); + + for (found = 0; !found;) + { + /* + * Get lines until we find a matching one or + * until we hit end-of-file. + */ + if (ABORT_SIGS()) + return (NULL_POSITION); + + /* + * Read the next line, and save the + * starting position of that line in linepos. + */ + linepos = pos; + pos = forw_raw_line(pos, &line, &line_len); + if (linenum != 0) + linenum++; + + if (pos == NULL_POSITION) + { + /* + * We hit EOF without a match. + */ + error("Tag not found", NULL_PARG); + return (NULL_POSITION); + } + + /* + * If we're using line numbers, we might as well + * remember the information we have now (the position + * and line number of the current line). + */ + if (linenums) + add_lnum(linenum, pos); + + if (ctldisp != OPT_ONPLUS) + { + if (curtag_match(line, linepos)) + found = 1; + } else + { + int cvt_ops = CVT_ANSI; + int cvt_len = cvt_length(line_len, cvt_ops); + int *chpos = cvt_alloc_chpos(cvt_len); + char *cline = (char *) ecalloc(1, cvt_len); + cvt_text(cline, line, chpos, &line_len, cvt_ops); + if (curtag_match(cline, linepos)) + found = 1; + free(chpos); + free(cline); + } + } + + return (linepos); } /******************************************************************************* @@ -505,132 +505,132 @@ ctagsearch(VOID_PARAM) * for future use by gtagsearch(). * Sets curtag to the first tag entry. */ - static enum tag_result + static enum tag_result findgtag(tag, type) - char *tag; /* tag to load */ - int type; /* tags type */ + char *tag; /* tag to load */ + int type; /* tags type */ { - char buf[1024]; - FILE *fp; - struct tag *tp; - - if (type != T_CTAGS_X && tag == NULL) - return TAG_NOFILE; - - cleantags(); - total = 0; - - /* - * If type == T_CTAGS_X then read ctags's -x format from stdin - * else execute global(1) and read from it. - */ - if (type == T_CTAGS_X) - { - fp = stdin; - /* Set tag default because we cannot read stdin again. */ - tags = ztags; - } else - { + char buf[1024]; + FILE *fp; + struct tag *tp; + + if (type != T_CTAGS_X && tag == NULL) + return TAG_NOFILE; + + cleantags(); + total = 0; + + /* + * If type == T_CTAGS_X then read ctags's -x format from stdin + * else execute global(1) and read from it. + */ + if (type == T_CTAGS_X) + { + fp = stdin; + /* Set tag default because we cannot read stdin again. */ + tags = ztags; + } else + { #if !HAVE_POPEN - return TAG_NOFILE; + return TAG_NOFILE; #else - char *command; - char *flag; - char *qtag; - char *cmd = lgetenv("LESSGLOBALTAGS"); - - if (isnullenv(cmd)) - return TAG_NOFILE; - /* Get suitable flag value for global(1). */ - switch (type) - { - case T_GTAGS: - flag = "" ; - break; - case T_GRTAGS: - flag = "r"; - break; - case T_GSYMS: - flag = "s"; - break; - case T_GPATH: - flag = "P"; - break; - default: - return TAG_NOTYPE; - } - - /* Get our data from global(1). */ - qtag = shell_quote(tag); - if (qtag == NULL) - qtag = tag; - command = (char *) ecalloc(strlen(cmd) + strlen(flag) + - strlen(qtag) + 5, sizeof(char)); - sprintf(command, "%s -x%s %s", cmd, flag, qtag); - if (qtag != tag) - free(qtag); - fp = popen(command, "r"); - free(command); + char *command; + char *flag; + char *qtag; + char *cmd = lgetenv("LESSGLOBALTAGS"); + + if (isnullenv(cmd)) + return TAG_NOFILE; + /* Get suitable flag value for global(1). */ + switch (type) + { + case T_GTAGS: + flag = "" ; + break; + case T_GRTAGS: + flag = "r"; + break; + case T_GSYMS: + flag = "s"; + break; + case T_GPATH: + flag = "P"; + break; + default: + return TAG_NOTYPE; + } + + /* Get our data from global(1). */ + qtag = shell_quote(tag); + if (qtag == NULL) + qtag = tag; + command = (char *) ecalloc(strlen(cmd) + strlen(flag) + + strlen(qtag) + 5, sizeof(char)); + sprintf(command, "%s -x%s %s", cmd, flag, qtag); + if (qtag != tag) + free(qtag); + fp = popen(command, "r"); + free(command); #endif - } - if (fp != NULL) - { - while (fgets(buf, sizeof(buf), fp)) - { - char *name, *file, *line; - int len; - - if (sigs) - { + } + if (fp != NULL) + { + while (fgets(buf, sizeof(buf), fp)) + { + char *name, *file, *line; + int len; + + if (sigs) + { #if HAVE_POPEN - if (fp != stdin) - pclose(fp); + if (fp != stdin) + pclose(fp); #endif - return TAG_INTR; - } - len = (int) strlen(buf); - if (len > 0 && buf[len-1] == '\n') - buf[len-1] = '\0'; - else - { - int c; - do { - c = fgetc(fp); - } while (c != '\n' && c != EOF); - } - - if (getentry(buf, &name, &file, &line)) - { - /* - * Couldn't parse this line for some reason. - * We'll just pretend it never happened. - */ - break; - } - - /* Make new entry and add to list. */ - tp = maketagent(name, file, (LINENUM) atoi(line), NULL, 0); - TAG_INS(tp); - total++; - } - if (fp != stdin) - { - if (pclose(fp)) - { - curtag = NULL; - total = curseq = 0; - return TAG_NOFILE; - } - } - } - - /* Check to see if we found anything. */ - tp = taglist.tl_first; - if (tp == TAG_END) - return TAG_NOTAG; - curtag = tp; - curseq = 1; - return TAG_FOUND; + return TAG_INTR; + } + len = (int) strlen(buf); + if (len > 0 && buf[len-1] == '\n') + buf[len-1] = '\0'; + else + { + int c; + do { + c = fgetc(fp); + } while (c != '\n' && c != EOF); + } + + if (getentry(buf, &name, &file, &line)) + { + /* + * Couldn't parse this line for some reason. + * We'll just pretend it never happened. + */ + break; + } + + /* Make new entry and add to list. */ + tp = maketagent(name, file, (LINENUM) atoi(line), NULL, 0); + TAG_INS(tp); + total++; + } + if (fp != stdin) + { + if (pclose(fp)) + { + curtag = NULL; + total = curseq = 0; + return TAG_NOFILE; + } + } + } + + /* Check to see if we found anything. */ + tp = taglist.tl_first; + if (tp == TAG_END) + return TAG_NOTAG; + curtag = tp; + curseq = 1; + return TAG_FOUND; } static int circular = 0; /* 1: circular tag structure */ @@ -640,29 +640,29 @@ static int circular = 0; /* 1: circular tag structure */ * by findgtag(). The next call to gtagsearch() will try to position at the * appropriate tag. */ - static char * + static char * nextgtag(VOID_PARAM) { - struct tag *tp; - - if (curtag == NULL) - /* No tag loaded */ - return NULL; - - tp = curtag->next; - if (tp == TAG_END) - { - if (!circular) - return NULL; - /* Wrapped around to the head of the queue */ - curtag = taglist.tl_first; - curseq = 1; - } else - { - curtag = tp; - curseq++; - } - return (curtag->tag_file); + struct tag *tp; + + if (curtag == NULL) + /* No tag loaded */ + return NULL; + + tp = curtag->next; + if (tp == TAG_END) + { + if (!circular) + return NULL; + /* Wrapped around to the head of the queue */ + curtag = taglist.tl_first; + curseq = 1; + } else + { + curtag = tp; + curseq++; + } + return (curtag->tag_file); } /* @@ -670,29 +670,29 @@ nextgtag(VOID_PARAM) * setup by findgtat(). The next call to gtagsearch() will try to position * at the appropriate tag. */ - static char * + static char * prevgtag(VOID_PARAM) { - struct tag *tp; - - if (curtag == NULL) - /* No tag loaded */ - return NULL; - - tp = curtag->prev; - if (tp == TAG_END) - { - if (!circular) - return NULL; - /* Wrapped around to the tail of the queue */ - curtag = taglist.tl_last; - curseq = total; - } else - { - curtag = tp; - curseq--; - } - return (curtag->tag_file); + struct tag *tp; + + if (curtag == NULL) + /* No tag loaded */ + return NULL; + + tp = curtag->prev; + if (tp == TAG_END) + { + if (!circular) + return NULL; + /* Wrapped around to the tail of the queue */ + curtag = taglist.tl_last; + curseq = total; + } else + { + curtag = tp; + curseq--; + } + return (curtag->tag_file); } /* @@ -700,12 +700,12 @@ prevgtag(VOID_PARAM) * using either findtag() or one of nextgtag() and prevgtag(). Returns -1 * if it was unable to position at the tag, 0 if successful. */ - static POSITION + static POSITION gtagsearch(VOID_PARAM) { - if (curtag == NULL) - return (NULL_POSITION); /* No gtags loaded! */ - return (find_pos(curtag->tag_linenum)); + if (curtag == NULL) + return (NULL_POSITION); /* No gtags loaded! */ + return (find_pos(curtag->tag_linenum)); } /* @@ -736,58 +736,58 @@ gtagsearch(VOID_PARAM) * The tag, file, and line will each be NUL-terminated pointers * into buf. */ - static int + static int getentry(buf, tag, file, line) - char *buf; /* standard or extended ctags -x format data */ - char **tag; /* name of the tag we actually found */ - char **file; /* file in which to find this tag */ - char **line; /* line number of file where this tag is found */ + char *buf; /* standard or extended ctags -x format data */ + char **tag; /* name of the tag we actually found */ + char **file; /* file in which to find this tag */ + char **line; /* line number of file where this tag is found */ { - char *p = buf; - - for (*tag = p; *p && !IS_SPACE(*p); p++) /* tag name */ - ; - if (*p == 0) - return (-1); - *p++ = 0; - for ( ; *p && IS_SPACE(*p); p++) /* (skip blanks) */ - ; - if (*p == 0) - return (-1); - /* - * If the second part begin with other than digit, - * it is assumed tag type. Skip it. - */ - if (!IS_DIGIT(*p)) - { - for ( ; *p && !IS_SPACE(*p); p++) /* (skip tag type) */ - ; - for (; *p && IS_SPACE(*p); p++) /* (skip blanks) */ - ; - } - if (!IS_DIGIT(*p)) - return (-1); - *line = p; /* line number */ - for (*line = p; *p && !IS_SPACE(*p); p++) - ; - if (*p == 0) - return (-1); - *p++ = 0; - for ( ; *p && IS_SPACE(*p); p++) /* (skip blanks) */ - ; - if (*p == 0) - return (-1); - *file = p; /* file name */ - for (*file = p; *p && !IS_SPACE(*p); p++) - ; - if (*p == 0) - return (-1); - *p = 0; - - /* value check */ - if (strlen(*tag) && strlen(*line) && strlen(*file) && atoi(*line) > 0) - return (0); - return (-1); + char *p = buf; + + for (*tag = p; *p && !IS_SPACE(*p); p++) /* tag name */ + ; + if (*p == 0) + return (-1); + *p++ = 0; + for ( ; *p && IS_SPACE(*p); p++) /* (skip blanks) */ + ; + if (*p == 0) + return (-1); + /* + * If the second part begin with other than digit, + * it is assumed tag type. Skip it. + */ + if (!IS_DIGIT(*p)) + { + for ( ; *p && !IS_SPACE(*p); p++) /* (skip tag type) */ + ; + for (; *p && IS_SPACE(*p); p++) /* (skip blanks) */ + ; + } + if (!IS_DIGIT(*p)) + return (-1); + *line = p; /* line number */ + for (*line = p; *p && !IS_SPACE(*p); p++) + ; + if (*p == 0) + return (-1); + *p++ = 0; + for ( ; *p && IS_SPACE(*p); p++) /* (skip blanks) */ + ; + if (*p == 0) + return (-1); + *file = p; /* file name */ + for (*file = p; *p && !IS_SPACE(*p); p++) + ; + if (*p == 0) + return (-1); + *p = 0; + + /* value check */ + if (strlen(*tag) && strlen(*line) && strlen(*file) && atoi(*line) > 0) + return (0); + return (-1); } #endif diff --git a/ttyin.c b/ttyin.c index 4be4527..72425e7 100644 --- a/ttyin.c +++ b/ttyin.c @@ -37,15 +37,15 @@ extern int utf_mode; extern int wheel_lines; #if !MSDOS_COMPILER - static int + static int open_tty_device(dev) - constant char* dev; + constant char* dev; { #if OS2 - /* The __open() system call translates "/dev/tty" to "con". */ - return __open(dev, OPEN_READ); + /* The __open() system call translates "/dev/tty" to "con". */ + return __open(dev, OPEN_READ); #else - return open(dev, OPEN_READ); + return open(dev, OPEN_READ); #endif } @@ -55,67 +55,67 @@ open_tty_device(dev) * In Unix, file descriptor 2 is usually attached to the screen, * but also usually lets you read from the keyboard. */ - public int + public int open_tty(VOID_PARAM) { - int fd = -1; + int fd = -1; #if LESSTEST - if (ttyin_name != NULL) - fd = open_tty_device(ttyin_name); + if (ttyin_name != NULL) + fd = open_tty_device(ttyin_name); #endif /*LESSTEST*/ #if HAVE_TTYNAME - if (fd < 0) - { - constant char *dev = ttyname(2); - if (dev != NULL) - fd = open_tty_device(dev); - } + if (fd < 0) + { + constant char *dev = ttyname(2); + if (dev != NULL) + fd = open_tty_device(dev); + } #endif - if (fd < 0) - fd = open_tty_device("/dev/tty"); - if (fd < 0) - fd = 2; - return fd; + if (fd < 0) + fd = open_tty_device("/dev/tty"); + if (fd < 0) + fd = 2; + return fd; } #endif /* MSDOS_COMPILER */ /* * Open keyboard for input. */ - public void + public void open_getchr(VOID_PARAM) { #if MSDOS_COMPILER==WIN32C - /* Need this to let child processes inherit our console handle */ - SECURITY_ATTRIBUTES sa; - memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES)); - sa.nLength = sizeof(SECURITY_ATTRIBUTES); - sa.bInheritHandle = TRUE; - tty = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ, &sa, - OPEN_EXISTING, 0L, NULL); - GetConsoleMode(tty, &console_mode); - /* Make sure we get Ctrl+C events. */ - SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT); + /* Need this to let child processes inherit our console handle */ + SECURITY_ATTRIBUTES sa; + memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES)); + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.bInheritHandle = TRUE; + tty = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ, &sa, + OPEN_EXISTING, 0L, NULL); + GetConsoleMode(tty, &console_mode); + /* Make sure we get Ctrl+C events. */ + SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT); #else #if MSDOS_COMPILER - extern int fd0; - /* - * Open a new handle to CON: in binary mode - * for unbuffered keyboard read. - */ - fd0 = dup(0); - close(0); - tty = open("CON", OPEN_READ); + extern int fd0; + /* + * Open a new handle to CON: in binary mode + * for unbuffered keyboard read. + */ + fd0 = dup(0); + close(0); + tty = open("CON", OPEN_READ); #if MSDOS_COMPILER==DJGPPC - /* - * Setting stdin to binary causes Ctrl-C to not - * raise SIGINT. We must undo that side-effect. - */ - (void) __djgpp_set_ctrl_c(1); + /* + * Setting stdin to binary causes Ctrl-C to not + * raise SIGINT. We must undo that side-effect. + */ + (void) __djgpp_set_ctrl_c(1); #endif #else - tty = open_tty(); + tty = open_tty(); #endif #endif } @@ -123,12 +123,12 @@ open_getchr(VOID_PARAM) /* * Close the keyboard. */ - public void + public void close_getchr(VOID_PARAM) { #if MSDOS_COMPILER==WIN32C - SetConsoleMode(tty, console_mode); - CloseHandle(tty); + SetConsoleMode(tty, console_mode); + CloseHandle(tty); #endif } @@ -136,136 +136,136 @@ close_getchr(VOID_PARAM) /* * Close the pipe, restoring the keyboard (CMD resets it, losing the mouse). */ - int + int pclose(f) - FILE *f; + FILE *f; { - int result; + int result; - result = _pclose(f); - SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT); - return result; + result = _pclose(f); + SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT); + return result; } #endif /* * Get the number of lines to scroll when mouse wheel is moved. */ - public int + public int default_wheel_lines(VOID_PARAM) { - int lines = 1; + int lines = 1; #if MSDOS_COMPILER==WIN32C - if (SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &lines, 0)) - { - if (lines == WHEEL_PAGESCROLL) - lines = 3; - } + if (SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &lines, 0)) + { + if (lines == WHEEL_PAGESCROLL) + lines = 3; + } #endif - return lines; + return lines; } #if LESSTEST - public void + public void rstat(st) - char st; + char st; { - if (rstat_file < 0) - return; - lseek(rstat_file, SEEK_SET, 0); - write(rstat_file, &st, 1); + if (rstat_file < 0) + return; + lseek(rstat_file, SEEK_SET, 0); + write(rstat_file, &st, 1); } #endif /*LESSTEST*/ /* * Get a character from the keyboard. */ - public int + public int getchr(VOID_PARAM) { - char c; - int result; + char c; + int result; - do - { - flush(); + do + { + flush(); #if MSDOS_COMPILER && MSDOS_COMPILER != DJGPPC - /* - * In raw read, we don't see ^C so look here for it. - */ + /* + * In raw read, we don't see ^C so look here for it. + */ #if MSDOS_COMPILER==WIN32C - if (ABORT_SIGS()) - return (READ_INTR); - c = WIN32getch(); + if (ABORT_SIGS()) + return (READ_INTR); + c = WIN32getch(); #else - c = getch(); + c = getch(); #endif - result = 1; - if (c == '\003') - return (READ_INTR); + result = 1; + if (c == '\003') + return (READ_INTR); #else #if LESSTEST - rstat('R'); + rstat('R'); #endif /*LESSTEST*/ - { - unsigned char uc; - result = iread(tty, &uc, sizeof(char)); - c = (char) uc; - } + { + unsigned char uc; + result = iread(tty, &uc, sizeof(char)); + c = (char) uc; + } #if LESSTEST - rstat('B'); + rstat('B'); #endif /*LESSTEST*/ - if (result == READ_INTR) - return (READ_INTR); - if (result < 0) - { - /* - * Don't call error() here, - * because error calls getchr! - */ - quit(QUIT_ERROR); - } + if (result == READ_INTR) + return (READ_INTR); + if (result < 0) + { + /* + * Don't call error() here, + * because error calls getchr! + */ + quit(QUIT_ERROR); + } #endif #if 0 /* allow entering arbitrary hex chars for testing */ - /* ctrl-A followed by two hex chars makes a byte */ - { - static int hex_in = 0; - static int hex_value = 0; - if (c == CONTROL('A')) - { - hex_in = 2; - result = 0; - continue; - } - if (hex_in > 0) - { - int v; - if (c >= '0' && c <= '9') - v = c - '0'; - else if (c >= 'a' && c <= 'f') - v = c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - v = c - 'A' + 10; - else - v = 0; - hex_value = (hex_value << 4) | v; - if (--hex_in > 0) - { - result = 0; - continue; - } - c = hex_value; - } - } + /* ctrl-A followed by two hex chars makes a byte */ + { + static int hex_in = 0; + static int hex_value = 0; + if (c == CONTROL('A')) + { + hex_in = 2; + result = 0; + continue; + } + if (hex_in > 0) + { + int v; + if (c >= '0' && c <= '9') + v = c - '0'; + else if (c >= 'a' && c <= 'f') + v = c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + v = c - 'A' + 10; + else + v = 0; + hex_value = (hex_value << 4) | v; + if (--hex_in > 0) + { + result = 0; + continue; + } + c = hex_value; + } + } #endif - /* - * Various parts of the program cannot handle - * an input character of '\0'. - * If a '\0' was actually typed, convert it to '\340' here. - */ - if (c == '\0') - c = '\340'; - } while (result != 1); + /* + * Various parts of the program cannot handle + * an input character of '\0'. + * If a '\0' was actually typed, convert it to '\340' here. + */ + if (c == '\0') + c = '\340'; + } while (result != 1); - return (c & 0xFF); + return (c & 0xFF); } diff --git a/ubin.uni b/ubin.uni index 661cccb..dc00187 100644 --- a/ubin.uni +++ b/ubin.uni @@ -1,17 +1,17 @@ /* Generated by "./mkutable -f2 Cc Cs Co Zl Zp -- unicode/UnicodeData.txt" on Tue Jul 19 12:45:17 PDT 2022 */ - { 0x0000, 0x0007 }, /* Cc */ - { 0x000b, 0x000b }, /* Cc */ - { 0x000e, 0x001f }, /* Cc */ - { 0x007f, 0x009f }, /* Cc */ - { 0x2028, 0x2028 }, /* Zl */ - { 0x2029, 0x2029 }, /* Zp */ - { 0xd800, 0xd800 }, /* Cs */ - { 0xdb7f, 0xdb80 }, /* Cs */ - { 0xdbff, 0xdc00 }, /* Cs */ - { 0xdfff, 0xdfff }, /* Cs */ - { 0xe000, 0xe000 }, /* Co */ - { 0xf8ff, 0xf8ff }, /* Co */ - { 0xf0000, 0xf0000 }, /* Co */ - { 0xffffd, 0xffffd }, /* Co */ - { 0x100000, 0x100000 }, /* Co */ - { 0x10fffd, 0x10fffd }, /* Co */ + { 0x0000, 0x0007 }, /* Cc */ + { 0x000b, 0x000b }, /* Cc */ + { 0x000e, 0x001f }, /* Cc */ + { 0x007f, 0x009f }, /* Cc */ + { 0x2028, 0x2028 }, /* Zl */ + { 0x2029, 0x2029 }, /* Zp */ + { 0xd800, 0xd800 }, /* Cs */ + { 0xdb7f, 0xdb80 }, /* Cs */ + { 0xdbff, 0xdc00 }, /* Cs */ + { 0xdfff, 0xdfff }, /* Cs */ + { 0xe000, 0xe000 }, /* Co */ + { 0xf8ff, 0xf8ff }, /* Co */ + { 0xf0000, 0xf0000 }, /* Co */ + { 0xffffd, 0xffffd }, /* Co */ + { 0x100000, 0x100000 }, /* Co */ + { 0x10fffd, 0x10fffd }, /* Co */ diff --git a/version.c b/version.c index 44e8116..8f48efc 100644 --- a/version.c +++ b/version.c @@ -43,7 +43,7 @@ v22 5/24/85 Added support for no RECOMP nor REGCMP. v23 5/25/85 Miscellanous changes and prettying up. Posted to USENET. ----------------------------------------------------------------- -v24 6/3/85 Added ti,te terminal init & de-init. +v24 6/3/85 Added ti,te terminal init & de-init. (Thanks to Mike Kersenbrock) v25 6/8/85 Added -U flag, standout mode underlining. v26 6/9/85 Added -M flag. @@ -53,7 +53,7 @@ v27 6/15/85 Renamed some variables to make unique in v28 6/28/85 Fixed right margin bug. v29 6/28/85 Incorporated M.Rose's changes to signal.c v30 6/29/85 Fixed stupid bug in argument processing. -v31 7/15/85 Added -p flag, changed repaint algorithm. +v31 7/15/85 Added -p flag, changed repaint algorithm. Added kludge for magic cookie terminals. v32 7/16/85 Added cat_file if output not a tty. v33 7/23/85 Added -e flag and EDITOR. @@ -125,7 +125,7 @@ v73 6/26/87 Allow Examine "#" for previous file. ----------------------------------------------------------------- v74 9/18/87 Fix conflict in EOF symbol with stdio.h, Make os.c more portable to BSD. -v75 9/23/87 Fix problems in get_term (thanks to +v75 9/23/87 Fix problems in get_term (thanks to Paul Eggert); new backwards scrolling in jump_loc (thanks to Marion Hakanson). v76 9/23/87 Added -i flag; allow single "!" to @@ -180,17 +180,17 @@ v103 3/14/89 Add -N, -f and -? options. Add z and w v104 3/16/89 Added EDITPROTO. v105 3/20/89 Fix bug in find_linenum which cached incorrectly on long lines. -v106 3/31/89 Added -k option and multiple lesskey +v106 3/31/89 Added -k option and multiple lesskey files. v107 4/27/89 Add 8-bit char support and -g option. Split option code into 3 files. -v108 5/5/89 Allocate position table dynamically +v108 5/5/89 Allocate position table dynamically (thanks to Paul Eggert); change % command from "percent" to vi-style brace finder. v109 5/10/89 Added ESC-% command, split prim.c. v110 5/24/89 Fixed bug in + option; fixed repaint bug under Sun windows (thanks to Paul Eggert). -v111 5/25/89 Generalized # and % expansion; use +v111 5/25/89 Generalized # and % expansion; use calloc for some error messages. v112 5/30/89 Get rid of ESC-%, add {}()[] commands. v113 5/31/89 Optimize lseeks (thanks to Paul Eggert). @@ -240,7 +240,7 @@ v141 2/8/90 Add edit_list for editing >1 file. v142 2/10/90 Add :x command. v143 2/11/90 Add * and @ modifies to search cmds. Change ESC-/ cmd from /@* to / *. -v144 3/1/90 Messed around with ch_zero; +v144 3/1/90 Messed around with ch_zero; no real change. v145 3/2/90 Added -R and -v/-V for MSDOS; renamed FILENAME to avoid conflict. @@ -252,7 +252,7 @@ v150 4/6/90 Add LESS_CHARSET, LESS_CHARDEF. v151 4/13/90 Remove -g option; clean up ispipe. v152 4/14/90 lsystem() closes input file, for editors which require exclusive open. -v153 4/18/90 Fix bug if SHELL unset; +v153 4/18/90 Fix bug if SHELL unset; fix bug in overstrike control char. v154 4/25/90 Output to fd 2 via buffer. v155 4/30/90 Ignore -i if uppercase in pattern @@ -319,7 +319,7 @@ v185 7/11/91 -Pxxx sets short prompt; assume SIGWINCH v186 4/20/92 Port to MS-DOS (Microsoft C). v187 4/23/92 Added -D option & TAB_COMPLETE_FILENAME. v188 4/28/92 Added command line editing features. -v189 12/8/92 Fix mem overrun in anscreen.c:init; +v189 12/8/92 Fix mem overrun in anscreen.c:init; fix edit_list to recover from bin file. v190 2/13/93 Make TAB enter one filename at a time; create ^L with old TAB functionality. @@ -341,7 +341,7 @@ v200 7/25/94 Clean up copyright, minor fixes. v201 7/27/94 Check for no memcpy; add casts to calloc; look for regcmp in libgen.a. (thanks to Kaveh Ghazi). -v202 7/28/94 Fix bug in edit_next/edit_prev with +v202 7/28/94 Fix bug in edit_next/edit_prev with non-existent files. v203 8/2/94 Fix a variety of configuration bugs on various systems. (thanks to Sakai @@ -361,7 +361,7 @@ v206 8/10/94 Use initial_scrpos for -t to avoid v207 8/12/94 Fix bug if stdout is not tty. v208 8/16/94 Fix bug in close_altfile if goto err1 in edit_ifile. (Thanks to M.J. Hewitt) -v209 8/16/94 Change scroll to wscroll to avoid +v209 8/16/94 Change scroll to wscroll to avoid conflict with library function. v210 8/16/94 Fix bug with bold on 8 bit chars. (thanks to Vitor Duarte) @@ -384,7 +384,7 @@ v223 8/27/94 Support setlocale. v224 8/29/94 Revert v216: process BS in search only if -u. v225 9/6/94 Rewrite undo_search again: toggle. -v226 9/15/94 Configuration fixes. +v226 9/15/94 Configuration fixes. (thanks to David MacKenzie) v227 9/19/94 Fixed strerror config problem. Posted to prep.ai.mit.edu @@ -397,7 +397,7 @@ v230 9/21/94 Don't print extra error msg in search after regerror(). v231 9/22/94 Fix hilite bug if search matches 0 chars. (thanks to John Polstra) -v232 9/23/94 Deal with weird systems that have +v232 9/23/94 Deal with weird systems that have termios.h but not tcgetattr(). Posted to prep.ai.mit.edu ----------------------------------------------------------------- @@ -406,7 +406,7 @@ v233 9/26/94 Use get_term() instead of pos_init() in (Thanks to John Malecki) v234 9/26/94 Make MIDDLE closer to middle of screen. v235 9/27/94 Use local strchr if system doesn't have. -v236 9/28/94 Don't use libucb; use libterm if +v236 9/28/94 Don't use libucb; use libterm if libtermcap & libcurses doesn't work. (Fix for Solaris; thanks to Frank Kaefer) v237 9/30/94 Use system isupper() etc if provided. @@ -432,7 +432,7 @@ v249 11/5/94 Remove -f flag from lesskey; default v250 11/7/94 Lesskey input file "-" means stdin. v251 11/9/94 Convert cfgetospeed result to ospeed. (Thanks to Andrew Chernov) -v252 11/16/94 Change default lesskey input file from +v252 11/16/94 Change default lesskey input file from .lesskey.in to .lesskey. Posted to prep.ai.mit.edu ----------------------------------------------------------------- @@ -467,7 +467,7 @@ v273 1/6/95 Fix ch_ungetchar bug; don't call v274 1/6/95 Ported to OS/2 (thanks to Kai Uwe Rommel) v275 1/18/95 Fix bug if toggle -G at EOF. v276 1/30/95 Fix OS/2 version. -v277 1/31/95 Add "next" charset; don't display ^X +v277 1/31/95 Add "next" charset; don't display ^X for X > 128. v278 2/14/95 Change default for -G. Posted to prep.ai.mit.edu @@ -481,7 +481,7 @@ v282 3/2/95 Minor fixes. v283 3/2/95 Fix homefile; make OS2 look in $HOME. v284 3/2/95 Error if "v" on LESSOPENed file; "%" figures out file size on pipe. -v285 3/7/95 Don't set # in lsystem; +v285 3/7/95 Don't set # in lsystem; lesskey try $HOME first. v286 3/7/95 Reformat change history (too much free time?). v287 3/8/95 Fix hilite bug if overstrike multiple chars. @@ -501,9 +501,9 @@ v293 4/28/95 Add auto-versioning stuff to make dist. v294 5/12/95 Fix Borland build. v295 1/20/96 Fix search on squished file; add /@@. v296 1/23/96 Allow cmdbuf larger than screen width. -v297 1/24/96 Don't call termcap if tgetent fails; +v297 1/24/96 Don't call termcap if tgetent fails; add #defines for buffers. -v298 1/24/96 Change @@ to ^K. +v298 1/24/96 Change @@ to ^K. Add alternate search modifiers ^N, ^F, ^E. v299 1/25/96 Fix percent overflow in jump_percent (thanks to Brent Wiese); don't send "ti" after shell command till RETURN pressed. @@ -526,14 +526,14 @@ v315 4/26/96 Fix "!;TAB" bug. v316 5/2/96 Make "|a" when (a < curr screen) go to end of curr screen. v317 5/14/96 Various fixes for the MS-DOS and OS/2 builds. Added ## and %% handling for filenames -v318 5/29/96 Port to OS-9 Microware compiler; minor fixes +v318 5/29/96 Port to OS-9 Microware compiler; minor fixes (thanks to Martin Gregorie). v319 7/8/96 Fix Windows port (thanks to Jeff Paquette). v320 7/11/96 Final fixes for Windows port. v321 7/18/96 Minor fixes. Posted to Web page. ----------------------------------------------------------------- -v322 8/13/96 Fix bug in shell escape from help file; add support for +v322 8/13/96 Fix bug in shell escape from help file; add support for Microsoft Visual C under Windows; numerous small fixes. v323 8/19/96 Fixes for Windows version (thanks to Simon Munton); fix for Linux library weirdness (thanks to Jim Diamond); @@ -658,8 +658,8 @@ v386 9/13/05 Improvements to UTF-8 shift & color (thanks to Charles Levert); protect against invalid LESSOPEN and LESSCLOSE values. v387 9/14/05 Update Charles Levert's UTF-8 patch. v388 9/14/05 Change history behavior; change most sprintf calls to snprintf. -v389 9/14/05 Fix copy & paste with long lines; improve performance of - expand_linebuf; fix crash in init_mlist; +v389 9/14/05 Fix copy & paste with long lines; improve performance of + expand_linebuf; fix crash in init_mlist; v390 9/15/05 Show search matches in status column even if -G is set. ----------------------------------------------------------------- v391 9/17/05 Fix bugs. @@ -671,7 +671,7 @@ v394 11/8/05 Fix prompt bug; fix compile problem in Windows build. v395 1/12/07 Update Unicode tables (thanks to Charles Levert); don't chmod if LESSHISTFILE = /dev/null; make -f work for directories; support DESTDIR in Makefile; - fix sigset_t detection in configure; + fix sigset_t detection in configure; make "t" cmd traverse tags in correct order v396 1/13/07 Add compatibility with POSIX more. v397 3/21/07 Allow decimal point in number for % command; @@ -731,7 +731,7 @@ v436 7/05/09 Fix memory leak. ----------------------------------------------------------------- v437 7/14/09 Fix bug in handling some long option names; make percentage calculation more accurate. -v438 12/29/10 Fix bugs with -i/-I and & filtering; +v438 12/29/10 Fix bugs with -i/-I and & filtering; exit with status 2 on ctrl-C with -K. v439 12/31/10 Add -A option. v440 1/5/11 Fix bug displaying prompt after = command. @@ -782,7 +782,7 @@ v471 12/14/14 Fix unget issues with prompt. Allow disabling history v473 12/19/14 Fix prompt bug with stdin and -^P in lesskey extra string. v474 1/30/15 Fix bug in backwards search with match on bottom line. Make follow mode reopen file if file shrinks. -v475 3/2/15 Fix possible buffer overrun with invalid UTF-8; +v475 3/2/15 Fix possible buffer overrun with invalid UTF-8; fix bug when compiled with no regex; fix non-match search. v476 5/3/15 Update man pages. v477 5/19/15 Fix off-by-one in jump_forw_buffered; @@ -799,10 +799,10 @@ v483 2/27/16 Regenerate hilite when change search caselessness. v484 9/20/16 Update to Unicode 9.0.0 database. v485 10/21/16 Fix "nothing to search" bug when top/bottom line is empty; Display line numbers in bold. (thanks to Jason Hood); - Fix incorrect display when entering double-width chars in + Fix incorrect display when entering double-width chars in search string. -v486 10/22/16 New commands ESC-{ and ESC-} to shift to start/end of - displayed lines; new option -Da in Windows version to +v486 10/22/16 New commands ESC-{ and ESC-} to shift to start/end of + displayed lines; new option -Da in Windows version to enable SGR mode (thanks to Jason Hood). v487 10/23/16 configure --help formatting. ----------------------------------------------------------------- @@ -825,7 +825,7 @@ v501 7/12/17 Make sure rscroll char is standout by default. v502 7/13/17 Control rscroll char via command line option not env variable. v503 7/13/17 Switch to git. v504 7/13/17 Call opt_rscroll at startup; change mkhelp.c to mkhelp.pl. -v505 7/17/17 Add M and ESC-M commands; +v505 7/17/17 Add M and ESC-M commands; fix buffer handling with stdin and LESSOPEN. v506 7/17/17 On Windows, convert UTF-8 to multibyte if console is not UTF-8; handle extended chars on input (thanks to Jason Hood). @@ -854,10 +854,10 @@ v528 11/3/17 Make second ESC-u clear status column. v529 11/12/17 Display Unicode formatting chars in hex if -U is set. v530 12/2/17 Minor doc change and add missing VOID_PARAM. ----------------------------------------------------------------- -v531 5/13/18 Fix bug with v on empty file; fix bug with v on file with +v531 5/13/18 Fix bug with v on empty file; fix bug with v on file with metachars in name; add --nohistdups option. v532 7/27/18 Redraw screen on SIGWINCH even if screen size doesn't change. -v533 8/1/18 Shell escape filenames in history; use PCRE_UTF8 flag; +v533 8/1/18 Shell escape filenames in history; use PCRE_UTF8 flag; use wide-chars for Windows console title (thanks to Jason Hood). v534 8/9/18 Support PCRE2. v535 8/16/18 Don't count lines of initial screen if using -X with -F @@ -900,7 +900,7 @@ v566 11/25/20 Fix crash when reopening a file while using LESSOPEN; support OSC 8 hyperlinks. v567 11/25/20 Fix typo. v568 11/29/20 Fix some hyperlink bugs; add ^W search modifier - (thanks to Arminius); allow Makefile.aut to use Python + (thanks to Arminius); allow Makefile.aut to use Python instead of Perl (thanks to Charlie Lin). v569 12/1/20 Allow multiple & filters (thanks to Mattias Johansson), allow ^X to exit F command. @@ -925,7 +925,7 @@ v583 4/21/21 Use XDG_CONFIG_HOME and XDG_DATA_HOME to find files. v584 4/30/21 Add --file-size option. v585 5/2/21 Allow color desc W per man page. v586 5/7/21 Doc changes. -v587 5/27/21 Fix --with-secure; fix --file-size message on Windows; +v587 5/27/21 Fix --with-secure; fix --file-size message on Windows; fix colored search hilite in colored text; don't exit if -F and screen is resized; fix memcpy usage. v588 5/27/21 Fix release. @@ -937,12 +937,12 @@ v592 8/24/21 Add --status-line option; limit use of /proc kludge; add --heade v593 8/30/21 Add header columns, --no-number-headers. v594 10/1/21 Let regex library handle caseless; add --redraw-on-quit option; add #version to lesskey. -v595 10/12/21 Add H color type; add += to lesskey var section; +v595 10/12/21 Add H color type; add += to lesskey var section; add --search-options. v596 11/8/21 Look for lesskey in $HOME/.config. v597 11/16/21 Fix bugs in --header. v598 12/6/21 Look for lesshst in $XDG_STATE_HOME and $HOME/.local/state. -v599 12/28/21 Defer moving to lower left in some cases; +v599 12/28/21 Defer moving to lower left in some cases; suppress TAB expansion in some cases. v600 1/7/22 Use /dev/tty if cannot open ttyname(). v601 1/31/22 Add --exit-follow-on-close option. diff --git a/wide.uni b/wide.uni index 0e99223..6afa86f 100644 --- a/wide.uni +++ b/wide.uni @@ -1,123 +1,123 @@ /* Generated by "./mkutable -f1 W F -- unicode/EastAsianWidth.txt" on Tue Jul 19 12:45:19 PDT 2022 */ - { 0x1100, 0x115f }, /* W */ - { 0x231a, 0x231b }, /* W */ - { 0x2329, 0x232a }, /* W */ - { 0x23e9, 0x23ec }, /* W */ - { 0x23f0, 0x23f0 }, /* W */ - { 0x23f3, 0x23f3 }, /* W */ - { 0x25fd, 0x25fe }, /* W */ - { 0x2614, 0x2615 }, /* W */ - { 0x2648, 0x2653 }, /* W */ - { 0x267f, 0x267f }, /* W */ - { 0x2693, 0x2693 }, /* W */ - { 0x26a1, 0x26a1 }, /* W */ - { 0x26aa, 0x26ab }, /* W */ - { 0x26bd, 0x26be }, /* W */ - { 0x26c4, 0x26c5 }, /* W */ - { 0x26ce, 0x26ce }, /* W */ - { 0x26d4, 0x26d4 }, /* W */ - { 0x26ea, 0x26ea }, /* W */ - { 0x26f2, 0x26f3 }, /* W */ - { 0x26f5, 0x26f5 }, /* W */ - { 0x26fa, 0x26fa }, /* W */ - { 0x26fd, 0x26fd }, /* W */ - { 0x2705, 0x2705 }, /* W */ - { 0x270a, 0x270b }, /* W */ - { 0x2728, 0x2728 }, /* W */ - { 0x274c, 0x274c }, /* W */ - { 0x274e, 0x274e }, /* W */ - { 0x2753, 0x2755 }, /* W */ - { 0x2757, 0x2757 }, /* W */ - { 0x2795, 0x2797 }, /* W */ - { 0x27b0, 0x27b0 }, /* W */ - { 0x27bf, 0x27bf }, /* W */ - { 0x2b1b, 0x2b1c }, /* W */ - { 0x2b50, 0x2b50 }, /* W */ - { 0x2b55, 0x2b55 }, /* W */ - { 0x2e80, 0x2e99 }, /* W */ - { 0x2e9b, 0x2ef3 }, /* W */ - { 0x2f00, 0x2fd5 }, /* W */ - { 0x2ff0, 0x2ffb }, /* W */ - { 0x3000, 0x3000 }, /* F */ - { 0x3001, 0x303e }, /* W */ - { 0x3041, 0x3096 }, /* W */ - { 0x3099, 0x30ff }, /* W */ - { 0x3105, 0x312f }, /* W */ - { 0x3131, 0x318e }, /* W */ - { 0x3190, 0x31e3 }, /* W */ - { 0x31f0, 0x321e }, /* W */ - { 0x3220, 0x3247 }, /* W */ - { 0x3250, 0x4dbf }, /* W */ - { 0x4e00, 0xa48c }, /* W */ - { 0xa490, 0xa4c6 }, /* W */ - { 0xa960, 0xa97c }, /* W */ - { 0xac00, 0xd7a3 }, /* W */ - { 0xf900, 0xfaff }, /* W */ - { 0xfe10, 0xfe19 }, /* W */ - { 0xfe30, 0xfe52 }, /* W */ - { 0xfe54, 0xfe66 }, /* W */ - { 0xfe68, 0xfe6b }, /* W */ - { 0xff01, 0xff60 }, /* F */ - { 0xffe0, 0xffe6 }, /* F */ - { 0x16fe0, 0x16fe4 }, /* W */ - { 0x16ff0, 0x16ff1 }, /* W */ - { 0x17000, 0x187f7 }, /* W */ - { 0x18800, 0x18cd5 }, /* W */ - { 0x18d00, 0x18d08 }, /* W */ - { 0x1aff0, 0x1aff3 }, /* W */ - { 0x1aff5, 0x1affb }, /* W */ - { 0x1affd, 0x1affe }, /* W */ - { 0x1b000, 0x1b122 }, /* W */ - { 0x1b150, 0x1b152 }, /* W */ - { 0x1b164, 0x1b167 }, /* W */ - { 0x1b170, 0x1b2fb }, /* W */ - { 0x1f004, 0x1f004 }, /* W */ - { 0x1f0cf, 0x1f0cf }, /* W */ - { 0x1f18e, 0x1f18e }, /* W */ - { 0x1f191, 0x1f19a }, /* W */ - { 0x1f200, 0x1f202 }, /* W */ - { 0x1f210, 0x1f23b }, /* W */ - { 0x1f240, 0x1f248 }, /* W */ - { 0x1f250, 0x1f251 }, /* W */ - { 0x1f260, 0x1f265 }, /* W */ - { 0x1f300, 0x1f320 }, /* W */ - { 0x1f32d, 0x1f335 }, /* W */ - { 0x1f337, 0x1f37c }, /* W */ - { 0x1f37e, 0x1f393 }, /* W */ - { 0x1f3a0, 0x1f3ca }, /* W */ - { 0x1f3cf, 0x1f3d3 }, /* W */ - { 0x1f3e0, 0x1f3f0 }, /* W */ - { 0x1f3f4, 0x1f3f4 }, /* W */ - { 0x1f3f8, 0x1f43e }, /* W */ - { 0x1f440, 0x1f440 }, /* W */ - { 0x1f442, 0x1f4fc }, /* W */ - { 0x1f4ff, 0x1f53d }, /* W */ - { 0x1f54b, 0x1f54e }, /* W */ - { 0x1f550, 0x1f567 }, /* W */ - { 0x1f57a, 0x1f57a }, /* W */ - { 0x1f595, 0x1f596 }, /* W */ - { 0x1f5a4, 0x1f5a4 }, /* W */ - { 0x1f5fb, 0x1f64f }, /* W */ - { 0x1f680, 0x1f6c5 }, /* W */ - { 0x1f6cc, 0x1f6cc }, /* W */ - { 0x1f6d0, 0x1f6d2 }, /* W */ - { 0x1f6d5, 0x1f6d7 }, /* W */ - { 0x1f6dd, 0x1f6df }, /* W */ - { 0x1f6eb, 0x1f6ec }, /* W */ - { 0x1f6f4, 0x1f6fc }, /* W */ - { 0x1f7e0, 0x1f7eb }, /* W */ - { 0x1f7f0, 0x1f7f0 }, /* W */ - { 0x1f90c, 0x1f93a }, /* W */ - { 0x1f93c, 0x1f945 }, /* W */ - { 0x1f947, 0x1f9ff }, /* W */ - { 0x1fa70, 0x1fa74 }, /* W */ - { 0x1fa78, 0x1fa7c }, /* W */ - { 0x1fa80, 0x1fa86 }, /* W */ - { 0x1fa90, 0x1faac }, /* W */ - { 0x1fab0, 0x1faba }, /* W */ - { 0x1fac0, 0x1fac5 }, /* W */ - { 0x1fad0, 0x1fad9 }, /* W */ - { 0x1fae0, 0x1fae7 }, /* W */ - { 0x1faf0, 0x1faf6 }, /* W */ - { 0x20000, 0x2fffd }, /* W */ - { 0x30000, 0x3fffd }, /* W */ + { 0x1100, 0x115f }, /* W */ + { 0x231a, 0x231b }, /* W */ + { 0x2329, 0x232a }, /* W */ + { 0x23e9, 0x23ec }, /* W */ + { 0x23f0, 0x23f0 }, /* W */ + { 0x23f3, 0x23f3 }, /* W */ + { 0x25fd, 0x25fe }, /* W */ + { 0x2614, 0x2615 }, /* W */ + { 0x2648, 0x2653 }, /* W */ + { 0x267f, 0x267f }, /* W */ + { 0x2693, 0x2693 }, /* W */ + { 0x26a1, 0x26a1 }, /* W */ + { 0x26aa, 0x26ab }, /* W */ + { 0x26bd, 0x26be }, /* W */ + { 0x26c4, 0x26c5 }, /* W */ + { 0x26ce, 0x26ce }, /* W */ + { 0x26d4, 0x26d4 }, /* W */ + { 0x26ea, 0x26ea }, /* W */ + { 0x26f2, 0x26f3 }, /* W */ + { 0x26f5, 0x26f5 }, /* W */ + { 0x26fa, 0x26fa }, /* W */ + { 0x26fd, 0x26fd }, /* W */ + { 0x2705, 0x2705 }, /* W */ + { 0x270a, 0x270b }, /* W */ + { 0x2728, 0x2728 }, /* W */ + { 0x274c, 0x274c }, /* W */ + { 0x274e, 0x274e }, /* W */ + { 0x2753, 0x2755 }, /* W */ + { 0x2757, 0x2757 }, /* W */ + { 0x2795, 0x2797 }, /* W */ + { 0x27b0, 0x27b0 }, /* W */ + { 0x27bf, 0x27bf }, /* W */ + { 0x2b1b, 0x2b1c }, /* W */ + { 0x2b50, 0x2b50 }, /* W */ + { 0x2b55, 0x2b55 }, /* W */ + { 0x2e80, 0x2e99 }, /* W */ + { 0x2e9b, 0x2ef3 }, /* W */ + { 0x2f00, 0x2fd5 }, /* W */ + { 0x2ff0, 0x2ffb }, /* W */ + { 0x3000, 0x3000 }, /* F */ + { 0x3001, 0x303e }, /* W */ + { 0x3041, 0x3096 }, /* W */ + { 0x3099, 0x30ff }, /* W */ + { 0x3105, 0x312f }, /* W */ + { 0x3131, 0x318e }, /* W */ + { 0x3190, 0x31e3 }, /* W */ + { 0x31f0, 0x321e }, /* W */ + { 0x3220, 0x3247 }, /* W */ + { 0x3250, 0x4dbf }, /* W */ + { 0x4e00, 0xa48c }, /* W */ + { 0xa490, 0xa4c6 }, /* W */ + { 0xa960, 0xa97c }, /* W */ + { 0xac00, 0xd7a3 }, /* W */ + { 0xf900, 0xfaff }, /* W */ + { 0xfe10, 0xfe19 }, /* W */ + { 0xfe30, 0xfe52 }, /* W */ + { 0xfe54, 0xfe66 }, /* W */ + { 0xfe68, 0xfe6b }, /* W */ + { 0xff01, 0xff60 }, /* F */ + { 0xffe0, 0xffe6 }, /* F */ + { 0x16fe0, 0x16fe4 }, /* W */ + { 0x16ff0, 0x16ff1 }, /* W */ + { 0x17000, 0x187f7 }, /* W */ + { 0x18800, 0x18cd5 }, /* W */ + { 0x18d00, 0x18d08 }, /* W */ + { 0x1aff0, 0x1aff3 }, /* W */ + { 0x1aff5, 0x1affb }, /* W */ + { 0x1affd, 0x1affe }, /* W */ + { 0x1b000, 0x1b122 }, /* W */ + { 0x1b150, 0x1b152 }, /* W */ + { 0x1b164, 0x1b167 }, /* W */ + { 0x1b170, 0x1b2fb }, /* W */ + { 0x1f004, 0x1f004 }, /* W */ + { 0x1f0cf, 0x1f0cf }, /* W */ + { 0x1f18e, 0x1f18e }, /* W */ + { 0x1f191, 0x1f19a }, /* W */ + { 0x1f200, 0x1f202 }, /* W */ + { 0x1f210, 0x1f23b }, /* W */ + { 0x1f240, 0x1f248 }, /* W */ + { 0x1f250, 0x1f251 }, /* W */ + { 0x1f260, 0x1f265 }, /* W */ + { 0x1f300, 0x1f320 }, /* W */ + { 0x1f32d, 0x1f335 }, /* W */ + { 0x1f337, 0x1f37c }, /* W */ + { 0x1f37e, 0x1f393 }, /* W */ + { 0x1f3a0, 0x1f3ca }, /* W */ + { 0x1f3cf, 0x1f3d3 }, /* W */ + { 0x1f3e0, 0x1f3f0 }, /* W */ + { 0x1f3f4, 0x1f3f4 }, /* W */ + { 0x1f3f8, 0x1f43e }, /* W */ + { 0x1f440, 0x1f440 }, /* W */ + { 0x1f442, 0x1f4fc }, /* W */ + { 0x1f4ff, 0x1f53d }, /* W */ + { 0x1f54b, 0x1f54e }, /* W */ + { 0x1f550, 0x1f567 }, /* W */ + { 0x1f57a, 0x1f57a }, /* W */ + { 0x1f595, 0x1f596 }, /* W */ + { 0x1f5a4, 0x1f5a4 }, /* W */ + { 0x1f5fb, 0x1f64f }, /* W */ + { 0x1f680, 0x1f6c5 }, /* W */ + { 0x1f6cc, 0x1f6cc }, /* W */ + { 0x1f6d0, 0x1f6d2 }, /* W */ + { 0x1f6d5, 0x1f6d7 }, /* W */ + { 0x1f6dd, 0x1f6df }, /* W */ + { 0x1f6eb, 0x1f6ec }, /* W */ + { 0x1f6f4, 0x1f6fc }, /* W */ + { 0x1f7e0, 0x1f7eb }, /* W */ + { 0x1f7f0, 0x1f7f0 }, /* W */ + { 0x1f90c, 0x1f93a }, /* W */ + { 0x1f93c, 0x1f945 }, /* W */ + { 0x1f947, 0x1f9ff }, /* W */ + { 0x1fa70, 0x1fa74 }, /* W */ + { 0x1fa78, 0x1fa7c }, /* W */ + { 0x1fa80, 0x1fa86 }, /* W */ + { 0x1fa90, 0x1faac }, /* W */ + { 0x1fab0, 0x1faba }, /* W */ + { 0x1fac0, 0x1fac5 }, /* W */ + { 0x1fad0, 0x1fad9 }, /* W */ + { 0x1fae0, 0x1fae7 }, /* W */ + { 0x1faf0, 0x1faf6 }, /* W */ + { 0x20000, 0x2fffd }, /* W */ + { 0x30000, 0x3fffd }, /* W */ diff --git a/xbuf.c b/xbuf.c index 4e767e3..1583d79 100644 --- a/xbuf.c +++ b/xbuf.c @@ -4,70 +4,70 @@ /* * Initialize an expandable text buffer. */ - public void + public void xbuf_init(xbuf) - struct xbuffer *xbuf; + struct xbuffer *xbuf; { - xbuf->data = NULL; - xbuf->size = xbuf->end = 0; + xbuf->data = NULL; + xbuf->size = xbuf->end = 0; } - public void + public void xbuf_deinit(xbuf) - struct xbuffer *xbuf; + struct xbuffer *xbuf; { - if (xbuf->data != NULL) - free(xbuf->data); - xbuf_init(xbuf); + if (xbuf->data != NULL) + free(xbuf->data); + xbuf_init(xbuf); } - public void + public void xbuf_reset(xbuf) - struct xbuffer *xbuf; + struct xbuffer *xbuf; { - xbuf->end = 0; + xbuf->end = 0; } /* * Add a char to an expandable text buffer. */ - public void + public void xbuf_add(xbuf, ch) - struct xbuffer *xbuf; - int ch; + struct xbuffer *xbuf; + int ch; { - if (xbuf->end >= xbuf->size) - { - char *data; - xbuf->size = (xbuf->size == 0) ? 16 : xbuf->size * 2; - data = (char *) ecalloc(xbuf->size, sizeof(char)); - if (xbuf->data != NULL) - { - memcpy(data, xbuf->data, xbuf->end); - free(xbuf->data); - } - xbuf->data = data; - } - xbuf->data[xbuf->end++] = ch; + if (xbuf->end >= xbuf->size) + { + char *data; + xbuf->size = (xbuf->size == 0) ? 16 : xbuf->size * 2; + data = (char *) ecalloc(xbuf->size, sizeof(char)); + if (xbuf->data != NULL) + { + memcpy(data, xbuf->data, xbuf->end); + free(xbuf->data); + } + xbuf->data = data; + } + xbuf->data[xbuf->end++] = ch; } - public int + public int xbuf_pop(buf) - struct xbuffer *buf; + struct xbuffer *buf; { - if (buf->end == 0) - return -1; - return buf->data[--(buf->end)]; + if (buf->end == 0) + return -1; + return buf->data[--(buf->end)]; } - public void + public void xbuf_set(dst, src) - struct xbuffer *dst; - struct xbuffer *src; + struct xbuffer *dst; + struct xbuffer *src; { - int i; + int i; - xbuf_reset(dst); - for (i = 0; i < src->end; i++) - xbuf_add(dst, src->data[i]); + xbuf_reset(dst); + for (i = 0; i < src->end; i++) + xbuf_add(dst, src->data[i]); } diff --git a/xbuf.h b/xbuf.h index d317e17..03acb84 100644 --- a/xbuf.h +++ b/xbuf.h @@ -3,9 +3,9 @@ struct xbuffer { - char *data; - int end; - int size; + char *data; + int end; + int size; }; void xbuf_init(struct xbuffer *xbuf); From 267158a32ff118badb7fa287fa54b1405aab4b66 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Thu, 12 Oct 2023 22:32:23 -0500 Subject: [PATCH 3/4] fix compiler error/warning (clang; -Wincompatible-pointer-types) --- screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen.c b/screen.c index 4bfc694..227ef83 100644 --- a/screen.c +++ b/screen.c @@ -2978,7 +2978,7 @@ WIN32getch(VOID_PARAM) // If multibyte character, return its first byte if (currentKey.ascii != currentKey.unicode) { - utf8_size = WideCharToMultiByte(CP_UTF8, 0, ¤tKey.unicode, 1, &utf8, sizeof(utf8), NULL, NULL); + utf8_size = WideCharToMultiByte(CP_UTF8, 0, ¤tKey.unicode, 1, (LPSTR)&utf8, sizeof(utf8), NULL, NULL); if (utf8_size == 0 ) return '\0'; ascii = utf8[0]; From ed637dbb722a5a0ad31cb148cfc71b27e45b656f Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Thu, 12 Oct 2023 22:45:14 -0500 Subject: [PATCH 4/4] fix ~ move variable declaration to head of block (older C requirement) --- command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/command.c b/command.c index 4611e39..ef20878 100644 --- a/command.c +++ b/command.c @@ -705,6 +705,7 @@ mca_char(c) case A_B_SEARCH: if (incr_search) { + int save_updown_match = 0; /* Incremental search: do a search after every input char. */ int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP)); char *pattern = get_cmdbuf(); @@ -715,7 +716,7 @@ mca_char(c) * reinits it. That breaks history scrolling. * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} */ - int save_updown_match = updown_match; + save_updown_match = updown_match; cmd_exec(); if (*pattern == '\0') {