d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch the default pager for most commands to less

Browse Source 
Finally, a pager for the nineties.

MFC after:	Never
Relnotes:	Yes
Differential Revision:	https://reviews.freebsd.org/D13465
Poll:		https://reviews.freebsd.org/V7
This commit is contained in:
Alan Somers 2018-08-08 19:24:20 +00:00
parent 6a318e696e
commit 47cc9ee1b1
23 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UPDATING
View File

@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
disable the most expensive debugging functionality run disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".) "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20180808:
The default pager for most commands has been changed to "less". To
restore the old behavior, set PAGER="more" and MANPAGER="more -s" in
your environment.
20180731: 20180731:
The jedec_ts(4) driver has been removed. A superset of its functionality The jedec_ts(4) driver has been removed. A superset of its functionality
is available in the jedec_dimm(4) driver, and the manpage for that is available in the jedec_dimm(4) driver, and the manpage for that

8
contrib/mdocml/apropos.1
View File

@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: July 4 2017 $ .Dd $Mdocdate: August 8 2018 $
.Dt APROPOS 1 .Dt APROPOS 1
.Os .Os
.Sh NAME .Sh NAME
@ -74,7 +74,7 @@ would.
If the standard output is a terminal device and If the standard output is a terminal device and
.Fl c .Fl c
is not specified, use is not specified, use
.Xr more 1 .Xr less 1
to paginate them. to paginate them.
In In
.Fl a .Fl a
@ -334,7 +334,7 @@ Text production:
Any non-empty value of the environment variable Any non-empty value of the environment variable
.Ev MANPAGER .Ev MANPAGER
is used instead of the standard pagination program, is used instead of the standard pagination program,
.Xr more 1 ; .Xr less 1 ;
see see
.Xr man 1 .Xr man 1
for details. for details.
@ -357,7 +357,7 @@ Specifies the pagination program to use when
.Ev MANPAGER .Ev MANPAGER
is not defined. is not defined.
If neither PAGER nor MANPAGER is defined, If neither PAGER nor MANPAGER is defined,
.Xr more 1 .Xr less 1
.Fl s .Fl s
is used. is used.
Only used if Only used if

2
contrib/mdocml/main.c
View File

@ -1119,7 +1119,7 @@ spawn_pager(struct tag_files *tag_files)
if (pager == NULL || *pager == '\0') if (pager == NULL || *pager == '\0')
pager = getenv("PAGER"); pager = getenv("PAGER");
if (pager == NULL || *pager == '\0') if (pager == NULL || *pager == '\0')
pager = "more -s"; pager = "less -s";
cp = mandoc_strdup(pager); cp = mandoc_strdup(pager);
/* /*

8
contrib/mdocml/man.1
View File

@ -31,7 +31,7 @@
.\" .\"
.\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" @(#)man.1 8.2 (Berkeley) 1/2/94
.\" .\"
.Dd $Mdocdate: May 17 2017 $ .Dd $Mdocdate: August 8 2018 $
.Dt MAN 1 .Dt MAN 1
.Os .Os
.Sh NAME .Sh NAME
@ -75,7 +75,7 @@ See
for a description of the contents of this file. for a description of the contents of this file.
.It Fl c .It Fl c
Copy the manual page to the standard output instead of using Copy the manual page to the standard output instead of using
.Xr more 1 .Xr less 1
to paginate it. to paginate it.
This is done by default if the standard output is not a terminal device. This is done by default if the standard output is not a terminal device.
.It Fl f .It Fl f
@ -233,7 +233,7 @@ is case insensitive.
Any non-empty value of the environment variable Any non-empty value of the environment variable
.Ev MANPAGER .Ev MANPAGER
is used instead of the standard pagination program, is used instead of the standard pagination program,
.Xr more 1 . .Xr less 1 .
If If
.Xr less 1 .Xr less 1
is used, the interactive is used, the interactive
@ -282,7 +282,7 @@ Specifies the pagination program to use when
.Ev MANPAGER .Ev MANPAGER
is not defined. is not defined.
If neither PAGER nor MANPAGER is defined, If neither PAGER nor MANPAGER is defined,
.Xr more 1 .Xr less 1
.Fl s .Fl s
is used. is used.
Only used if Only used if

10
contrib/mdocml/mandoc.1
View File

@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: July 20 2017 $ .Dd $Mdocdate: August 8 2018 $
.Dt MANDOC 1 .Dt MANDOC 1
.Os .Os
.Sh NAME .Sh NAME
@ -54,13 +54,13 @@ The options are as follows:
If the standard output is a terminal device and If the standard output is a terminal device and
.Fl c .Fl c
is not specified, use is not specified, use
.Xr more 1 .Xr less 1
to paginate the output, just like to paginate the output, just like
.Xr man 1 .Xr man 1
would. would.
.It Fl c .It Fl c
Copy the formatted manual pages to the standard output without using Copy the formatted manual pages to the standard output without using
.Xr more 1 .Xr less 1
to paginate them. to paginate them.
This is the default. This is the default.
It can be specified to override It can be specified to override
@ -578,7 +578,7 @@ Meta data is not available in this case.
Any non-empty value of the environment variable Any non-empty value of the environment variable
.Ev MANPAGER .Ev MANPAGER
is used instead of the standard pagination program, is used instead of the standard pagination program,
.Xr more 1 ; .Xr less 1 ;
see see
.Xr man 1 .Xr man 1
for details. for details.
@ -592,7 +592,7 @@ Specifies the pagination program to use when
.Ev MANPAGER .Ev MANPAGER
is not defined. is not defined.
If neither PAGER nor MANPAGER is defined, If neither PAGER nor MANPAGER is defined,
.Xr more 1 .Xr less 1
.Fl s .Fl s
is used. is used.
Only used if Only used if

2
contrib/tnftp/src/ftp_var.h
View File

@ -189,7 +189,7 @@ enum {
#define GATE_SERVER "" /* default server */ #define GATE_SERVER "" /* default server */
#endif #endif
#define DEFAULTPAGER "more" /* default pager if $PAGER isn't set */ #define DEFAULTPAGER "less" /* default pager if $PAGER isn't set */
#define DEFAULTPROMPT "ftp> " /* default prompt if `set prompt' is empty */ #define DEFAULTPROMPT "ftp> " /* default prompt if `set prompt' is empty */
#define DEFAULTRPROMPT "" /* default rprompt if `set rprompt' is empty */ #define DEFAULTRPROMPT "" /* default rprompt if `set rprompt' is empty */

