Sync with HEAD.

2 files changed, 13 insertions, 1 deletions

diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h
index fe8f1bcd49ce3..27b73ceff29e8 100644
--- a/usr.bin/less/defines.h
+++ b/usr.bin/less/defines.h
@@ -184,6 +184,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines */
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -193,6 +194,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Settings automatically determined by configure.  */
 
diff --git a/usr.bin/less/zless.sh b/usr.bin/less/zless.sh
index b947b819f2c04..f2e035c2d7e25 100644
--- a/usr.bin/less/zless.sh
+++ b/usr.bin/less/zless.sh
@@ -3,5 +3,5 @@
 # $FreeBSD$
 #
 
-export LESSOPEN="|/usr/bin/lesspipe.sh %s"
+export LESSOPEN="||/usr/bin/lesspipe.sh %s"
 exec /usr/bin/less "$@"