[illumos-gate merge]

commit be0ffda9658fd44dc2d5159e517a6a44577d427d
    11221 Should be able to enable findunref without lint
commit e6645893d65132754e10d2b7e2c6ecc5ea0107a4
    11195 Lint old man pages for errors with mandoc
commit 0ae8c37dc7709962a2fc99f02369b11707cccba0
    11194 syseventadm.1m: ERROR: using macro argument outside macro
commit 1f2dca3250468910bc4ef4471eb91650e6a39379
    11193 cmn_err.9f: UNSUPP: unsupported escape sequences
commit 2da8e96eb94b431165f3682ff0231d2ac4422c94
    11192 zpool.1m: UNSUPP: unsupported escape sequence: \?
commit cf26d3683ae21b85c4d302e60723a08e85e2574a
    11191 zfs.1m: UNSUPP: unsupported escape sequence: \?

8 files changed, 38 insertions, 186 deletions

diff --git a/usr/src/man/Makefile.man b/usr/src/man/Makefile.man
index a251d143e4..aeef3c35d6 100644
--- a/usr/src/man/Makefile.man
+++ b/usr/src/man/Makefile.man
@@ -25,7 +25,7 @@ FILEMODE=	0444
 # MANSECT=
 
 MANCHECKS=	$(MANFILES:%=%.check)
-ROOTMANFILES= 	$(MANFILES:%=$(ROOTMAN)/man$(MANSECT)/%)
+ROOTMANFILES=	$(MANFILES:%=$(ROOTMAN)/man$(MANSECT)/%)
 ROOTMANLINKS=	$(MANLINKS:%=$(ROOTMAN)/man$(MANSECT)/%)
 
 $(ROOTMAN)/man$(MANSECT) $(ROOTHASMAN)/man$(MANSECT):
@@ -44,9 +44,12 @@ $(ROOTMAN)/man$(MANSECT)/% : % $(ROOTMAN)/man$(MANSECT)
 # manually when editing (git pbchk will do so for you.)
 #
 $(MANCHECKS):
-		@$(EGREP) -q "^.TH" $(@:%.check=%) || \
-		( $(ECHO) "checking $(@:%.check=%)"; \
-		$(MANDOC) -Tlint -Wwarning $(@:%.check=%) )
+		@$(ECHO) "checking $(@:%.check=%)"; \
+		if $(EGREP) -q "^.TH" $(@:%.check=%); then \
+		$(MANDOC) -Tlint -Werror $(@:%.check=%); \
+		else; \
+		$(MANDOC) -Tlint -Wwarning $(@:%.check=%); \
+		fi
 
 $(MANLINKS):
 		$(RM) $@; $(SYMLINK) $(LINKSRC) $@
diff --git a/usr/src/man/man1m/syseventadm.1m b/usr/src/man/man1m/syseventadm.1m
index 8bd8d5786c..7cc654f64d 100644
--- a/usr/src/man/man1m/syseventadm.1m
+++ b/usr/src/man/man1m/syseventadm.1m
@@ -31,7 +31,7 @@ syseventadm \- sysevent event specification administration
 .fi
 
 .SH DESCRIPTION
-.sp
+
 .LP
 The \fBsyseventadm\fR command is an administrative front-end to add, remove and
 list \fBsysevent\fR event handlers. You can also restart the sysevent daemon by
@@ -75,7 +75,7 @@ The \fBsyseventadm\fR \fBrestart\fR command informs the \fBsyseventd\fR daemon
 to reread the \fBsysevent\fR registry after a change has been made by adding or
 removing one or more \fBsysevent\fR handler specifications.
 .SS "Argument Macro Substitution"
-.sp
+
 .LP
 The \fBsysevent\fR handling facility provides extensive macro capability for
 constructing the command line arguments to be executed in response to an event.
@@ -178,7 +178,7 @@ arguments.
 Array types are expanded with each element expanded as defined for that scalar
 type, with a space separating each element substitution.
 .SH OPTIONS
-.sp
+
 .LP
 The \fBadd\fR, \fBlist\fR and \fBremove\fR subcommands support the following
 options:
@@ -248,7 +248,7 @@ Sun-defined events use \fBSUNW\fR.
 .RE
 
 .SH OPERANDS
-.sp
+
 .LP
 The \fBadd\fR, \fBlist\fR and \fBremove\fR subcommands support the following
 options:
@@ -286,8 +286,8 @@ since the registry is maintained on \fB$ALTROOT\fR.
 .sp
 .in +2
 .nf