2
etc/root/dot.cshrc
View File

@ -18,7 +18,7 @@ umask 22
set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
setenv EDITOR vi setenv EDITOR vi
setenv PAGER more setenv PAGER less
setenv BLOCKSIZE K setenv BLOCKSIZE K
if ($?prompt) then if ($?prompt) then

2
etc/root/dot.profile
View File

@ -6,7 +6,7 @@ HOME=/root
export HOME export HOME
TERM=${TERM:-xterm} TERM=${TERM:-xterm}
export TERM export TERM
PAGER=more PAGER=less
export PAGER export PAGER
# Query terminal size; useful for serial lines. # Query terminal size; useful for serial lines.

2
share/skel/dot.cshrc
View File

@ -20,7 +20,7 @@ alias ll ls -lAF
# umask 22 # umask 22
setenv EDITOR vi setenv EDITOR vi
setenv PAGER more setenv PAGER less
if ($?prompt) then if ($?prompt) then
# An interactive shell -- set some stuff up # An interactive shell -- set some stuff up

2
share/skel/dot.mailrc
View File

@ -7,7 +7,7 @@
set append ask autoprint set append ask autoprint
set indentprefix="> " set indentprefix="> "
set PAGER=more set PAGER=less
set EDITOR=vi set EDITOR=vi
set VISUAL=vi set VISUAL=vi
set folder=Mail set folder=Mail

2
share/skel/dot.profile
View File

@ -16,7 +16,7 @@
# TERM=xterm; export TERM # TERM=xterm; export TERM
EDITOR=vi; export EDITOR EDITOR=vi; export EDITOR
PAGER=more; export PAGER PAGER=less; export PAGER
# set ENV to a file invoked each time sh is started for interactive use. # set ENV to a file invoked each time sh is started for interactive use.
ENV=$HOME/.shrc; export ENV ENV=$HOME/.shrc; export ENV

2
tools/tools/nanobsd/pcengines/Files/root/.cshrc
View File

@ -17,7 +17,7 @@ umask 22
set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
setenv EDITOR vi setenv EDITOR vi
setenv PAGER more setenv PAGER less
setenv BLOCKSIZE K setenv BLOCKSIZE K
if ($?prompt) then if ($?prompt) then

6
tools/tools/nanobsd/rescue/Files/root/.cshrc
View File

