CVS commit: src/sys/arch/x68k/stand/newdisk
Module Name:src Committed By: minoura Date: Sat Jun 23 08:48:16 UTC 2012 Modified Files: src/sys/arch/x68k/stand/newdisk: newdisk.c Log Message: Change to the 2-clauses license. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x68k/stand/newdisk/newdisk.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/x68k/stand/newdisk/newdisk.c diff -u src/sys/arch/x68k/stand/newdisk/newdisk.c:1.9 src/sys/arch/x68k/stand/newdisk/newdisk.c:1.10 --- src/sys/arch/x68k/stand/newdisk/newdisk.c:1.9 Wed May 4 11:44:25 2011 +++ src/sys/arch/x68k/stand/newdisk/newdisk.c Sat Jun 23 08:48:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: newdisk.c,v 1.9 2011/05/04 11:44:25 tsutsui Exp $ */ +/* $NetBSD: newdisk.c,v 1.10 2012/06/23 08:48:15 minoura Exp $ */ /*- * Copyright (c) 1999 Minoura Makoto @@ -12,11 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Minoura Makoto. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: christos
Date: Sat Jun 23 14:06:02 UTC 2012
Modified Files:
src/distrib/utils/sysinst: disks.c
Log Message:
Trying to print a function pointer as a string is likely to cause tears.
While here, don't match on the unit either
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/distrib/utils/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.125 src/distrib/utils/sysinst/disks.c:1.126
--- src/distrib/utils/sysinst/disks.c:1.125 Fri Jun 22 16:54:39 2012
+++ src/distrib/utils/sysinst/disks.c Sat Jun 23 10:06:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.125 2012/06/22 20:54:39 abs Exp $ */
+/* $NetBSD: disks.c,v 1.126 2012/06/23 14:06:02 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -324,21 +324,24 @@ get_default_cdrom(void)
const char *cd_dev;
/* On error just use first entry in cdrom_devices */
- if (sysctlbyname(mib_name, NULL, len, NULL, 0) != 0)
+ if (sysctlbyname(mib_name, NULL, len, NULL, 0) == -1)
return cdrom_devices[0];
- if ((disknames = malloc(len)) == 0) /* skip on malloc fail */
+ if ((disknames = malloc(len + 2)) == 0) /* skip on malloc fail */
return cdrom_devices[0];
- sysctlbyname(mib_name, disknames, len, NULL, 0);
+ (void)sysctlbyname(mib_name, disknames, len, NULL, 0);
for ((name = strtok_r(disknames, , last)); name;
(name = strtok_r(NULL, , last))) {
- for (arg = cdrom_devices ; *arg ; ++arg ) {
+ for (arg = cdrom_devices; *arg; ++arg) {
cd_dev = *arg;
- if (strncmp(cd_dev, name, strlen(cd_dev) - 1) == 0) {
-free(disknames);
-return cd_dev;
- }
-
+ /* skip unit and partition */
+ if (strncmp(cd_dev, name, strlen(cd_dev) - 2) != 0)
+continue;
+ if (name != disknames)
+strcpy(disknames, name);
+ strcat(disknames, a);
+ /* XXX: leaks, but so what? */
+ return disknames;
}
}
free(disknames);
@@ -814,7 +817,7 @@ make_fstab(void)
scripting_fprintf(f, ptyfs\t\t/dev/pts\tptyfs\trw\n);
scripting_fprintf(f, procfs\t\t/proc\tprocfs\trw\n);
scripting_fprintf(f, /dev/%s\t\t/cdrom\tcd9660\tro,noauto\n,
- (char *)get_default_cdrom);
+ get_default_cdrom());
make_target_dir(/kern);
make_target_dir(/proc);
make_target_dir(/dev/pts);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Sat Jun 23 17:49:58 UTC 2012
Modified Files:
src/distrib/utils/sysinst: main.c
Log Message:
Do not assign to a const pointer, but set the value of the target variable
instead. Makes sysinst at least start up again.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/utils/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.65 src/distrib/utils/sysinst/main.c:1.66
--- src/distrib/utils/sysinst/main.c:1.65 Fri Jun 22 20:54:39 2012
+++ src/distrib/utils/sysinst/main.c Sat Jun 23 17:49:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.65 2012/06/22 20:54:39 abs Exp $ */
+/* $NetBSD: main.c,v 1.66 2012/06/23 17:49:58 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -128,15 +128,12 @@ init(void)
mnt2_mounted = 0;
fd_type = msdos;
- for (arg = fflagopts; arg-name != NULL; arg++)
- if (arg-var == cdrom_dev) {
- const char **dfltptr = __UNCONST(arg-dflt);
- *dfltptr = get_default_cdrom();
- break;
- }
-
- for (arg = fflagopts; arg-name != NULL; arg++)
- strlcpy(arg-var, arg-dflt, arg-size);
+ for (arg = fflagopts; arg-name != NULL; arg++) {
+ if (arg-var == cdrom_dev)
+ strlcpy(arg-var, get_default_cdrom(), arg-size);
+ else
+ strlcpy(arg-var, arg-dflt, arg-size);
+ }
pkg.xfer_type = pkgsrc.xfer_type = http;
}
CVS commit: src/share/man/man4
Module Name:src Committed By: abs Date: Sat Jun 23 19:14:35 UTC 2012 Modified Files: src/share/man/man4: cd.4 Log Message: Document DIOCTUR (test unit ready) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/cd.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/cd.4 diff -u src/share/man/man4/cd.4:1.18 src/share/man/man4/cd.4:1.19 --- src/share/man/man4/cd.4:1.18 Mon Mar 22 18:58:31 2010 +++ src/share/man/man4/cd.4 Sat Jun 23 19:14:34 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cd.4,v 1.18 2010/03/22 18:58:31 joerg Exp $ +.\ $NetBSD: cd.4,v 1.19 2012/06/23 19:14:34 abs Exp $ .\ .\ Copyright (c) 1996 .\ Julian Elischer jul...@freebsd.org. All rights reserved. @@ -25,7 +25,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 16, 1996 +.Dd June 23, 2012 .Dt CD 4 .Os .Sh NAME @@ -317,6 +317,9 @@ Cause the ATAPI changer to load or unloa .It Dv CDIOCCLOSE Tell the drive to close its door and load the media. Not all drives support this feature. +.It Dv DIOCTUR +Test unit ready - to allow userland to silently check for presence of media. +disc. .\ .\.It Dv CDIOCPITCH .\.Pq Li struct ioc_pitch
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Jun 23 20:29:06 UTC 2012 Modified Files: src/share/man/man4: cd.4 Log Message: Remove superfluous word. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/cd.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/cd.4 diff -u src/share/man/man4/cd.4:1.19 src/share/man/man4/cd.4:1.20 --- src/share/man/man4/cd.4:1.19 Sat Jun 23 19:14:34 2012 +++ src/share/man/man4/cd.4 Sat Jun 23 20:29:06 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cd.4,v 1.19 2012/06/23 19:14:34 abs Exp $ +.\ $NetBSD: cd.4,v 1.20 2012/06/23 20:29:06 wiz Exp $ .\ .\ Copyright (c) 1996 .\ Julian Elischer jul...@freebsd.org. All rights reserved. @@ -319,7 +319,6 @@ Tell the drive to close its door and loa Not all drives support this feature. .It Dv DIOCTUR Test unit ready - to allow userland to silently check for presence of media. -disc. .\ .\.It Dv CDIOCPITCH .\.Pq Li struct ioc_pitch
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src Committed By: jdf Date: Sat Jun 23 20:49:14 UTC 2012 Modified Files: src/usr.sbin/hdaudioctl: hdaudioctl.8 Log Message: * Remove spurious period in name section * remove spurious argument to Nm macro Patch supplied by Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/hdaudioctl/hdaudioctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/hdaudioctl/hdaudioctl.8 diff -u src/usr.sbin/hdaudioctl/hdaudioctl.8:1.3 src/usr.sbin/hdaudioctl/hdaudioctl.8:1.4 --- src/usr.sbin/hdaudioctl/hdaudioctl.8:1.3 Sat Mar 17 11:13:03 2012 +++ src/usr.sbin/hdaudioctl/hdaudioctl.8 Sat Jun 23 20:49:14 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: hdaudioctl.8,v 1.3 2012/03/17 11:13:03 wiz Exp $ +.\ $NetBSD: hdaudioctl.8,v 1.4 2012/06/23 20:49:14 jdf Exp $ .\ .\ Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk .\ All rights reserved. @@ -34,9 +34,9 @@ .Nm hdaudioctl .Nd program to manipulate .Xr hdaudio 4 -devices. +devices .Sh SYNOPSIS -.Nm hdaudioctl +.Nm .Op Ar -f device .Ar command .Op Ar arguments
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Jun 23 23:05:52 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 328, 336, 341. To generate a diff of this commit: cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.133 src/doc/CHANGES-6.0:1.1.2.134 --- src/doc/CHANGES-6.0:1.1.2.133 Fri Jun 15 11:22:22 2012 +++ src/doc/CHANGES-6.0 Sat Jun 23 23:05:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.133 2012/06/15 11:22:22 sborrill Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.134 2012/06/23 23:05:52 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5671,3 +5671,71 @@ sys/dev/usb/stuirda.c1.15 error path. [joerg, ticket #336] +bin/ps/ps.1 1.101 +distrib/amd64/cdroms/Makefile.cdrom 1.7 +distrib/amd64/cdroms/install.sh 1.3 +distrib/amd64/installimage/install.sh 1.2 +distrib/i386/cdroms/Makefile.cdrom 1.27 +distrib/i386/cdroms/install.sh 1.3 +distrib/i386/installimage/install.sh 1.2 +distrib/sets/lists/base/mi 1.996 +distrib/sets/lists/tests/mi 1.472 +distrib/sparc64/cdroms/installcd/Makefile 1.15 +distrib/sparc64/cdroms/installcd/install.sh 1.3 +distrib/sparc64/instfs/dot.profile 1.7 +distrib/sparc64/instfs/list 1.25 +etc/rc.d/sysdb 1.24 +include/cdbw.h 1.2 +include/paths.h 1.41 +include/stdlib.h1.99 +lib/libc/cdb/cdbr.c1.3 +lib/libc/cdb/cdbw.31.4-1.5 +lib/libc/cdb/cdbw.c1.4 +lib/libc/gen/devname.31.12 +lib/libc/gen/devname.c1.22 +lib/libc/gen/ttyname.31.23-1.24 +lib/libc/gen/ttyname.c1.25-1.26 +lib/libc/include/namespace.h 1.154 +lib/libc/include/reentrant.h 1.15 +lib/libterminfo/Makefile.hash 1.5 +lib/libterminfo/compile.c 1.7-1.8 +lib/libterminfo/term.c1.14-1.16 +lib/libterminfo/term_private.h 1.10 +lib/libterminfo/terminfo.5.in 1.16-1.17 +share/man/man5/rc.conf.5 1.152 +share/man/man7/hier.71.101 via patch +share/terminfo/Makefile1.3 +tests/include/t_paths.c1.12 +tests/lib/libcurses/Makefile 1.3 +tests/lib/libcurses/director/director.c 1.10 +tools/compat/Makefile1.57,1.59 +tools/compat/cdbr.h1.1 +tools/compat/cdbw.h1.1 +tools/compat/compat_defs.h 1.85-1.86 +usr.bin/tic/Makefile1.2 +usr.bin/tic/tic.11.10 +usr.bin/tic/tic.c1.13-1.20 +usr.sbin/dev_mkdb/Makefile 1.8 +usr.sbin/dev_mkdb/dev_mkdb.8 1.13 +usr.sbin/dev_mkdb/dev_mkdb.c 1.29 + + Switch device database and terminfo database to cdb(5), which + is both smaller and faster. + [joerg, ticket #328] + +sys/dev/usb/stuirda.c1.15 + + Fix a case where an uninitialized USB pipe could be freed in the error + path. + [joerg, ticket #336] + +distrib/sets/lists/xbase/mi 1.114 +external/mit/xorg/bin/xdm/config/Makefile 1.11-1.12 +external/mit/xorg/bin/xdm/config/NetBSD-flag.png.uue 1.1 +external/mit/xorg/bin/xdm/config/NetBSD-flag1.xpm 1.1 +external/mit/xorg/bin/xdm/config/NetBSD-flag2.xpm 1.1 +external/mit/xorg/bin/xdm/config/Xresources.cpp 1.1 + + Make the NetBSD logo look nicer in XDM. + [martin, ticket #341] +
CVS commit: src/sbin/mount
Module Name:src Committed By: jdf Date: Sat Jun 23 23:17:46 UTC 2012 Modified Files: src/sbin/mount: mount.8 Log Message: Clarify use of the union option for mount, as proposed in PR 45919. Text proposed by apb. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.74 src/sbin/mount/mount.8:1.75 --- src/sbin/mount/mount.8:1.74 Fri Jul 22 15:53:21 2011 +++ src/sbin/mount/mount.8 Sat Jun 23 23:17:46 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.74 2011/07/22 15:53:21 dholland Exp $ +.\ $NetBSD: mount.8,v 1.75 2012/06/23 23:17:46 jdf Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -303,12 +303,32 @@ Clear mode. .It Cm union Causes the namespace at the mount point to appear as the union -of the mounted file system root and the existing directory. -Lookups will be done in the mounted file system first. -If those operations fail due to a non-existent file the underlying -directory is then accessed. -All creates are done in the mounted file system, except for the fdesc -file system. +of the mounted file system root +(referred to as the +.Em upper +layer), and the existing directory +(referred to as the +.Em lower +layer). +Name lookups will be done in the upper layer first. +If a name does not exist in the upper layer, then the name +will be looked up in the lower layer. +If a name exists in both the upper and lower layers, then only +the upper instance is accessible. +Creation of new files is done in the upper layer, +except in the case of the fdesc file system (see +.Xr mount_fdesc 8 ) . +.Pp +Note that the +.Cm union +option can be applied to any type of file system, +and is fundamentally different from +.Xr mount_union 8 , +which is a particular type of file system. +Also note that the +.Cm union +option affects the file system name space only at the mount point +itself; it does not apply recursively to subdirectories. .It Cm update The same as .Fl u ;
CVS commit: src/sbin/mount
Module Name:src Committed By: wiz Date: Sat Jun 23 23:41:25 UTC 2012 Modified Files: src/sbin/mount: mount.8 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.75 src/sbin/mount/mount.8:1.76 --- src/sbin/mount/mount.8:1.75 Sat Jun 23 23:17:46 2012 +++ src/sbin/mount/mount.8 Sat Jun 23 23:41:25 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.75 2012/06/23 23:17:46 jdf Exp $ +.\ $NetBSD: mount.8,v 1.76 2012/06/23 23:41:25 wiz Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount.8 8.8 (Berkeley) 6/16/94 .\ -.Dd July 22, 2011 +.Dd June 23, 2012 .Dt MOUNT 8 .Os .Sh NAME
CVS commit: [netbsd-6] src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: riz
Date: Sun Jun 24 02:49:32 UTC 2012
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-6]: drm_bufs.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #353):
sys/external/bsd/drm/dist/bsd-core/drm_bufs.c: revision 1.11
when freeing the DRM_SHM kernel memory that can be mapped by a user process,
remove any user mappings before freeing the memory, so that a user process
doesn't have still have access to that physical memory after it's reused.
this really shouldn't be using kernel malloc'd memory at all,
but changing that would be much more involved.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.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/external/bsd/drm/dist/bsd-core/drm_bufs.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.10 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.10.2.1
--- src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.10 Sun Jan 29 11:49:02 2012
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c Sun Jun 24 02:49:31 2012
@@ -316,6 +316,22 @@ int drm_addmap_ioctl(struct drm_device *
return 0;
}
+static void
+drm_rmmap_user(void *addr, size_t size)
+{
+ vaddr_t va, eva;
+ paddr_t pa;
+ struct vm_page *pg;
+
+ va = (vaddr_t)addr;
+ eva = va + size;
+ for (; va eva; va += PAGE_SIZE) {
+ pmap_extract(pmap_kernel(), va, pa);
+ pg = PHYS_TO_VM_PAGE(pa);
+ pmap_page_protect(pg, VM_PROT_NONE);
+ }
+}
+
void drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
{
DRM_SPINLOCK_ASSERT(dev-dev_lock);
@@ -338,6 +354,11 @@ void drm_rmmap(struct drm_device *dev, d
}
break;
case _DRM_SHM:
+
+ /*
+ * Remove any user mappings before we free the kernel memory.
+ */
+ drm_rmmap_user(map-handle, map-size);
free(map-handle, DRM_MEM_MAPS);
break;
case _DRM_AGP:
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sun Jun 24 02:50:19 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket #353. To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.134 src/doc/CHANGES-6.0:1.1.2.135 --- src/doc/CHANGES-6.0:1.1.2.134 Sat Jun 23 23:05:52 2012 +++ src/doc/CHANGES-6.0 Sun Jun 24 02:50:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.134 2012/06/23 23:05:52 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.135 2012/06/24 02:50:19 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5739,3 +5739,8 @@ external/mit/xorg/bin/xdm/config/Xresour Make the NetBSD logo look nicer in XDM. [martin, ticket #341] +sys/external/bsd/drm/dist/bsd-core/drm_bufs.c 1.11 + + Remove user mappings before freeing DRM_SHM kernel memory. PR#46208. + [chs, ticket #353] +