-# syseventadm add -R \$ALTROOT -v MYCO -c EC_ENV -s ESC_ENV_TEMP \e
-     /opt/MYCOenv/bin/ec_env_temp \e$class \e$subclass \e$pathname
+# syseventadm add -R $ALTROOT -v MYCO -c EC_ENV -s ESC_ENV_TEMP \e
+     /opt/MYCOenv/bin/ec_env_temp ${class} ${subclass} ${pathname}
 .fi
 .in -2
 .sp
@@ -306,8 +306,8 @@ The following example removes the event handler added in Example 1.
 .sp
 .in +2
 .nf
-# syseventadm remove -R \$ALTROOT -v MYCO -c EC_ENV -s ESC_ENV_TEMP \e
-     /opt/MYCOenv/bin/ec_env_temp \${class} \${subclass} \${pathname}
+# syseventadm remove -R $ALTROOT -v MYCO -c EC_ENV -s ESC_ENV_TEMP \e
+     /opt/MYCOenv/bin/ec_env_temp ${class} ${subclass} ${pathname}
 .fi
 .in -2
 .sp
@@ -329,7 +329,7 @@ The following example lists all event handlers for events of class
 .nf
 # syseventadm list -v MYCO -c EC_ENV -s ESC_ENV_TEMP \e
      vendor=MYCO class=EC_ENV subclass=ESC_ENV_TEMP \e
-     /opt/MYCOenv/bin/ec_env_temp \e${class} \e${subclass} \e${pathname}
+     /opt/MYCOenv/bin/ec_env_temp ${class} ${subclass} ${pathname}
 .fi
 .in -2
 .sp
@@ -396,7 +396,7 @@ The following example removes all event handlers specified to run the command
 .sp
 
 .SH EXIT STATUS
-.sp
+
 .LP
 The following exit values are returned:
 .sp
@@ -454,12 +454,12 @@ Out of memory.
 .RE
 
 .SH SEE ALSO
-.sp
+
 .LP
 \fBsyseventd\fR(1M), \fBsysevent_post_event\fR(3SYSEVENT), \fBattributes\fR(5),
 \fBddi_log_sysevent\fR(9F)
 .SH NOTES
-.sp
+
 .LP
 To avoid upgrade problems, packages delivering a sysevent event handler should
 install the event handler by running \fBsyseventadm\fR from the package's
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index e8787af33d..d80006ddeb 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -37,7 +37,7 @@
 .Nd configures ZFS file systems
 .Sh SYNOPSIS
 .Nm
-.Op Fl \?
+.Op Fl \&?
 .Nm
 .Cm create
 .Op Fl p
@@ -1861,7 +1861,7 @@ commands.
 All subcommands that modify state are logged persistently to the pool in their
 original form.
 .Bl -tag -width ""
-.It Nm Fl \?
+.It Nm Fl \&?
 Displays a help message.
 .It Xo
 .Nm
diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m
index 415a0ea2f2..e1b48c0293 100644
--- a/usr/src/man/man1m/zpool.1m
+++ b/usr/src/man/man1m/zpool.1m
@@ -35,7 +35,7 @@
 .Nd configure ZFS storage pools
 .Sh SYNOPSIS
 .Nm
-.Fl \?
+.Fl \&?
 .Nm
 .Cm add
 .Op Fl fgLnP
@@ -831,7 +831,7 @@ The following subcommands are supported:
 .Bl -tag -width Ds
 .It Xo
 .Nm
-.Fl \?
+.Fl \&?
 .Xc
 Displays a help message.
 .It Xo
diff --git a/usr/src/man/man9f/cmn_err.9f b/usr/src/man/man9f/cmn_err.9f
index 9b620c7ff4..d9bf8778a9 100644
--- a/usr/src/man/man9f/cmn_err.9f
+++ b/usr/src/man/man9f/cmn_err.9f
@@ -188,11 +188,11 @@ is identical to the one described in
 with additional meaning of the first character affecting where the message will
 be written:
 .Bl -tag -width Ds
-.It Sy \!
+.It \&!
 The message goes only to the system log.
 .It Sy ^
 The message goes only to the console.
-.It Sy \?
+.It \&?
 If
 .Fa level
 is also
@@ -202,7 +202,7 @@ when the system has been booted in verbose mode.
 See
 .Xr kernel 1M .
 If neither condition is met, the
-.Qq Sy \?
+.Qq Sy \&?
 character has no effect and is simply ignored.
 .El
 .Pp
@@ -353,7 +353,7 @@ This example shows how to use the
 .Sy %b
 conversion specification.
 Because of the leading
