CVS commit: src/usr.bin/calendar

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Fri Jun  3 02:06:40 UTC 2016

Modified Files:
src/usr.bin/calendar: calendar.1 calendar.c

Log Message:
Commit patch sent to tech-userlevel with universal approval to add a
version option for calendar(1):

% calendar -v
calendar-20160601
%

For reference, see:

http://mail-index.netbsd.org/tech-userlevel/2016/06/02/msg010081.html


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/calendar/calendar.1
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/calendar/calendar.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/calendar/calendar.1
diff -u src/usr.bin/calendar/calendar.1:1.25 src/usr.bin/calendar/calendar.1:1.26
--- src/usr.bin/calendar/calendar.1:1.25	Tue Jun  8 03:08:47 2010
+++ src/usr.bin/calendar/calendar.1	Fri Jun  3 02:06:40 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: calendar.1,v 1.25 2010/06/08 03:08:47 riz Exp $
+.\"	$NetBSD: calendar.1,v 1.26 2016/06/03 02:06:40 agc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)calendar.1	8.1 (Berkeley) 6/29/93
 .\"
-.Dd August 27, 2009
+.Dd June 1, 2016
 .Dt CALENDAR 1
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nd reminder service
 .Sh SYNOPSIS
 .Nm
-.Op Fl ax
+.Op Fl avx
 .Op Fl d Ar MMDD[[YY]YY]
 .Op Fl f Ar file
 .Op Fl l Ar days
@@ -95,6 +95,11 @@ number if and only if the day specified 
 The default value is two, which causes
 .Nm
 to print entries through the weekend on Fridays.
+.It Fl v
+Causes
+.Nm
+to print version information for itself,
+and then exit.
 .It Fl x
 Causes
 .Nm

Index: src/usr.bin/calendar/calendar.c
diff -u src/usr.bin/calendar/calendar.c:1.52 src/usr.bin/calendar/calendar.c:1.53
--- src/usr.bin/calendar/calendar.c:1.52	Wed Jul  1 06:48:25 2015
+++ src/usr.bin/calendar/calendar.c	Fri Jun  3 02:06:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: calendar.c,v 1.52 2015/07/01 06:48:25 dholland Exp $	*/
+/*	$NetBSD: calendar.c,v 1.53 2016/06/03 02:06:40 agc Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
 #if 0
 static char sccsid[] = "@(#)calendar.c	8.4 (Berkeley) 1/7/95";
 #endif
-__RCSID("$NetBSD: calendar.c,v 1.52 2015/07/01 06:48:25 dholland Exp $");
+__RCSID("$NetBSD: calendar.c,v 1.53 2016/06/03 02:06:40 agc Exp $");
 #endif /* not lint */
 
 #include 