@ -8,13 +8,13 @@
a la ls -a a la ls -a
a lf ls -FA a lf ls -FA
a ll ls -lA a ll ls -lA
a lm 'll | more' a lm 'll | less'
a m more a m less
set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin /usr/X11R6/bin /usr/local/jdk1.6.0/bin /usr/local/jdk1.5.0/bin $HOME/bin) set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin /usr/X11R6/bin /usr/local/jdk1.6.0/bin /usr/local/jdk1.5.0/bin $HOME/bin)
setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man" setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man"
setenv PAGER more setenv PAGER less
setenv EDITOR vi setenv EDITOR vi
setenv BLOCKSIZE K setenv BLOCKSIZE K
setenv FTP_PASSIVE_MODE YES setenv FTP_PASSIVE_MODE YES

2
usr.bin/mail/cmd1.c
View File

@ -311,7 +311,7 @@ type1(int *msgvec, int doign, int page)
if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) { if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) {
cp = value("PAGER"); cp = value("PAGER");
if (cp == NULL || *cp == '\0') if (cp == NULL || *cp == '\0')
cp = _PATH_MORE; cp = _PATH_LESS;
obuf = Popen(cp, "w"); obuf = Popen(cp, "w");
if (obuf == NULL) { if (obuf == NULL) {
warnx("%s", cp); warnx("%s", cp);

4
usr.bin/mail/mail.1
View File

@ -28,7 +28,7 @@
.\" @(#)mail.1 8.8 (Berkeley) 4/28/95 .\" @(#)mail.1 8.8 (Berkeley) 4/28/95
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd January 5, 2006 .Dd August 8, 2018
.Dt MAIL 1 .Dt MAIL 1
.Os .Os
.Sh NAME .Sh NAME
@ -1188,7 +1188,7 @@ command or when
.Va crt .Va crt
variable is set. variable is set.
The default paginator The default paginator
.Xr more 1 .Xr less 1
is used if this option is not defined. is used if this option is not defined.
.It Ev REPLYTO .It Ev REPLYTO
If set, will be used to initialize the Reply-To field for outgoing If set, will be used to initialize the Reply-To field for outgoing

2
usr.bin/mail/pathnames.h
View File

@ -37,4 +37,4 @@
#define _PATH_HELP "/usr/share/misc/mail.help" #define _PATH_HELP "/usr/share/misc/mail.help"
#define _PATH_TILDE "/usr/share/misc/mail.tildehelp" #define _PATH_TILDE "/usr/share/misc/mail.tildehelp"
#define _PATH_MASTER_RC "/usr/share/misc/mail.rc:/usr/local/etc/mail.rc:/etc/mail.rc" #define _PATH_MASTER_RC "/usr/share/misc/mail.rc:/usr/local/etc/mail.rc:/etc/mail.rc"
#define _PATH_MORE "/usr/bin/more" #define _PATH_LESS "/usr/bin/less"

6
usr.bin/man/man.1
View File

@ -25,7 +25,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd April 25, 2018 .Dd August 8, 2018
.Dt MAN 1 .Dt MAN 1
.Os .Os
.Sh NAME .Sh NAME
@ -106,7 +106,7 @@ Use specified pager.
Defaults to Defaults to
.Dq Li "less -sR" .Dq Li "less -sR"
if color support is enabled, or if color support is enabled, or
.Dq Li "more -s" . .Dq Li "less -s" .
Overrides the Overrides the
.Ev MANPAGER .Ev MANPAGER
environment variable, which in turn overrides the environment variable, which in turn overrides the
@ -345,7 +345,7 @@ If unset, and color support is disabled, then
.Ev PAGER .Ev PAGER
is used. is used.
If that has no value either, If that has no value either,
.Dq Li "more -s" .Dq Li "less -s"
is used. is used.
.El .El
.Sh FILES .Sh FILES

2
usr.bin/man/man.sh
View File

@ -901,7 +901,7 @@ setup_pager() {
if [ -n "$PAGER" ]; then if [ -n "$PAGER" ]; then
MANPAGER="$PAGER" MANPAGER="$PAGER"
else else
MANPAGER="more -s" MANPAGER="less -s"
fi fi
fi fi
fi fi

6
usr.bin/msgs/msgs.1
View File

@ -28,7 +28,7 @@
.\" @(#)msgs.1 8.2 (Berkeley) 4/28/95 .\" @(#)msgs.1 8.2 (Berkeley) 4/28/95
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd April 28, 1995 .Dd August 8, 2018
.Dt MSGS 1 .Dt MSGS 1
.Os .Os
.Sh NAME .Sh NAME
@ -196,7 +196,7 @@ messages back from the one indicated in the
file, useful for reviews of recent messages. file, useful for reviews of recent messages.
.It Fl p .It Fl p
Pipe long messages through Pipe long messages through
.Xr more 1 . .Xr less 1 .
.El .El
.Pp .Pp
Within Within
@ -222,7 +222,7 @@ number of next message to be presented
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr more 1 , .Xr less 1 ,
.Xr aliases 5 , .Xr aliases 5 ,
.Xr periodic 8 .Xr periodic 8
.Sh HISTORY .Sh HISTORY

2
usr.bin/msgs/pathnames.h
View File

@ -35,6 +35,6 @@
#define _PATH_MSGS "/var/msgs" #define _PATH_MSGS "/var/msgs"
#define _PATH_MAIL "/usr/bin/Mail -f %s" #define _PATH_MAIL "/usr/bin/Mail -f %s"
#define _PATH_PAGER "/usr/bin/more -%d" #define _PATH_PAGER "/usr/bin/less -%d"
#undef _PATH_TMP #undef _PATH_TMP
#define _PATH_TMP "/tmp/msgXXXXXX" #define _PATH_TMP "/tmp/msgXXXXXX"

2
usr.sbin/freebsd-update/freebsd-update.sh
View File

@ -3300,7 +3300,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PATH}
# Set a pager if the user doesn't # Set a pager if the user doesn't
if [ -z "$PAGER" ]; then if [ -z "$PAGER" ]; then
PAGER=/usr/bin/more PAGER=/usr/bin/less
fi fi
# Set LC_ALL in order to avoid problems with character ranges like [A-Z]. # Set LC_ALL in order to avoid problems with character ranges like [A-Z].

6
usr.sbin/mergemaster/mergemaster.8
View File

@ -24,7 +24,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd March 6, 2017 .Dd August 8, 2018
.Dt MERGEMASTER 8 .Dt MERGEMASTER 8
.Os .Os
.Sh NAME .Sh NAME
@ -299,7 +299,7 @@ utility uses the
.Ev PAGER .Ev PAGER
environment variable if set. environment variable if set.
Otherwise it uses Otherwise it uses
.Xr more 1 . .Xr less 1 .
If If
.Ev PAGER .Ev PAGER
specifies a program outside specifies a program outside
@ -451,7 +451,7 @@ comparison, use:
.Sh SEE ALSO .Sh SEE ALSO
.Xr diff 1 , .Xr diff 1 ,
.Xr make 1 , .Xr make 1 ,
.Xr more 1 , .Xr less 1 ,
.Xr sdiff 1 , .Xr sdiff 1 ,
.Xr pwd_mkdb 8 .Xr pwd_mkdb 8
.Pp .Pp

16
usr.sbin/mergemaster/mergemaster.sh
View File

@ -426,19 +426,19 @@ check_pager () {
echo '' echo ''
echo " or you may type an absolute path to PAGER for this run" echo " or you may type an absolute path to PAGER for this run"
echo '' echo ''
echo " Default is to use plain old 'more' " echo " Default is to use 'less' "
echo '' echo ''
echo -n "What should I do? [Use 'more'] " echo -n "What should I do? [Use 'less'] "
read FIXPAGER read FIXPAGER
case "${FIXPAGER}" in case "${FIXPAGER}" in
[eE]) [eE])
exit 0 exit 0
;; ;;
[lL]) [lL]|'')
PAGER=less PAGER=less
;; ;;
[mM]|'') [mM])
PAGER=more PAGER=more
;; ;;
/*) /*)
@ -458,11 +458,11 @@ check_pager () {
esac esac
# If user has a pager defined, or got assigned one above, use it. # If user has a pager defined, or got assigned one above, use it.
# If not, use more. # If not, use less.
# #
PAGER=${PAGER:-more} PAGER=${PAGER:-less}
if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then if [ -n "${VERBOSE}" -a ! "${PAGER}" = "less" ]; then
echo " *** You have ${PAGER} defined as your pager so we will use that" echo " *** You have ${PAGER} defined as your pager so we will use that"
echo '' echo ''
sleep 3 sleep 3
@ -1127,7 +1127,7 @@ for COMPFILE in `find . -type f | sort`; do
else else
# Ok, the files are different, so show the user where they differ. # Ok, the files are different, so show the user where they differ.
# Use user's choice of diff methods; and user's pager if they have one. # Use user's choice of diff methods; and user's pager if they have one.
# Use more if not. # Use less if not.
# Use unified diffs by default. Context diffs give me a headache. :) # Use unified diffs by default. Context diffs give me a headache. :)
# #
# If the user chose the -F option, test for that before proceeding # If the user chose the -F option, test for that before proceeding