-.Qq Sy \?
+.Qq Sy \&?
 character in the format string, this message will always be logged, but it will
 only be displayed when the kernel is booted in verbose mode.
 .Bd -literal
diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh
index d7120cd84b..b33557f8a6 100644
--- a/usr/src/tools/env/illumos.sh
+++ b/usr/src/tools/env/illumos.sh
@@ -279,13 +279,6 @@ export BUILD_TOOLS='/opt'
 export SPRO_ROOT='/opt/SUNWspro'
 export SPRO_VROOT="$SPRO_ROOT"
 
-# This goes along with lint - it is a series of the form "A [y|n]" which
-# means "go to directory A and run 'make lint'" Then mail me (y) the
-# difference in the lint output. 'y' should only be used if the area you're
-# linting is actually lint clean or you'll get lots of mail.
-# You shouldn't need to change this though.
-#export LINTDIRS="$SRC y"
-
 # Set this flag to 'n' to disable the use of 'checkpaths'.  The default,
 # if the 'N' option is not specified, is to run this test.
 #CHECK_PATHS='y'
diff --git a/usr/src/tools/scripts/nightly.1onbld b/usr/src/tools/scripts/nightly.1onbld
index b852332957..51ce222862 100644
--- a/usr/src/tools/scripts/nightly.1onbld
+++ b/usr/src/tools/scripts/nightly.1onbld
@@ -18,8 +18,9 @@
 .\" "
 .\" "Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 .\" "Copyright 2012 Joshua M. Clulow <josh@sysmgr.org>
+.\" "Copyright 2019 Peter Tribble.
 .\" "
-.TH NIGHTLY 1ONBLD "Jul 2, 2017"
+.TH NIGHTLY 1ONBLD "Jun 9, 2019"
 .SH NAME
 .I nightly
 \- build an OS-Net consolidation overnight