@@ -65,6 +65,8 @@ __RCSID("$NetBSD: calendar.c,v 1.52 2015
 
 #include "pathnames.h"
 
+#define CALENDAR_VERSION	"calendar-20160601"
+
 	/* flags used by calendar file parser */
 #define	F_ISMONTH	0x01
 #define	F_ISDAY		0x02
@@ -133,7 +135,7 @@ main(int argc, char **argv)
 
 	(void)setprogname(argv[0]);	/* for portability */
 
-	while ((ch = getopt(argc, argv, "-ad:f:l:w:x")) != -1) {
+	while ((ch = getopt(argc, argv, "-ad:f:l:vw:x")) != -1) {
 		switch (ch) {
 		case '-':		/* backward contemptible */
 		case 'a':
@@ -152,6 +154,9 @@ main(int argc, char **argv)
 		case 'l':
 			atodays(ch, optarg, );
 			break;
+		case 'v':
+			printf("%s\n", CALENDAR_VERSION);
+			return 0;
 		case 'w':
 			atodays(ch, optarg, );
 			break;

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Fri Jun  3 01:21:59 UTC 2016

Modified Files:
src/usr.bin/make: main.c make.h meta.c nonints.h var.c

Log Message:
Add cached_realpath()

realpath(3) is expensive, and meta mode at least uses it extensively.
We use cached_realpath() to save the result of successful calls to
realpath(3) in a private variable context.

This improves the worst case performance (eg examining libc with
nothing to do) by a factor of 4.

Reviewed by: christos


To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/usr.bin/make/main.c
cvs rdiff -u -r1.98 -r1.99 src/usr.bin/make/make.h
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/make/meta.c
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.244 src/usr.bin/make/main.c:1.245
--- src/usr.bin/make/main.c:1.244	Tue Apr  5 04:25:43 2016
+++ src/usr.bin/make/main.c	Fri Jun  3 01:21:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.245 2016/06/03 01:21:59 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.245 2016/06/03 01:21:59 sjg Exp $";
 #else
 #include 
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.245 2016/06/03 01:21:59 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -979,7 +979,7 @@ main(int argc, char **argv)
 	/*
 	 * A relative path, canonicalize it.
 	 */
-	p1 = realpath(argv[0], mdpath);
+	p1 = cached_realpath(argv[0], mdpath);
 	if (!p1 || *p1 != '/' || stat(p1, ) < 0) {
 		p1 = argv[0];		/* realpath failed */
 	}
@@ -1850,6 +1850,40 @@ usage(void)
 }
 
 
+/*
+ * realpath(3) can get expensive, cache results...
+ */
+char *
+cached_realpath(const char *pathname, char *resolved)
+{
+static GNode *cache;
+char *rp, *cp;
+
+if (!pathname || !pathname[0])
+	return NULL;
+
+if (!cache) {
+	cache = Targ_NewGN("Realpath");
+#ifndef DEBUG_REALPATH_CACHE
+	cache->flags = INTERNAL;
+#endif
+}
+
+rp = Var_Value(pathname, cache, );
+if (rp) {
+	/* a hit */
+	if (resolved)
+	strlcpy(resolved, rp, MAXPATHLEN);
+	else
+	resolved = bmake_strdup(rp);
+} else {
+	if ((rp = realpath(pathname, resolved))) {
+	Var_Set(pathname, rp, cache, 0);
+	}
+}
+return rp ? resolved : NULL;
+}
+
 int
 PrintAddr(void *a, void *b)
 {

Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.98 src/usr.bin/make/make.h:1.99
--- src/usr.bin/make/make.h:1.98	Thu Feb 18 18:29:14 2016
+++ src/usr.bin/make/make.h	Fri Jun  3 01:21:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: make.h,v 1.98 2016/02/18 18:29:14 christos Exp $	*/
+/*	$NetBSD: make.h,v 1.99 2016/06/03 01:21:59 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -183,6 +183,7 @@ typedef struct GNode {
 #define DONE_ALLSRC	0x40	/* We do it once only */
 #define CYCLE		0x1000  /* Used by MakePrintStatus */
 #define DONECYCLE	0x2000  /* Used by MakePrintStatus */
+#define INTERNAL	0x4000	/* Internal use only */
 enum enum_made {
 	UNMADE, DEFERRED, REQUESTED, BEINGMADE,
 	MADE, UPTODATE, ERROR, ABORTED

Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.58 src/usr.bin/make/meta.c:1.59
--- src/usr.bin/make/meta.c:1.58	Fri Jun  3 01:16:27 2016
+++ src/usr.bin/make/meta.c	Fri Jun  3 01:21:59 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: meta.c,v 1.58 2016/06/03 01:16:27 sjg Exp $ */
+/*  $NetBSD: meta.c,v 1.59 2016/06/03 01:21:59 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -251,7 +251,7 @@ meta_name(struct GNode *gn, char *mname,
  * basename as given to us.
  */
 if ((cp = strrchr(tname, '/'))) {
-	if (realpath(tname, buf)) {
+	if (cached_realpath(tname, buf)) {
 	if ((rp = strrchr(buf, '/'))) {
 		rp++;
 		cp++;
@@ -433,7 +433,7 @@ meta_needed(GNode *gn, const char *dname
 }
 
 /* make sure these are canonical */
-if (realpath(dname, objdir))
+if (cached_realpath(dname, objdir))
 	dname = objdir;
 
 /* If we aren't in the object directory, don't create a meta file. */
@@ -1256,7 +1256,7 @@ meta_oodate(GNode *gn, Boolean oodate)
 		 * they are _expected_ to change.
 		 */
 		if (*p == '/') {
-			realpath(p, fname1); /* clean it up */
+			cached_realpath(p, fname1); /* clean it up */
 			if (Lst_ForEach(metaIgnorePaths, prefix_match, fname1)) {
 #ifdef DEBUG_META_MODE
 			if (DEBUG(META))
@@ -1341,7 +1341,7 @@ meta_oodate(GNode *gn, Boolean oodate)
 	

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Fri Jun  3 01:16:27 UTC 2016

Modified Files:
src/usr.bin/make: make.1 meta.c

Log Message:
Refactor the logic for deciding when a .meta file is needed.

Both meta_create() and meta_oodate() now share meta_needed()
to indicate if a .meta file is needed.

This allows for deciding that missing .meta file is cause of out-of-date.
The new knob 'missing-meta' controlls this, and is off by default
since the side effect files of generators like yacc will typically need
.NOMETA to avoid problems.

This however makes it much easier for folk to switch back and forth
with meta mode (eg. FreeBSD's normal build can leverage meta mode for
improved reliablility without need to clean).

Also if .MAKE.MODE does not contain 'nofilemon', the knob
'missing-filemon' allows control as to whether missing filemon data
should cause the target to be out-of-date.
Again off by default.


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/usr.bin/make/make.1
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/meta.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.257 src/usr.bin/make/make.1:1.258
--- src/usr.bin/make/make.1:1.257	Tue May 10 23:45:45 2016
+++ src/usr.bin/make/make.1	Fri Jun  3 01:16:27 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.257 2016/05/10 23:45:45 sjg Exp $
+.\"	$NetBSD: make.1,v 1.258 2016/06/03 01:16:27 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd May 10, 2016
+.Dd June 2, 2016
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -846,7 +846,7 @@ Can affect the mode that
 .Nm
 runs in.
 It can contain a number of keywords:
-.Bl -hang -width ignore-cmd
+.Bl -hang -width mising-filemon=bf.
 .It Pa compat
 Like
 .Fl B ,
@@ -870,6 +870,17 @@ will not create .meta files in
 This can be overridden by setting
 .Va bf
 to a value which represents True.
+.It Pa missing-meta= Ar bf
+If
+.Va bf
+is True, then a missing .meta file makes the target out-of-date.
+.It Pa missing-filemon= Ar bf
+If
+.Va bf
+is True, then missing filemon data makes the target out-of-date.
+.It Pa nofilemon
+Do not use
+.Xr filemon 4
 .It Pa env
 For debugging, it can be useful to include the environment
 in the .meta file.

Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.57 src/usr.bin/make/meta.c:1.58
--- src/usr.bin/make/meta.c:1.57	Thu May 12 20:28:34 2016
+++ src/usr.bin/make/meta.c	Fri Jun  3 01:16:27 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: meta.c,v 1.57 2016/05/12 20:28:34 sjg Exp $ */
+/*  $NetBSD: meta.c,v 1.58 2016/06/03 01:16:27 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -69,6 +69,8 @@ static char *metaIgnorePathsStr;	/* stri
 Boolean useMeta = FALSE;
 static Boolean useFilemon = FALSE;
 static Boolean writeMeta = FALSE;
+static Boolean metaMissing = FALSE;	/* oodate if missing */
+static Boolean filemonMissing = FALSE;	/* oodate if missing */
 static Boolean metaEnv = FALSE;		/* don't save env unless asked */
 static Boolean metaVerbose = FALSE;
 static Boolean metaIgnoreCMDs = FALSE;	/* ignore CMDs in .meta files */
@@ -233,24 +235,13 @@ eat_dots(char *buf, size_t bufsz, int do
 static char *
 meta_name(struct GNode *gn, char *mname, size_t mnamelen,
 	  const char *dname,
-	  const char *tname)
+	  const char *tname,
+	  const char *cwd)
 {
 char buf[MAXPATHLEN];
-char cwd[MAXPATHLEN];
 char *rp;
 char *cp;
 char *tp;
-char *p[4];/* >= number of possible uses */
-int i;
-
-i = 0;
-if (!dname)
-	dname = Var_Value(".OBJDIR", gn, [i++]);
-if (!tname)
-	tname = Var_Value(TARGET, gn, [i++]);
-
-if (realpath(dname, cwd))
-	dname = cwd;
 
 /*
  * Weed out relative paths from the target file name.
@@ -305,9 +296,6 @@ meta_name(struct GNode *gn, char *mname,
 	}
 }
 free(tp);
-for (i--; i >= 0; i--) {
-	free(p[i]);
-}
 return (mname);
 }
 
@@ -387,29 +375,26 @@ printCMD(void *cmdp, void *mfpp)
  */
 #define SKIP_META_TYPE(_type) do { \
 if ((gn->type & __CONCAT(OP_, _type))) {	\
-	if (DEBUG(META)) { \
+	if (verbose) { \
 	fprintf(debug_file, "Skipping meta for %s: .%s\n", \
 		gn->name, __STRING(_type));		   \
 	} \
-	return (NULL); \
+	return FALSE; \
 } \
 } while (0)
 
-static FILE *
-meta_create(BuildMon *pbm, GNode *gn)
+
+/*
+ * Do we need/want a .meta file ?
+ */
+static Boolean
+meta_needed(GNode *gn, const char *dname, const char *tname,
+	 char *objdir, int verbose)
 {
-meta_file_t mf;
-char buf[MAXPATHLEN];
-char objdir[MAXPATHLEN];
-char **ptr;
-const char *dname;
-const char *tname;
-char *fname;
-const char *cp;
-char *p[4];/* >= possible uses */
-int i;
 struct stat fs;
 
+if (verbose)
+	verbose = 

CVS commit: src

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Fri Jun  3 00:00:01 UTC 2016

Modified Files:
src: build.sh

Log Message:
When setting TOP the idea is to run the [/usr]/bin/pwd binary, and
exclude any skell builtin.   There are two ways to guarantee exec'ing
a binary, using a path, or using exec.   To use a path we would need to
find it first (which certainly could be done.)  Using exec here is easier.


To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/build.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.309 src/build.sh:1.310
--- src/build.sh:1.309	Fri Apr 29 16:08:09 2016
+++ src/build.sh	Fri Jun  3 00:00:01 2016
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.309 2016/04/29 16:08:09 christos Exp $
+#	$NetBSD: build.sh,v 1.310 2016/06/03 00:00:01 kre Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -506,7 +506,7 @@ initdefaults()
 	# XXX Except that doesn't work on Solaris. Or many Linuces.
 	#
 	unset PWD
-	TOP=$(/bin/pwd -P 2>/dev/null || /bin/pwd 2>/dev/null)
+	TOP=$( (exec pwd -P 2>/dev/null) || (exec pwd 2>/dev/null) )
 
 	# The user can set HOST_SH in the environment, or we try to
 	# guess an appropriate value.  Then we set several other
@@ -1876,7 +1876,7 @@ createmakewrapper()
 	eval cat <

CVS commit: src/external/mit/xorg/lib/libX11

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun  2 22:41:27 UTC 2016

Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.ximcp Makefile.xlcDef
Makefile.xlcUTF8Load Makefile.xlibi18n Makefile.xomGeneric
src/external/mit/xorg/lib/libX11/static: Makefile
src/external/mit/xorg/lib/libX11/ximcp: Makefile
src/external/mit/xorg/lib/libX11/xlcDef: Makefile
src/external/mit/xorg/lib/libX11/xlcUTF8Load: Makefile
src/external/mit/xorg/lib/libX11/xlibi18n: Makefile
src/external/mit/xorg/lib/libX11/xomGeneric: Makefile

Log Message:
fix PR 48928:  build the static libX11 properly.  pull in the
ximcp, xlcDef, xlcUTF8Load, xlibi18n, and xomGeneric modules
directly.

also, don't include bsd.lib.mk in the fragment parts for these
modules, but in the module build itself.  otherwise, bsd.lib.mk
is included before SRCS is complete and the build strangely
seems to miss parts listed.

tested using the example in the PR.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/Makefile.xlcDef \
src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load \
src/external/mit/xorg/lib/libX11/Makefile.xlibi18n \
src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/static/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/ximcp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlcDef/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlibi18n/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xomGeneric/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libX11/Makefile.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.3
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2	Mon Oct  6 16:24:33 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp	Thu Jun  2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
+# $NetBSD: Makefile.ximcp,v 1.3 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:	${X11SRCDIR.X11}/modules/im/ximcp
 SRCS.ximcp= \
@@ -43,5 +43,3 @@ CPPFLAGS.imDefLkup.c=	-Wno-error
 CPPFLAGS.imRm.c=	-Wno-error
 CPPFLAGS.imTrans.c=	-Wno-error
 CPPFLAGS.imLcLkup.c=	-Wno-stack-protector
-
-.include 

Index: src/external/mit/xorg/lib/libX11/Makefile.xlcDef
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1	Sun Sep  7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcDef	Thu Jun  2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcDef,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcDef,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:		${X11SRCDIR.X11}/modules/lc/def
 SRCS.xlcDef=	lcDefConv.c
@@ -9,5 +9,3 @@ CPPFLAGS+= \
 
 CPPFLAGS+= \
 	-DHASXDMAUTH
-
-.include 
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1	Sun Sep  7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load	Thu Jun  2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcUTF8Load,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcUTF8Load,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:	${X11SRCDIR.X11}/modules/lc/Utf8
 
@@ -11,5 +11,3 @@ CPPFLAGS+= \
 
 CPPFLAGS+= \
 	-DHASXDMAUTH
-
-.include 
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1	Sun Sep  7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n	Thu Jun  2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
 
 .PATH:		${X11SRCDIR.X11}/modules/lc/gen
 SRCS.xlibi18n=	lcGenConv.c
@@ -10,5 +10,3 @@ CPPFLAGS+= \
 CPPFLAGS+= \
 	${XLOCALE.DEFINES} \
 	-DHASXDMAUTH
-
-.include 
Index: src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
diff -u src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1	Sun Sep  7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xomGeneric	Thu Jun  2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xomGeneric,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: 

CVS commit: src/lib/libedit

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  2 21:40:51 UTC 2016

Modified Files:
src/lib/libedit: readline.c

Log Message:
Fix previous to better match readline behavior (Ingo Schwarze)


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/lib/libedit/readline.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.135 src/lib/libedit/readline.c:1.136
--- src/lib/libedit/readline.c:1.135	Thu Jun  2 11:11:18 2016
+++ src/lib/libedit/readline.c	Thu Jun  2 17:40:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.c,v 1.135 2016/06/02 15:11:18 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.136 2016/06/02 21:40:51 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.135 2016/06/02 15:11:18 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.136 2016/06/02 21:40:51 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -1185,6 +1185,8 @@ stifle_history(int max)
 
 	if (history(h, , H_SETSIZE, max) == 0) {
 		max_input_history = max;
+		if (history_length > max)
+			history_base = history_length - max;
 		while (history_length > max) {
 			he = remove_history(0);
 			el_free(he->data);

CVS commit: src/sys/arch/sparc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Jun  2 21:19:24 UTC 2016

Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c

Log Message:
use DEFATTR if we're not the console and can't init defattr.
should appease clang
TODO: we should really init the glyphcache whith the first screen


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/sparc/dev/cgfourteen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.80 src/sys/arch/sparc/dev/cgfourteen.c:1.81
--- src/sys/arch/sparc/dev/cgfourteen.c:1.80	Sat Apr 30 05:23:03 2016
+++ src/sys/arch/sparc/dev/cgfourteen.c	Thu Jun  2 21:19:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfourteen.c,v 1.80 2016/04/30 05:23:03 macallan Exp $ */
+/*	$NetBSD: cgfourteen.c,v 1.81 2016/06/02 21:19:24 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -775,7 +775,7 @@ cg14_setup_wsdisplay(struct cgfourteen_s
 			sc->sc_fb.fb_type.fb_width,
 			ri->ri_font->fontwidth,
 			ri->ri_font->fontheight,
-			defattr);
+			DEFATTR);
 	}
 
 	cg14_init_cmap(sc);

CVS commit: src/sys/dev/wscons

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Jun  2 21:17:14 UTC 2016

Modified Files:
src/sys/dev/wscons: wsdisplay_vconsvar.h

Log Message:
provide a default attribute


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/wscons/wsdisplay_vconsvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/wscons/wsdisplay_vconsvar.h
diff -u src/sys/dev/wscons/wsdisplay_vconsvar.h:1.23 src/sys/dev/wscons/wsdisplay_vconsvar.h:1.24
--- src/sys/dev/wscons/wsdisplay_vconsvar.h:1.23	Tue Mar 18 18:20:42 2014
+++ src/sys/dev/wscons/wsdisplay_vconsvar.h	Thu Jun  2 21:17:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsdisplay_vconsvar.h,v 1.23 2014/03/18 18:20:42 riastradh Exp $ */
+/*	$NetBSD: wsdisplay_vconsvar.h,v 1.24 2016/06/02 21:17:14 macallan Exp $ */
 
 /*-
  * Copyright (c) 2005, 2006 Michael Lorenz
@@ -90,6 +90,8 @@ struct vcons_screen {
 #define SCREEN_DISABLE_DRAWING(scr) ((scr)->scr_flags |= VCONS_DONT_DRAW)
 #define SCREEN_ENABLE_DRAWING(scr) ((scr)->scr_flags &= ~VCONS_DONT_DRAW)
 
+#define DEFATTR ((WS_DEFAULT_FG << 24) || (WS_DEFAULT_BG << 16))
+
 struct vcons_data {
 	/* usually the drivers softc */
 	void *cookie;

CVS commit: src/distrib/sets/lists/base

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  2 19:55:52 UTC 2016

Modified Files:
src/distrib/sets/lists/base: shl.mi

Log Message:
fix sets.


To generate a diff of this commit:
cvs rdiff -u -r1.774 -r1.775 src/distrib/sets/lists/base/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.774 src/distrib/sets/lists/base/shl.mi:1.775
--- src/distrib/sets/lists/base/shl.mi:1.774	Wed Jun  1 19:59:21 2016
+++ src/distrib/sets/lists/base/shl.mi	Thu Jun  2 15:55:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.774 2016/06/01 23:59:21 joerg Exp $
+# $NetBSD: shl.mi,v 1.775 2016/06/02 19:55:52 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -175,8 +175,8 @@
 ./usr/lib/libasan.sobase-sys-shlib		compatfile,gcc=48
 ./usr/lib/libasan.sobase-sys-shlib		compatfile,gcc=53
 ./usr/lib/libasan.so.0base-sys-shlib		compatfile,gcc=48
-./usr/lib/libasan.so.0base-sys-shlib		compatfile,gcc=48
-./usr/lib/libasan.so.1.0			base-sys-shlib		compatfile,gcc=53
+./usr/lib/libasan.so.0.0			base-sys-shlib		compatfile,gcc=48
+./usr/lib/libasan.so.1base-sys-shlib		compatfile,gcc=53
 ./usr/lib/libasan.so.1.0			base-sys-shlib		compatfile,gcc=53
 ./usr/lib/libasn1.sobase-krb5-shlib		compatfile,kerberos
 ./usr/lib/libasn1.so.9base-krb5-shlib		compatfile,kerberos

CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  2 19:54:38 UTC 2016

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_internal_defs.h sanitizer_platform_limits_posix.h

Log Message:
Fix ILP32 build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \

src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h
cvs rdiff -u -r1.2 -r1.3 \

src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h:1.4 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h:1.5
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h:1.4	Tue May 31 16:47:25 2016
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h	Thu Jun  2 15:54:38 2016
@@ -80,7 +80,8 @@ typedef int fd_t;
 // _FILE_OFFSET_BITS. This definition of OFF_T matches the ABI of system calls
 // like pread and mmap, as opposed to pread64 and mmap64.
 // Mac and Linux/x86-64 are special.
-#if SANITIZER_MAC || (SANITIZER_LINUX && defined(__x86_64__))
+#if SANITIZER_MAC || (SANITIZER_LINUX && defined(__x86_64__)) || SANITIZER_NETBSD
+// XXX: It is signed!
 typedef u64 OFF_T;
 #else
 typedef uptr OFF_T;

Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h:1.2 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h:1.3
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h:1.2	Tue May 31 16:47:25 2016
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h	Thu Jun  2 15:54:38 2016
@@ -398,7 +398,7 @@ namespace __sanitizer {
 char **gr_mem;
   };
 
-#if defined(__x86_64__) && !defined(_LP64)
+#if (defined(__x86_64__) && !defined(_LP64)) || SANITIZER_NETBSD
   typedef long long __sanitizer_time_t;
 #else
   typedef long __sanitizer_time_t;

CVS commit: src/lib/libedit

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  2 15:11:18 UTC 2016

Modified Files:
src/lib/libedit: readline.c

Log Message:
>From Ingo Schwarze:

In libedit, the only way how H_ENTER can fail is memory exhaustion,
too, and of course it is handled gracefully, returning -1 from
history().  So of course, we will continue to handle it gracefully
in add_history() as well, but we are free to decide what to do with
the library state in this case because GNU just dies...

I think the most reasonable course of action is to simply not change
the library state in any way when add_history() fails due to memory
exhaustion, but just return.

If H_ENTER does not fail, we know that the history now contains at
least one entry, so there is no need any longer to check the H_GETSIZE
return value.  And we can of course always set current_history_valid.

While testing these changes, i noticed three problems so closely
related that i'd like to fix them in the same diff.

 1. libedit has the wrong prototype for add_history().
GNU readline-6.3 defines it as void add_history(const char *).
Of course, that is very stupid - no way to report problems to
the caller!  But the whole point of a compatibility mode is
being compatible, so we should ultimately change this.
Of course, changing the prototype of a public symbol requires
a libedit major bump.  I don't want to do that casually.
Rather, i will take a note and change the prototype the next
time we need a libedit major bump for more important reasons.
For now, let's just always return 0.

 2. While *implicitely* pushing an old entry off the history
increments history_base in GNU readline, testing reveals that
*explicitly* deleting one does not.  Again, this is not
documented, but it applies to both remove_history() and
stifle_history().  So delete history_base manipulation
from stifle_history(), which also allows to simplify the
code and delete two automatic variables.

 3. GNU readline add_history(NULL) crashes with a segfault.
There is nothing wrong with having a public interface
behave that way.  Many standard interfaces do, including
strlen(3).  Such crashes can even be useful to catch
buggy application programs.
In libedit/readline.c rev. 1.104, Christos made add_history()
silently ignore this coding error, according to the commit
message to hide a bug in nslookup(1).  That change was never
merged to OpenBSD.  I strongly disagree with this change.
If nslookup(1) is still broken, that program needs to be
fixed instead.  In any case, delete the bogus check; hiding
bugs is dangerous.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/lib/libedit/readline.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.134 src/lib/libedit/readline.c:1.135
--- src/lib/libedit/readline.c:1.134	Tue May 31 15:25:17 2016
+++ src/lib/libedit/readline.c	Thu Jun  2 11:11:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.c,v 1.134 2016/05/31 19:25:17 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.135 2016/06/02 15:11:18 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.134 2016/05/31 19:25:17 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.135 2016/06/02 15:11:18 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -1179,17 +1179,13 @@ stifle_history(int max)
 {
 	HistEvent ev;
 	HIST_ENTRY *he;
-	int i, len;
 
 	if (h == NULL || e == NULL)
 		rl_initialize();
 
-	len = history_length;
 	if (history(h, , H_SETSIZE, max) == 0) {
 		max_input_history = max;
-		if (max < len)
-			history_base += len - max;
-		for (i = 0; i < len - max; i++) {
+		while (history_length > max) {
 			he = remove_history(0);
 			el_free(he->data);
 			el_free((void *)(unsigned long)he->line);
@@ -1452,18 +1448,19 @@ add_history(const char *line)
 {
 	HistEvent ev;
 
-	if (line == NULL)
-		return 0;
-
 	if (h == NULL || e == NULL)
 		rl_initialize();
 
-	(void)history(h, , H_ENTER, line);
-	if (history(h, , H_GETSIZE) == 0)
+	if (history(h, , H_ENTER, line) == -1)
+		return 0;
+
+	(void)history(h, , H_GETSIZE);
+	if (ev.num == history_length)
+		history_base++;
+	else
 		history_length = ev.num;
 	current_history_valid = 1;
-
-	return !(history_length > 0); /* return 0 if all is okay */
+	return 0;
 }
 
 

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  2 12:28:11 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
mention hostzerobroadcast default to "no".


To generate a diff of this commit:
cvs rdiff -u -r1.2167 -r1.2168 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2167 src/doc/CHANGES:1.2168
--- src/doc/CHANGES:1.2167	Tue May 31 20:12:27 2016
+++ src/doc/CHANGES	Thu Jun  2 08:28:11 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2167 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2168 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -310,4 +310,8 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		the kernel image on amd64 and i386. [maxv 20160515]
 	arm: Add support for i.MX7 SoC. [ryo 20160517]
 	bind: Import version 9.10.4-P1. [christos 20160526]
+	network: Change hostzerobroadcast default to "no". This has has been
+		the default for many years (broadcast to all ones instead to
+		all zeroes), but might affect some really old machines out
+		there [christos 20160527]
 	zoneinfo: Import tzdata2016d. [agc 20160531]

CVS commit: othersrc/external/bsd/sys_info

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Thu Jun  2 08:13:39 UTC 2016

Modified Files:
othersrc/external/bsd/sys_info: sys_info.1

Log Message:
Remove unnecessary Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/sys_info/sys_info.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/external/bsd/sys_info/sys_info.1
diff -u othersrc/external/bsd/sys_info/sys_info.1:1.1 othersrc/external/bsd/sys_info/sys_info.1:1.2
--- othersrc/external/bsd/sys_info/sys_info.1:1.1	Thu Jun  2 02:47:56 2016
+++ othersrc/external/bsd/sys_info/sys_info.1	Thu Jun  2 08:13:39 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: sys_info.1,v 1.1 2016/06/02 02:47:56 agc Exp $
+.\" $NetBSD: sys_info.1,v 1.2 2016/06/02 08:13:39 wiz Exp $
 .\"
 .\" Copyright (c) 2016 Alistair Crooks 
 .\" All rights reserved.
@@ -51,7 +51,6 @@ Show the version numbers of all componen
 .It Fl v
 Perform the operations in a verbose manner.
 .El
-.Pp
 .Sh SEE ALSO
 .Xr awk 1 ,
 .Xr strings 1

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Jun  2 08:11:23 UTC 2016

Modified Files:
src/share/man/man4: wi.4

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/share/man/man4/wi.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/wi.4
diff -u src/share/man/man4/wi.4:1.41 src/share/man/man4/wi.4:1.42
--- src/share/man/man4/wi.4:1.41	Wed Jun  1 23:40:05 2016
+++ src/share/man/man4/wi.4	Thu Jun  2 08:11:23 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wi.4,v 1.41 2016/06/01 23:40:05 pgoyette Exp $
+.\" $NetBSD: wi.4,v 1.42 2016/06/02 08:11:23 wiz Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul . All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: wi.4,v 1.41 2016/06/01 23:40:05 pgoyette Exp $
+.\"	$Id: wi.4,v 1.42 2016/06/02 08:11:23 wiz Exp $
 .\"
 .Dd June 2, 2016
 .Dt WI 4
@@ -61,10 +61,12 @@ even though they are 16-bit cards.
 The core of the WaveLAN/IEEE is the Lucent Hermes controller.
 All host/device interaction is via programmed I/O with the Hermes.
 The Hermes supports 802.11 and 802.3 frames, power management, BSS, WDS
-and ad-hoc operation modes.  The Silver and the Gold cards of the
-WaveLAN/IEEE also support WEP.  Unlike the other IEEE 802.11 network cards,
-the WaveLAN Gold cards accept 104 bits key (13 characters) for WEP
-encryption.  The Intersil PRISM-II controller supports WEP as well.
+and ad-hoc operation modes.
+The Silver and the Gold cards of the
+WaveLAN/IEEE also support WEP.
+Unlike the other IEEE 802.11 network cards, the WaveLAN Gold cards
+accept 104 bits key (13 characters) for WEP encryption.
+The Intersil PRISM-II controller supports WEP as well.
 .Pp
 The
 .Nm
@@ -80,18 +82,21 @@ The
 .Nm
 driver supports configuration of Lucent cards for special ad-hoc operation.
 In this mode, the nwid is ignored and stations can communicate among each
-other without the aid of an access point.  Note that this mode is specific
-to Lucent chips, and not in the IEEE 802.11 specification.  Due to changes
+other without the aid of an access point.
+Note that this mode is specific
+to Lucent chips, and not in the IEEE 802.11 specification.
+Due to changes
 in the implementation of this special ad-hoc mode, Lucent-based cards with
-different firmware revisions may not interoperate in this mode.  This mode
-is no longer the default and must be selected using the
+different firmware revisions may not interoperate in this mode.
+This mode is no longer the default and must be selected using the
 .Xr ifconfig 8
 .Pq media option Dq adhoc,flag0
 utility.
 .Pp
 Recent versions of Lucent and PRISM-II firmware support IBSS creation.
-IBSS is the standard IEEE 802.11 ad-hoc mode.  In this mode, the nwid
-should be specified.  At least one node must be able to create IBSS.
+IBSS is the standard IEEE 802.11 ad-hoc mode.
+In this mode, the nwid should be specified.
+At least one node must be able to create IBSS.
 The IBSS mode is enabled by
 .Dq adhoc
 or
@@ -104,10 +109,11 @@ The
 driver defaults to infrastructure mode (i.e., using an access point).
 .Pp
 Recent versions of PRISM-II firmware support operating as an 802.11
-Access Point.  In this mode, the Access Point station should set the
-nwid.  This will create a standard 802.11 network, and the Access Point
-station will show up in an Access Point scan.  This mode is enabled
-using the
+Access Point.
+In this mode, the Access Point station should set the nwid.
+This will create a standard 802.11 network, and the Access Point
+station will show up in an Access Point scan.
+This mode is enabled using the
 .Dq hostap
 media option.
 .Pp