@@ -69,9 +70,6 @@ copy updated proto area to parent
 list shared lib interface and compare with previous list
 .TP
 \(bu
-perform a "make lint" of the kernel and report errors
-.TP
-\(bu
 perform a "make check" to report hdrchk/cstyle errors
 .TP
 \(bu
@@ -136,8 +134,7 @@ Do not run pmodes (safe file permission checker)
 .B \-i
 Do an incremental build, suppressing the "make clobber" that by
 default removes all existing binaries and derived files.  From the
-command line, -i also suppresses the lint pass and the cstyle/hdrchk
-pass
+command line, -i also suppresses the cstyle/hdrchk pass
 .TP
 .B \-n
 Suppress the bringover so that the build will start immediately with
@@ -190,14 +187,11 @@ Check for cstyle/hdrchk errors
 .B \-f
 Check for unreferenced files.  Since the full workspace must be built
 in order to accurately identify unreferenced files, -f is ignored for
-incremental (-i) builds, or builds that do not include -l, and -p.
+incremental (-i) builds, or builds that do not include -p.
 .TP
 .B \-r
 Check the ELF runtime attributes of all dynamic objects
 .TP
-.B \-l
-Do "make lint" in $LINTDIRS (default: $SRC n)
-.TP
 .B \-N
 Do not run protocmp or checkpaths (note: this option is not
 recommended, especially in conjunction with the \-p option)
@@ -392,11 +386,6 @@ Disables usage reporting by listed Devpro tools. Otherwise it sends mail
 to some Devpro machine every time the tools are used.
 .RE
 .LP
-.B LINTDIRS
-.RS 5
-Directories to lint with the \-l option.
-.RE
-.LP
 .B BUILD_TOOLS
 .RS 5
 BUILD_TOOLS is the root of all tools including the compilers; e.g.,
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index 2ca5caff8c..7d22694671 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -28,6 +28,7 @@
 # Copyright (c) 2017 by Delphix. All rights reserved.
 # Copyright 2019 Joyent, Inc.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2019 Peter Trible.
 #
 # Based on the nightly script from the integration folks,
 # Mostly modified and owned by mike_s.
@@ -37,18 +38,9 @@
 # The default is the old behavior of CLONE_WS
 #
 # -i on the command line, means fast options, so when it's on the
-# command line (only), lint and check builds are skipped no matter what
+# command line (only), check builds are skipped no matter what
 # the setting of their individual flags are in NIGHTLY_OPTIONS.
 #
-# LINTDIRS can be set in the env file, format is a list of:
-#
-#	/dirname-to-run-lint-on flag
-#
-#	Where flag is:	y - enable lint noise diff output
-#			n - disable lint noise diff output
-#
-#	For example: LINTDIRS="$SRC/uts n $SRC/stand y $SRC/psm y"
-#
 # OPTHOME  may be set in the environment to override /opt
 #
 
@@ -361,99 +353,6 @@ function build {
 	ROOT=$ORIGROOT
 }
 
-# Usage: dolint /dir y|n
-# Arg. 2 is a flag to turn on/off the lint diff output
-function dolint {
-	if [ ! -d "$1" ]; then
-		echo "dolint error: $1 is not a directory"
-		exit 1
-	fi
-
-	if [ "$2" != "y" -a "$2" != "n" ]; then
-		echo "dolint internal error: $2 should be 'y' or 'n'"
-		exit 1
-	fi
-
-	lintdir=$1
-	dodiff=$2
-	base=`basename $lintdir`
-	LINTOUT=$lintdir/lint-${MACH}.out
-	LINTNOISE=$lintdir/lint-noise-${MACH}
-	export ENVLDLIBS1=`myldlibs $ROOT`
-	export ENVCPPFLAGS1=`myheaders $ROOT`
-
-	set_debug_build_flags
-
-	#
-	#	'$MAKE lint' in $lintdir
-	#
-	echo "\n==== Begin '$MAKE lint' of $base at `date` ====\n" >> $LOGFILE
-
-	# remove old lint.out
-	rm -f $lintdir/lint.out $lintdir/lint-noise.out
-	if [ -f $lintdir/lint-noise.ref ]; then
-		mv $lintdir/lint-noise.ref ${LINTNOISE}.ref
-	fi
-
-	rm -f $LINTOUT
-	cd $lintdir
-	#
-	# Remove all .ln files to ensure a full reference file
-	#
-	rm -f Nothing_to_remove \
-	    `find . \( -name SCCS -o -name .hg -o -name .svn -o -name .git \) \
-		-prune -o -type f -name '*.ln' -print `
-
-	/bin/time $MAKE -ek lint 2>&1 | \
-	    tee -a $LINTOUT >> $LOGFILE
-
-	echo "\n==== '$MAKE lint' of $base ERRORS ====\n" >> $mail_msg_file
-
-	grep "$MAKE:" $LINTOUT |
-		egrep -v "Ignoring unknown host" | \
-		tee $TMPDIR/lint_errs >> $mail_msg_file
-	if [[ -s $TMPDIR/lint_errs ]]; then
-		build_extras_ok=n
-	fi
-
-	echo "\n==== Ended '$MAKE lint' of $base at `date` ====\n" >> $LOGFILE
-
-	echo "\n==== Elapsed time of '$MAKE lint' of $base ====\n" \
-		>>$mail_msg_file
-	tail -3  $LINTOUT >>$mail_msg_file
-
-	rm -f ${LINTNOISE}.ref
-	if [ -f ${LINTNOISE}.out ]; then
-		mv ${LINTNOISE}.out ${LINTNOISE}.ref
-	fi
-        grep : $LINTOUT | \
-		egrep -v '^(real|user|sys)' |
-		egrep -v '(library construction)' | \
-		egrep -v ': global crosschecks' | \
-		egrep -v 'Ignoring unknown host' | \
-		egrep -v '\.c:$' | \
-		sort | uniq > ${LINTNOISE}.out
-	if [ ! -f ${LINTNOISE}.ref ]; then
-		cp ${LINTNOISE}.out ${LINTNOISE}.ref
-	fi
-
-	if [ "$dodiff" != "n" ]; then
-		echo "\n==== lint warnings $base ====\n" \
-			>>$mail_msg_file
-		# should be none, though there are a few that were filtered out
-		# above
-		egrep -i '(warning|lint):' ${LINTNOISE}.out \
-			| sort | uniq | tee $TMPDIR/lint_warns >> $mail_msg_file
-		if [[ -s $TMPDIR/lint_warns ]]; then
-			build_extras_ok=n
-		fi
-		echo "\n==== lint noise differences $base ====\n" \
-			>> $mail_msg_file
-		diff ${LINTNOISE}.ref ${LINTNOISE}.out \
-			>> $mail_msg_file
-	fi
-}
-
 #
 # Build and install the onbld tools.
 #
@@ -567,7 +466,7 @@ fi
 USAGE='Usage: nightly [-in] [+t] [-V VERS ] <env_file>
 
 Where:
-	-i	Fast incremental options (no clobber, lint, check)
+	-i	Fast incremental options (no clobber, check)
 	-n      Do not do a bringover
 	+t	Use the build tools in $ONBLD_TOOLS/bin
 	-V VERS set the build version string to VERS
@@ -593,7 +492,6 @@ NIGHTLY_OPTIONS variable in the <env_file> as follows:
 	-V VERS set the build version string to VERS
 	-f	find unreferenced files
 	-i	do an incremental build (no "make clobber")
-	-l	do "make lint" in $LINTDIRS (default: $SRC y)
 	-m	send mail to $MAILTO at end of build
 	-n      do not do a bringover
 	-p	create packages
@@ -617,7 +515,6 @@ D_FLAG=n
 F_FLAG=n
 f_FLAG=n
 i_FLAG=n; i_CMD_LINE_FLAG=n
-l_FLAG=n
 M_FLAG=n
 m_FLAG=n
 N_FLAG=n
@@ -801,7 +698,7 @@ check_closed_bins
 #
 NIGHTLY_OPTIONS=-${NIGHTLY_OPTIONS#-}
 OPTIND=1
-while getopts +ABCDdFfGIilMmNnpRrtUuwW FLAG $NIGHTLY_OPTIONS
+while getopts +ABCDdFfGIiMmNnpRrtUuwW FLAG $NIGHTLY_OPTIONS
 do
 	case $FLAG in
 	  A )	A_FLAG=y
@@ -824,8 +721,6 @@ do
 		;;
 	  i )	i_FLAG=y
 		;;
-	  l )	l_FLAG=y
-		;;
 	  M )	M_FLAG=y
 		;;
 	  m )	m_FLAG=y
@@ -1285,27 +1180,14 @@ EOF
 	echo "" | tee -a $mail_msg_file >> $LOGFILE
 fi
 
-if [ "$D_FLAG" = "n" -a "$l_FLAG" = "y" ]; then
-	#
-	# In the past we just complained but went ahead with the lint
-	# pass, even though the proto area was built non-DEBUG.  It's
-	# unlikely that non-DEBUG headers will make a difference, but
-	# rather than assuming it's a safe combination, force the user
-	# to specify a DEBUG build.
-	#
-	echo "WARNING: DEBUG build not requested; disabling lint.\n" \
-	    | tee -a $mail_msg_file >> $LOGFILE
-	l_FLAG=n
-fi
-
 if [ "$f_FLAG" = "y" ]; then
 	if [ "$i_FLAG" = "y" ]; then
 		echo "WARNING: the -f flag cannot be used during incremental" \
 		    "builds; ignoring -f\n" | tee -a $mail_msg_file >> $LOGFILE
 		f_FLAG=n
 	fi
-	if [ "${l_FLAG}${p_FLAG}" != "yy" ]; then
-		echo "WARNING: the -f flag requires -l, and -p;" \
+	if [ "${p_FLAG}" != "y" ]; then
+		echo "WARNING: the -f flag requires -p;" \
 		    "ignoring -f\n" | tee -a $mail_msg_file >> $LOGFILE
 		f_FLAG=n
 	fi
@@ -1916,7 +1798,7 @@ if [[ ($build_ok = y) && (($A_FLAG = y) || ($r_FLAG = y)) ]]; then
 		if [[ "$ELF_DATA_BASELINE_DIR" != '' ]]; then
 			base_ifile="$ELF_DATA_BASELINE_DIR/interface"
 
-		       	echo "\n==== Compare versioning and ABI information" \
+			echo "\n==== Compare versioning and ABI information" \
 			    "to baseline ====\n"  | \
 			    tee -a $LOGFILE >> $mail_msg_file
 			echo "Baseline:	 $base_ifile\n" >> $LOGFILE
@@ -2012,21 +1894,6 @@ if [[ ($build_ok = y) && (($A_FLAG = y) || ($r_FLAG = y)) ]]; then
 	fi
 fi
 
-# DEBUG lint of kernel begins
-
-if [ "$i_CMD_LINE_FLAG" = "n" -a "$l_FLAG" = "y" ]; then
-	if [ "$LINTDIRS" = "" ]; then
-		# LINTDIRS="$SRC/uts y $SRC/stand y $SRC/psm y"
-		LINTDIRS="$SRC y"
-	fi
-	set $LINTDIRS
-	while [ $# -gt 0 ]; do
-		dolint $1 $2; shift; shift
-	done
-else
-	echo "\n==== No '$MAKE lint' ====\n" >> $LOGFILE
-fi
-
 # "make check" begins
 
 if [ "$i_CMD_LINE_FLAG" = "n" -a "$C_FLAG" = "y" ]; then