CVS commit: src/sys/dev/acpi/acpica
Module Name:src
Committed By: jruoho
Date: Sun Apr 22 06:33:05 UTC 2012
Modified Files:
src/sys/dev/acpi/acpica: OsdMemory.c
Log Message:
As in Linux, prevent BIOS from trying to map addresses beyond ULONG_MAX.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpica/OsdMemory.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/dev/acpi/acpica/OsdMemory.c
diff -u src/sys/dev/acpi/acpica/OsdMemory.c:1.4 src/sys/dev/acpi/acpica/OsdMemory.c:1.5
--- src/sys/dev/acpi/acpica/OsdMemory.c:1.4 Thu Feb 17 10:21:43 2011
+++ src/sys/dev/acpi/acpica/OsdMemory.c Sun Apr 22 06:33:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMemory.c,v 1.4 2011/02/17 10:21:43 jruoho Exp $ */
+/* $NetBSD: OsdMemory.c,v 1.5 2012/04/22 06:33:04 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: OsdMemory.c,v 1.4 2011/02/17 10:21:43 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: OsdMemory.c,v 1.5 2012/04/22 06:33:04 jruoho Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -61,12 +61,17 @@ MALLOC_DECLARE(M_ACPI);
void *
AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length)
{
- ACPI_STATUS Status;
void *LogicalAddress = NULL;
+ ACPI_STATUS Status;
+
+ if (PhysicalAddress ULONG_MAX)
+ return NULL;
Status = acpi_md_OsMapMemory(PhysicalAddress, Length, LogicalAddress);
- if (ACPI_FAILURE (Status))
+
+ if (ACPI_FAILURE(Status))
return NULL;
+
return LogicalAddress;
}
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: tsutsui
Date: Sun Apr 22 07:23:43 UTC 2012
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage
Log Message:
Fix typo in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.2 -r1.3 src/distrib/common/bootimage/Makefile.installimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.5 src/distrib/common/bootimage/Makefile.bootimage:1.6
--- src/distrib/common/bootimage/Makefile.bootimage:1.5 Sun Apr 22 05:24:39 2012
+++ src/distrib/common/bootimage/Makefile.bootimage Sun Apr 22 07:23:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.5 2012/04/22 05:24:39 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.6 2012/04/22 07:23:42 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -39,7 +39,7 @@
# (default: sd0)
# USE_MBR
# set yes if target disk image requires MBR partition
-# (defautl: no)
+# (default: no)
# MBR_BOOTCODE
# optional MBR bootcode which should be installed by fdisk(8)
# (default: empty)
@@ -82,7 +82,7 @@
# DIR TARGETPATH
# for installation image etc.
# (default: empty)
-# XXX: currently permittions in IMGDIR_EXTRA are not handled
+# XXX: currently permissions in IMGDIR_EXTRA are not handled
# IMGDIR_EXCLUDE
# pax(1) options to exclude files which should not copied
# into TARGETPATH in IMGDIR_EXTRA
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.2 src/distrib/common/bootimage/Makefile.installimage:1.3
--- src/distrib/common/bootimage/Makefile.installimage:1.2 Sun Jan 22 16:50:00 2012
+++ src/distrib/common/bootimage/Makefile.installimage Sun Apr 22 07:23:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.2 2012/01/22 16:50:00 tsutsui Exp $
+# $NetBSD: Makefile.installimage,v 1.3 2012/04/22 07:23:42 tsutsui Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -35,7 +35,7 @@ DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/c
DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/common/bootimage/diskproto.noswap.in
.endif
-# XXX: no permittion info for makefs(8)
+# XXX: no permission info for makefs(8)
IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR}
IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: martin
Date: Sun Apr 22 08:52:26 UTC 2012
Modified Files:
src/tests/lib/libc/gen: t_siginfo.c
Log Message:
Do not compare si_addr (address of faulting instruction) against the
unaligned data address causing the fault - this will always fail.
If anybody knows a portable way to get the data address involved in the
fault, please fix the test case as originally intended.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/lib/libc/gen/t_siginfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.15 src/tests/lib/libc/gen/t_siginfo.c:1.16
--- src/tests/lib/libc/gen/t_siginfo.c:1.15 Fri Apr 20 00:40:31 2012
+++ src/tests/lib/libc/gen/t_siginfo.c Sun Apr 22 08:52:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.15 2012/04/20 00:40:31 jym Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.16 2012/04/22 08:52:26 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -418,13 +418,26 @@ sigbus_action(int signo, siginfo_t *info
ATF_REQUIRE_EQ(info-si_errno, 0);
ATF_REQUIRE_EQ(info-si_code, BUS_ADRALN);
+#if 0
if (strcmp(atf_config_get(atf_arch), i386) == 0 ||
strcmp(atf_config_get(atf_arch), x86_64) == 0) {
atf_tc_expect_fail(x86 architecture does not correctly
report the address where the unaligned access occured);
}
+ /*
+ * XXX: This is bogus: si_addr is documented as the text address
+ * where the fault occurs, addr is the faulting data address,
+ * see TOG about siginfo_t:
+ *
+ * void * si_addr Address of faulting instruction.
+ *
+ * Is there a portable way to get the accessed data address from
+ * the handler?
+ */
ATF_REQUIRE_EQ(info-si_addr, (void *)addr);
+#endif
+
atf_tc_pass();
/* NOTREACHED */
}
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Sun Apr 22 10:13:52 UTC 2012 Modified Files: src/lib/libc/gen: cgetcap.3 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gen/cgetcap.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/cgetcap.3 diff -u src/lib/libc/gen/cgetcap.3:1.7 src/lib/libc/gen/cgetcap.3:1.8 --- src/lib/libc/gen/cgetcap.3:1.7 Sat Apr 21 12:27:27 2012 +++ src/lib/libc/gen/cgetcap.3 Sun Apr 22 10:13:52 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cgetcap.3,v 1.7 2012/04/21 12:27:27 roy Exp $ +.\ $NetBSD: cgetcap.3,v 1.8 2012/04/22 10:13:52 wiz Exp $ .\ .\ Copyright (c) 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -360,8 +360,8 @@ No memory to allocate. .El .Sh SEE ALSO .Xr cap_mkdb 1 , -.Xr capfile 5 , -.Xr malloc 3 +.Xr malloc 3 , +.Xr capfile 5 .Sh BUGS There are no checks for .Qq tc=name
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Sun Apr 22 10:14:19 UTC 2012 Modified Files: src/lib/libc/gen: getttyent.3 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/gen/getttyent.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/getttyent.3 diff -u src/lib/libc/gen/getttyent.3:1.19 src/lib/libc/gen/getttyent.3:1.20 --- src/lib/libc/gen/getttyent.3:1.19 Sat Apr 21 12:27:27 2012 +++ src/lib/libc/gen/getttyent.3 Sun Apr 22 10:14:18 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: getttyent.3,v 1.19 2012/04/21 12:27:27 roy Exp $ +.\ $NetBSD: getttyent.3,v 1.20 2012/04/22 10:14:18 wiz Exp $ .\ .\ Copyright (c) 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -194,8 +194,8 @@ return 0 on failure and 1 on success. .Sh SEE ALSO .Xr login 1 , .Xr ttyslot 3 , -.Xr gettytab 5 , .Xr capfile 5 , +.Xr gettytab 5 , .Xr ttys 5 , .Xr getty 8 , .Xr init 8 ,
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Sun Apr 22 10:18:47 UTC 2012 Modified Files: src/share/man/man5: printcap.5 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man5/printcap.5 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/man5/printcap.5 diff -u src/share/man/man5/printcap.5:1.26 src/share/man/man5/printcap.5:1.27 --- src/share/man/man5/printcap.5:1.26 Sat Apr 21 12:27:28 2012 +++ src/share/man/man5/printcap.5 Sun Apr 22 10:18:47 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: printcap.5,v 1.26 2012/04/21 12:27:28 roy Exp $ +.\ $NetBSD: printcap.5,v 1.27 2012/04/22 10:18:47 wiz Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -311,10 +311,10 @@ themselves. Error messages sent to the console have a carriage return and a line feed appended to them, rather than just a line feed. .Sh SEE ALSO -.Xr capfile 5 , .Xr lpq 1 , .Xr lpr 1 , .Xr lprm 1 , +.Xr capfile 5 , .Xr lpc 8 , .Xr lpd 8 , .Xr pac 8
CVS commit: src/share/man/man5
Module Name:src
Committed By: wiz
Date: Sun Apr 22 10:19:00 UTC 2012
Modified Files:
src/share/man/man5: passwd.5
Log Message:
Sort sections, sort SEE ALSO.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/share/man/man5/passwd.5
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/man5/passwd.5
diff -u src/share/man/man5/passwd.5:1.29 src/share/man/man5/passwd.5:1.30
--- src/share/man/man5/passwd.5:1.29 Sat Apr 21 12:27:28 2012
+++ src/share/man/man5/passwd.5 Sun Apr 22 10:19:00 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: passwd.5,v 1.29 2012/04/21 12:27:28 roy Exp $
+.\ $NetBSD: passwd.5,v 1.30 2012/04/22 10:19:00 wiz Exp $
.\
.\ Copyright (c) 1988, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -361,24 +361,6 @@ Hesiod or
On some systems, the
.Em passwd
field may also be overridden.
-.Sh SEE ALSO
-.Xr chpass 1 ,
-.Xr login 1 ,
-.Xr newgrp 1 ,
-.Xr passwd 1 ,
-.Xr pwhash 1 ,
-.Xr getpwent 3 ,
-.Xr login_getclass 3 ,
-.Xr login.conf 5 ,
-.Xr netgroup 5 ,
-.Xr passwd.conf 5 ,
-.Xr adduser 8 ,
-.Xr pwd_mkdb 8 ,
-.Xr vipw 8 ,
-.Xr yp 8
-.Pp
-.%T Managing NFS and NIS
-(O'Reilly \*[Am] Associates)
.Sh COMPATIBILITY
The password file format has changed since
.Bx 4.3 .
@@ -397,6 +379,24 @@ of offset you want.
BEGIN { FS = :}
{ print $1 : $2 : $3 : $4 ::0:0: $5 : $6 : $7 }
.Ed
+.Sh SEE ALSO
+.Xr chpass 1 ,
+.Xr login 1 ,
+.Xr newgrp 1 ,
+.Xr passwd 1 ,
+.Xr pwhash 1 ,
+.Xr getpwent 3 ,
+.Xr login_getclass 3 ,
+.Xr login.conf 5 ,
+.Xr netgroup 5 ,
+.Xr passwd.conf 5 ,
+.Xr adduser 8 ,
+.Xr pwd_mkdb 8 ,
+.Xr vipw 8 ,
+.Xr yp 8
+.Pp
+.%T Managing NFS and NIS
+(O'Reilly \*[Am] Associates)
.Sh HISTORY
A
.Nm
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Sun Apr 22 10:19:15 UTC 2012 Modified Files: src/share/man/man5: disktab.5 Log Message: Sort SEE ALSO; new sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man5/disktab.5 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/man5/disktab.5 diff -u src/share/man/man5/disktab.5:1.12 src/share/man/man5/disktab.5:1.13 --- src/share/man/man5/disktab.5:1.12 Sat Apr 21 12:27:28 2012 +++ src/share/man/man5/disktab.5 Sun Apr 22 10:19:15 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: disktab.5,v 1.12 2012/04/21 12:27:28 roy Exp $ +.\ $NetBSD: disktab.5,v 1.13 2012/04/22 10:19:15 wiz Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -50,11 +50,10 @@ The format is described in .Xr capfile 5 . Entries in .Nm -consist of a number of `:' separated fields. The -first entry for each disk gives the names which are -known for the disk, separated by `|' characters. The -last name given should be a long name fully identifying -the disk. +consist of a number of `:' separated fields. +The first entry for each disk gives the names which are known for +the disk, separated by `|' characters. +The last name given should be a long name fully identifying the disk. .Pp The following list indicates the normal values stored for each disk entry. @@ -128,8 +127,8 @@ filesystem, swap, etc) .It Pa /etc/disktab .El .Sh SEE ALSO -.Xr capfile 5 , .Xr getdiskbyname 3 , +.Xr capfile 5 , .Xr disklabel 5 , .Xr disklabel 8 , .Xr newfs 8
CVS commit: src/usr.bin/tabs
Module Name:src Committed By: wiz Date: Sun Apr 22 10:22:08 UTC 2012 Modified Files: src/usr.bin/tabs: tabs.1 Log Message: Sort sections. Remove superfluous Ns macro. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/tabs/tabs.1 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/tabs/tabs.1 diff -u src/usr.bin/tabs/tabs.1:1.3 src/usr.bin/tabs/tabs.1:1.4 --- src/usr.bin/tabs/tabs.1:1.3 Sat Apr 21 12:27:29 2012 +++ src/usr.bin/tabs/tabs.1 Sun Apr 22 10:22:08 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: tabs.1,v 1.3 2012/04/21 12:27:29 roy Exp $ +.\ $NetBSD: tabs.1,v 1.4 2012/04/22 10:22:08 wiz Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -42,7 +42,7 @@ Ns | Ns Fl c3 Ns | Ns Fl f Ns | Ns Fl p .Nm .Op Fl T Ar type .Op + Ns Op n -.Ar n1 Ns Op , Ns Ar n2 Ns , Ns Ar ... +.Ar n1 Ns Op , Ns Ar n2 , Ns Ar ... .Sh DESCRIPTION The .Nm @@ -122,8 +122,6 @@ Equivalent to .Nm 1,12,20,44 .El -.Sh EXIT STATUS -.Ex -std .Sh ENVIRONMENT The .Ev COLUMNS @@ -145,6 +143,8 @@ nor the option are present, .Nm will fail. +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO .Xr expand 1 , .Xr stty 1 ,
CVS commit: src/usr.bin/tset
Module Name:src Committed By: wiz Date: Sun Apr 22 10:23:39 UTC 2012 Modified Files: src/usr.bin/tset: tset.1 Log Message: Remove duplicate Pp. Remove trailing whitespace. Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.bin/tset/tset.1 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/tset/tset.1 diff -u src/usr.bin/tset/tset.1:1.19 src/usr.bin/tset/tset.1:1.20 --- src/usr.bin/tset/tset.1:1.19 Sat Apr 21 12:27:30 2012 +++ src/usr.bin/tset/tset.1 Sun Apr 22 10:23:39 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: tset.1,v 1.19 2012/04/21 12:27:30 roy Exp $ +.\ $NetBSD: tset.1,v 1.20 2012/04/22 10:23:39 wiz Exp $ .\ .\ Copyright (c) 1985, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -159,7 +159,6 @@ This is done using the .Fl s option. .Pp -.Pp When the .Fl s option is specified, the commands to enter the information into the @@ -321,19 +320,6 @@ system port name to terminal type mappin .It Pa /usr/share/misc/terminfo terminal capability database .El -.Sh SEE ALSO -.Xr csh 1 , -.Xr sh 1 , -.Xr stty 1 , -.Xr tty 4 , -.Xr terminfo 5 , -.Xr ttys 5 , -.Xr environ 7 -.Sh HISTORY -The -.Nm -command appeared in -.Bx 3.0 . .Sh COMPATIBILITY The .Fl A , @@ -387,7 +373,7 @@ argument in some historic implementation has been removed. .Pp The -.Fl E +.Fl E and .Fl S options have been removed as they only make sense for termcap and @@ -405,3 +391,16 @@ system of a .St -p1003.1-88 compliant terminal interface) and will no longer compile on systems with older terminal interfaces. +.Sh SEE ALSO +.Xr csh 1 , +.Xr sh 1 , +.Xr stty 1 , +.Xr tty 4 , +.Xr terminfo 5 , +.Xr ttys 5 , +.Xr environ 7 +.Sh HISTORY +The +.Nm +command appeared in +.Bx 3.0 .
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: rkujawa Date: Sun Apr 22 12:23:22 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: mppb.4 Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.amiga/mppb.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/man4.amiga/mppb.4 diff -u src/share/man/man4/man4.amiga/mppb.4:1.4 src/share/man/man4/man4.amiga/mppb.4:1.5 --- src/share/man/man4/man4.amiga/mppb.4:1.4 Mon Dec 5 10:36:39 2011 +++ src/share/man/man4/man4.amiga/mppb.4 Sun Apr 22 12:23:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mppb.4,v 1.4 2011/12/05 10:36:39 wiz Exp $ +.\ $NetBSD: mppb.4,v 1.5 2012/04/22 12:23:22 rkujawa Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -70,7 +70,7 @@ driver was written by .Sh BUGS The hardware does not support DMA to host memory. .Pp -The Prometheus does not support repeating of PCI transations, instead if the +The Prometheus does not support repeating of PCI transactions, instead if the PCI card demands a retry of transaction, it returns value 0x. This is currently not handled by the .Nm
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: khorben
Date: Sun Apr 22 14:04:45 UTC 2012
Modified Files:
src/sys/dev/usb: ukbd.c
Log Message:
Fixed a potential out-of-bounds array access when translating keycodes
for the gdium keyboard.
Reviewed by macallan@
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/usb/ukbd.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/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.117 src/sys/dev/usb/ukbd.c:1.118
--- src/sys/dev/usb/ukbd.c:1.117 Sun Mar 11 01:06:07 2012
+++ src/sys/dev/usb/ukbd.c Sun Apr 22 14:04:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.117 2012/03/11 01:06:07 mrg Exp $*/
+/* $NetBSD: ukbd.c,v 1.118 2012/04/22 14:04:45 khorben Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.117 2012/03/11 01:06:07 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.118 2012/04/22 14:04:45 khorben Exp $);
#include sys/param.h
#include sys/systm.h
@@ -170,7 +170,8 @@ Static const struct ukbd_keycodetrans tr
#endif
{ 76, 71 }, /* delete - scroll lock */
{ 81, 78 }, /* down - page down */
- { 82, 75 } /* up - page up */
+ { 82, 75 }, /* up - page up */
+ { 0, 0 }
};
#endif
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: pgoyette
Date: Sun Apr 22 14:10:36 UTC 2012
Modified Files:
src/sys/dev/i2c: i2c_exec.c i2c_io.h
Log Message:
Identify SMBus block-mode operations.
XXX Nothing in the kernel issues block-mode commands, and each i2c bus
XXX driver needs its own support for the block-mode operations.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/i2c_exec.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/i2c_io.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/i2c/i2c_exec.c
diff -u src/sys/dev/i2c/i2c_exec.c:1.7 src/sys/dev/i2c/i2c_exec.c:1.8
--- src/sys/dev/i2c/i2c_exec.c:1.7 Tue Feb 3 16:17:54 2009
+++ src/sys/dev/i2c/i2c_exec.c Sun Apr 22 14:10:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_exec.c,v 1.7 2009/02/03 16:17:54 pgoyette Exp $ */
+/* $NetBSD: i2c_exec.c,v 1.8 2012/04/22 14:10:36 pgoyette Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i2c_exec.c,v 1.7 2009/02/03 16:17:54 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: i2c_exec.c,v 1.8 2012/04/22 14:10:36 pgoyette Exp $);
#include sys/param.h
#include sys/systm.h
@@ -284,7 +284,7 @@ iic_smbus_block_read(i2c_tag_t tag, i2c_
uint8_t *vbuf, size_t buflen, int flags)
{
- return (iic_exec(tag, I2C_OP_READ_WITH_STOP, addr, cmd, 1,
+ return (iic_exec(tag, I2C_OP_READ_BLOCK, addr, cmd, 1,
vbuf, buflen, flags));
}
@@ -298,7 +298,7 @@ iic_smbus_block_write(i2c_tag_t tag, i2c
uint8_t *vbuf, size_t buflen, int flags)
{
- return (iic_exec(tag, I2C_OP_WRITE_WITH_STOP, addr, cmd, 1,
+ return (iic_exec(tag, I2C_OP_WRITE_BLOCK, addr, cmd, 1,
vbuf, buflen, flags));
}
Index: src/sys/dev/i2c/i2c_io.h
diff -u src/sys/dev/i2c/i2c_io.h:1.2 src/sys/dev/i2c/i2c_io.h:1.3
--- src/sys/dev/i2c/i2c_io.h:1.2 Sun Dec 11 12:21:22 2005
+++ src/sys/dev/i2c/i2c_io.h Sun Apr 22 14:10:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_io.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
+/* $NetBSD: i2c_io.h,v 1.3 2012/04/22 14:10:36 pgoyette Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -44,17 +44,25 @@
typedef uint16_t i2c_addr_t;
/* High-level I2C operations. */
+#define I2C_OPMASK_STOP 1
+#define I2C_OPMASK_WRITE 2
+#define I2C_OPMASK_BLKMODE 4
+
+#define I2C_OP_STOP_P(x) (((int)(x) I2C_OPMASK_STOP) != 0)
+#define I2C_OP_WRITE_P(x) (((int)(x) I2C_OPMASK_WRITE) != 0)
+#define I2C_OP_READ_P(x) (!I2C_OP_WRITE_P(x))
+#define I2C_OP_BLKMODE_P(x) (((int)(x) I2C_OPMASK_BLKMODE) != 0)
+
typedef enum {
- I2C_OP_READ = 0,
- I2C_OP_READ_WITH_STOP = 1,
- I2C_OP_WRITE = 2,
- I2C_OP_WRITE_WITH_STOP = 3,
+I2C_OP_READ = 0,
+I2C_OP_READ_WITH_STOP = I2C_OPMASK_STOP,
+I2C_OP_WRITE = I2C_OPMASK_WRITE,
+I2C_OP_WRITE_WITH_STOP = I2C_OPMASK_WRITE | I2C_OPMASK_STOP,
+I2C_OP_READ_BLOCK = I2C_OPMASK_BLKMODE | I2C_OPMASK_STOP,
+I2C_OP_WRITE_BLOCK = I2C_OPMASK_BLKMODE | I2C_OPMASK_WRITE |
+ I2C_OPMASK_STOP,
} i2c_op_t;
-#define I2C_OP_READ_P(x) (((int)(x) 2) == 0)
-#define I2C_OP_WRITE_P(x) (! I2C_OP_READ_P(x))
-#define I2C_OP_STOP_P(x) (((int)(x) 1) != 0)
-
/*
* This structure describes a single I2C control script fragment.
*
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: khorben
Date: Sun Apr 22 14:13:32 UTC 2012
Modified Files:
src/sys/dev/usb: ukbd.c
Log Message:
Indent the trtab_gdium_fn array like surrounding variables.
No objection on current-users@
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/usb/ukbd.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/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.118 src/sys/dev/usb/ukbd.c:1.119
--- src/sys/dev/usb/ukbd.c:1.118 Sun Apr 22 14:04:45 2012
+++ src/sys/dev/usb/ukbd.c Sun Apr 22 14:13:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.118 2012/04/22 14:04:45 khorben Exp $*/
+/* $NetBSD: ukbd.c,v 1.119 2012/04/22 14:13:32 khorben Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.118 2012/04/22 14:04:45 khorben Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.119 2012/04/22 14:13:32 khorben Exp $);
#include sys/param.h
#include sys/systm.h
@@ -150,28 +150,28 @@ Static const struct ukbd_keycodetrans tr
#ifdef GDIUM_KEYBOARD_HACK
Static const struct ukbd_keycodetrans trtab_gdium_fn[] = {
#ifdef notyet
- { 58, 0 }, /* F1 - toggle camera */
- { 59, 0 }, /* F2 - toggle wireless */
+ { 58, 0 }, /* F1 - toggle camera */
+ { 59, 0 }, /* F2 - toggle wireless */
#endif
- { 60, IS_PMF | PMFE_AUDIO_VOLUME_TOGGLE },
- { 61, IS_PMF | PMFE_AUDIO_VOLUME_UP },
- { 62, IS_PMF | PMFE_AUDIO_VOLUME_DOWN },
+ { 60, IS_PMF | PMFE_AUDIO_VOLUME_TOGGLE },
+ { 61, IS_PMF | PMFE_AUDIO_VOLUME_UP },
+ { 62, IS_PMF | PMFE_AUDIO_VOLUME_DOWN },
#ifdef notyet
- { 63, 0 }, /* F6 - toggle ext. video */
- { 64, 0 }, /* F7 - toggle mouse */
+ { 63, 0 }, /* F6 - toggle ext. video */
+ { 64, 0 }, /* F7 - toggle mouse */
#endif
- { 65, IS_PMF | PMFE_DISPLAY_BRIGHTNESS_UP },
- { 66, IS_PMF | PMFE_DISPLAY_BRIGHTNESS_DOWN },
+ { 65, IS_PMF | PMFE_DISPLAY_BRIGHTNESS_UP },
+ { 66, IS_PMF | PMFE_DISPLAY_BRIGHTNESS_DOWN },
#ifdef notyet
- { 67, 0 }, /* F10 - suspend */
- { 68, 0 }, /* F11 - user1 */
- { 69, 0 }, /* F12 - user2 */
- { 70, 0 }, /* print screen - sysrq */
-#endif
- { 76, 71 }, /* delete - scroll lock */
- { 81, 78 }, /* down - page down */
- { 82, 75 }, /* up - page up */
- { 0, 0 }
+ { 67, 0 }, /* F10 - suspend */
+ { 68, 0 }, /* F11 - user1 */
+ { 69, 0 }, /* F12 - user2 */
+ { 70, 0 }, /* print screen - sysrq */
+#endif
+ { 76, 71 }, /* delete - scroll lock */
+ { 81, 78 }, /* down - page down */
+ { 82, 75 }, /* up - page up */
+ { 0, 0 }
};
#endif
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: khorben
Date: Sun Apr 22 14:25:14 UTC 2012
Modified Files:
src/sys/dev/usb: ukbd.c
Log Message:
Also lookup and be able to lit the LED for the Compose key. Seems to
require additional modifications to function properly in X though.
No objection on current-users@
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/usb/ukbd.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/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.120 src/sys/dev/usb/ukbd.c:1.121
--- src/sys/dev/usb/ukbd.c:1.120 Sun Apr 22 14:19:24 2012
+++ src/sys/dev/usb/ukbd.c Sun Apr 22 14:25:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.120 2012/04/22 14:19:24 khorben Exp $*/
+/* $NetBSD: ukbd.c,v 1.121 2012/04/22 14:25:14 khorben Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.120 2012/04/22 14:19:24 khorben Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.121 2012/04/22 14:25:14 khorben Exp $);
#include sys/param.h
#include sys/systm.h
@@ -269,6 +269,7 @@ struct ukbd_softc {
struct hid_location sc_numloc;
struct hid_location sc_capsloc;
struct hid_location sc_scroloc;
+ struct hid_location sc_compose;
int sc_leds;
device_t sc_wskbddev;
@@ -474,7 +475,8 @@ ukbd_attach(device_t parent, device_t se
callout_init(sc-sc_delay, 0);
/* Flash the leds; no real purpose, just shows we're alive. */
- ukbd_set_leds(sc, WSKBD_LED_SCROLL | WSKBD_LED_NUM | WSKBD_LED_CAPS);
+ ukbd_set_leds(sc, WSKBD_LED_SCROLL | WSKBD_LED_NUM | WSKBD_LED_CAPS
+ | WSKBD_LED_COMPOSE);
usbd_delay_ms(uha-parent-sc_udev, 400);
ukbd_set_leds(sc, 0);
@@ -891,6 +893,8 @@ ukbd_set_leds(void *v, int leds)
sc-sc_leds = leds;
res = 0;
/* XXX not really right */
+ if ((leds WSKBD_LED_COMPOSE) sc-sc_compose.size == 1)
+ res |= 1 sc-sc_compose.pos;
if ((leds WSKBD_LED_SCROLL) sc-sc_scroloc.size == 1)
res |= 1 sc-sc_scroloc.pos;
if ((leds WSKBD_LED_NUM) sc-sc_numloc.size == 1)
@@ -1084,6 +1088,8 @@ ukbd_parse_desc(struct ukbd_softc *sc)
sc-sc_hdev.sc_report_id, hid_output, sc-sc_capsloc, NULL);
hid_locate(desc, size, HID_USAGE2(HUP_LEDS, HUD_LED_SCROLL_LOCK),
sc-sc_hdev.sc_report_id, hid_output, sc-sc_scroloc, NULL);
+ hid_locate(desc, size, HID_USAGE2(HUP_LEDS, HUD_LED_COMPOSE),
+ sc-sc_hdev.sc_report_id, hid_output, sc-sc_compose, NULL);
return (NULL);
}
CVS commit: src/sys/dev
Module Name:src
Committed By: khorben
Date: Sun Apr 22 14:32:08 UTC 2012
Modified Files:
src/sys/dev/usb: ukbd.c
src/sys/dev/wscons: wsksymdef.h
Log Message:
Implemented extra keys as found on Sun Type 7 USB keyboards, and
according to the documentation mentioned above in this file.
works here macallan@, myself
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/wscons/wsksymdef.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/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.121 src/sys/dev/usb/ukbd.c:1.122
--- src/sys/dev/usb/ukbd.c:1.121 Sun Apr 22 14:25:14 2012
+++ src/sys/dev/usb/ukbd.c Sun Apr 22 14:32:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.121 2012/04/22 14:25:14 khorben Exp $*/
+/* $NetBSD: ukbd.c,v 1.122 2012/04/22 14:32:08 khorben Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.121 2012/04/22 14:25:14 khorben Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.122 2012/04/22 14:32:08 khorben Exp $);
#include sys/param.h
#include sys/systm.h
@@ -195,39 +195,39 @@ Static const struct ukbd_keycodetrans tr
* For example, some keys generate Fake ShiftL events (e0 2a)
* before the actual key sequence.
*/
-Static const u_int8_t ukbd_trtab[256] = {
- NN, NN, NN, NN, 0x1e, 0x30, 0x2e, 0x20, /* 00 - 07 */
-0x12, 0x21, 0x22, 0x23, 0x17, 0x24, 0x25, 0x26, /* 08 - 0f */
-0x32, 0x31, 0x18, 0x19, 0x10, 0x13, 0x1f, 0x14, /* 10 - 17 */
-0x16, 0x2f, 0x11, 0x2d, 0x15, 0x2c, 0x02, 0x03, /* 18 - 1f */
-0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, /* 20 - 27 */
-0x1c, 0x01, 0x0e, 0x0f, 0x39, 0x0c, 0x0d, 0x1a, /* 28 - 2f */
-0x1b, 0x2b, 0x2b, 0x27, 0x28, 0x29, 0x33, 0x34, /* 30 - 37 */
-0x35, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, /* 38 - 3f */
-0x41, 0x42, 0x43, 0x44, 0x57, 0x58, 0xb7, 0x46, /* 40 - 47 */
-0x7f, 0xd2, 0xc7, 0xc9, 0xd3, 0xcf, 0xd1, 0xcd, /* 48 - 4f */
-0xcb, 0xd0, 0xc8, 0x45, 0xb5, 0x37, 0x4a, 0x4e, /* 50 - 57 */
-0x9c, 0x4f, 0x50, 0x51, 0x4b, 0x4c, 0x4d, 0x47, /* 58 - 5f */
-0x48, 0x49, 0x52, 0x53, 0x56, 0xdd, NN, 0x59, /* 60 - 67 */
-0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, NN, /* 68 - 6f */
- NN, NN, NN, NN, NN, NN, NN, NN, /* 70 - 77 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* 78 - 7f */
- NN, NN, NN, NN, NN, 0x7e, NN, 0x73, /* 80 - 87 */
-0x70, 0x7d, 0x79, 0x7b, 0x5c, NN, NN, NN, /* 88 - 8f */
- NN, NN, 0x78, 0x77, 0x76, NN, NN, NN, /* 90 - 97 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* 98 - 9f */
- NN, NN, NN, NN, NN, NN, NN, NN, /* a0 - a7 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* a8 - af */
- NN, NN, NN, NN, NN, NN, NN, NN, /* b0 - b7 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* b8 - bf */
- NN, NN, NN, NN, NN, NN, NN, NN, /* c0 - c7 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* c8 - cf */
- NN, NN, NN, NN, NN, NN, NN, NN, /* d0 - d7 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* d8 - df */
-0x1d, 0x2a, 0x38, 0xdb, 0x9d, 0x36, 0xb8, 0xdc, /* e0 - e7 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* e8 - ef */
- NN, NN, NN, NN, NN, NN, NN, NN, /* f0 - f7 */
- NN, NN, NN, NN, NN, NN, NN, NN, /* f8 - ff */
+Static const u_int16_t ukbd_trtab[256] = {
+ NN,NN,NN,NN, 0x1e, 0x30, 0x2e, 0x20, /* 00 - 07 */
+0x12, 0x21, 0x22, 0x23, 0x17, 0x24, 0x25, 0x26, /* 08 - 0f */
+0x32, 0x31, 0x18, 0x19, 0x10, 0x13, 0x1f, 0x14, /* 10 - 17 */
+0x16, 0x2f, 0x11, 0x2d, 0x15, 0x2c, 0x02, 0x03, /* 18 - 1f */
+0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, /* 20 - 27 */
+0x1c, 0x01, 0x0e, 0x0f, 0x39, 0x0c, 0x0d, 0x1a, /* 28 - 2f */
+0x1b, 0x2b, 0x2b, 0x27, 0x28, 0x29, 0x33, 0x34, /* 30 - 37 */
+0x35, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, /* 38 - 3f */
+0x41, 0x42, 0x43, 0x44, 0x57, 0x58, 0xb7, 0x46, /* 40 - 47 */
+0x7f, 0xd2, 0xc7, 0xc9, 0xd3, 0xcf, 0xd1, 0xcd, /* 48 - 4f */
+0xcb, 0xd0, 0xc8, 0x45, 0xb5, 0x37, 0x4a, 0x4e, /* 50 - 57 */
+0x9c, 0x4f, 0x50, 0x51, 0x4b, 0x4c, 0x4d, 0x47, /* 58 - 5f */
+0x48, 0x49, 0x52, 0x53, 0x56, 0xdd,0xe05f, 0x59, /* 60 - 67 */
+0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a,NN, /* 68 - 6f */
+ NN,NN,NN,NN,0xf38b,0xf38a,0xf38f,0xf38d, /* 70 - 77 */
+ 0xf396,0xf38e,0xf390,0xf395,0xf392,0xf394,0xf38c,NN, /* 78 - 7f */
+ NN,NN,NN,NN,NN, 0x7e,NN, 0x73, /* 80 - 87 */
+0x70, 0x7d, 0x79, 0x7b,
CVS commit: src/external/gpl3/gcc/dist/gcc/config/m68k
Module Name:src
Committed By: christos
Date: Sun Apr 22 15:15:46 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/m68k: constraints.md
Log Message:
Bring in fix from:
http://gcc.gnu.org/bugzilla/show_bug.cgi?format=multipleid=43804
Allows libmudflap to compile on m68k:
/usr/src/external/gpl3/gcc/dist/libmudflap/mf-hooks1.c: In function
'__mf_wrap_alloca_indirect':
/usr/src/external/gpl3/gcc/dist/libmudflap/mf-hooks1.c:492:1: error:
insn does not satisfy its constraints:
(insn 360 142 68 13
/usr/src/external/gpl3/gcc/dist/libmudflap/mf-impl.h:257 (set (reg/f:SI
6 %d6 [159])
(const:SI (unspec:SI [
(symbol_ref:SI (__mf_state_1) [flags 0x50]
var_decl 0x7f7ff7304d20 __mf_state_1)
(const_int 1 [0x1])
] 6))) 36 {*movsi_m68k}
(nil))/usr/src/external/gpl3/gcc/dist/libmudflap/mf-hooks1.c:492:1:
internal compiler error: in reload_cse_simplify_operands, at postreload.c:396
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/m68k/constraints.md
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/gcc/config/m68k/constraints.md
diff -u src/external/gpl3/gcc/dist/gcc/config/m68k/constraints.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/m68k/constraints.md:1.2
--- src/external/gpl3/gcc/dist/gcc/config/m68k/constraints.md:1.1.1.1 Mon Jun 20 21:22:28 2011
+++ src/external/gpl3/gcc/dist/gcc/config/m68k/constraints.md Sun Apr 22 11:15:46 2012
@@ -94,7 +94,8 @@
(define_constraint T
Used for operands that satisfy 's' when -mpcrel is not in effect.
(and (match_code symbol_ref,label_ref,const)
- (match_test !flag_pic)))
+ (match_test !TARGET_PCREL)
+ (match_test !flag_pic || LEGITIMATE_PIC_OPERAND_P (op
(define_memory_constraint Q
Means address register indirect addressing mode.
CVS commit: src/lib/libc/compat/stdlib
Module Name:src
Committed By: christos
Date: Sun Apr 22 15:55:41 UTC 2012
Modified Files:
src/lib/libc/compat/stdlib: compat_putenv.c
Log Message:
use setenv so that we don't leak memory.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/stdlib/compat_putenv.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/libc/compat/stdlib/compat_putenv.c
diff -u src/lib/libc/compat/stdlib/compat_putenv.c:1.1 src/lib/libc/compat/stdlib/compat_putenv.c:1.2
--- src/lib/libc/compat/stdlib/compat_putenv.c:1.1 Fri Apr 20 13:31:30 2012
+++ src/lib/libc/compat/stdlib/compat_putenv.c Sun Apr 22 11:55:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_putenv.c,v 1.1 2012/04/20 17:31:30 christos Exp $ */
+/* $NetBSD: compat_putenv.c,v 1.2 2012/04/22 15:55:41 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,17 +30,19 @@
*/
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: compat_putenv.c,v 1.1 2012/04/20 17:31:30 christos Exp $);
+__RCSID($NetBSD: compat_putenv.c,v 1.2 2012/04/22 15:55:41 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
#include namespace.h
#include assert.h
-#include string.h
+#include errno.h
#include stdlib.h
+#include string.h
#include compat/include/stdlib.h
+#include env.h
#include reentrant.h
#include local.h
@@ -48,23 +50,35 @@ __RCSID($NetBSD: compat_putenv.c,v 1.1
__weak_alias(putenv,_putenv)
#endif
-__warn_references(unsetenv,
+__warn_references(putenv,
warning: reference to compatibility putenv();
include stdlib.h for correct reference)
/*
* putenv(name) --
- * This version copies the string for compatibility.
+ * This version implicitly copies the string for compatibility.
*/
int
putenv(char *name)
{
+ size_t l_name;
char *copy;
+ int rv;
_DIAGASSERT(name != NULL);
+l_name = __envvarnamelen(name, true);
+if (l_name == 0) {
+errno = EINVAL;
+return -1;
+}
+
if ((copy = strdup(name)) == NULL)
return -1;
+ copy[l_name++] = '\0';
+
+ rv = setenv(copy, copy + l_name, 1);
- return __putenv50(copy);
+ free(copy);
+ return rv;
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Sun Apr 22 16:00:45 UTC 2012 Modified Files: src/sys/dev/ic: com.c Log Message: don't include sys/rnd.h before we define cn_trap, because it might bring in sys/systm.h To generate a diff of this commit: cvs rdiff -u -r1.304 -r1.305 src/sys/dev/ic/com.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/dev/ic/com.c diff -u src/sys/dev/ic/com.c:1.304 src/sys/dev/ic/com.c:1.305 --- src/sys/dev/ic/com.c:1.304 Thu Feb 2 14:43:02 2012 +++ src/sys/dev/ic/com.c Sun Apr 22 12:00:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.304 2012/02/02 19:43:02 tls Exp $ */ +/* $NetBSD: com.c,v 1.305 2012/04/22 16:00:45 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com.c,v 1.304 2012/02/02 19:43:02 tls Exp $); +__KERNEL_RCSID(0, $NetBSD: com.c,v 1.305 2012/04/22 16:00:45 christos Exp $); #include opt_com.h #include opt_ddb.h @@ -76,9 +76,6 @@ __KERNEL_RCSID(0, $NetBSD: com.c,v 1.30 #include opt_ntp.h #include rnd.h -#ifdef RND_COM -#include sys/rnd.h -#endif /* The COM16650 option was renamed to COM_16650. */ #ifdef COM16650 @@ -115,6 +112,10 @@ __KERNEL_RCSID(0, $NetBSD: com.c,v 1.30 #include sys/vnode.h #include sys/kauth.h #include sys/intr.h +#ifdef RND_COM +#include sys/rnd.h +#endif + #include sys/bus.h
CVS commit: [netbsd-6] src/sys/dev/ic
Module Name:src Committed By: riz Date: Sun Apr 22 17:01:44 UTC 2012 Modified Files: src/sys/dev/ic [netbsd-6]: com.c Log Message: Pull up following revision(s) (requested by christos in ticket #190): sys/dev/ic/com.c: revision 1.305 don't includesys/rnd.h before we define cn_trap, because it might bring insys/systm.h To generate a diff of this commit: cvs rdiff -u -r1.304 -r1.304.2.1 src/sys/dev/ic/com.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/dev/ic/com.c diff -u src/sys/dev/ic/com.c:1.304 src/sys/dev/ic/com.c:1.304.2.1 --- src/sys/dev/ic/com.c:1.304 Thu Feb 2 19:43:02 2012 +++ src/sys/dev/ic/com.c Sun Apr 22 17:01:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.304 2012/02/02 19:43:02 tls Exp $ */ +/* $NetBSD: com.c,v 1.304.2.1 2012/04/22 17:01:44 riz Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com.c,v 1.304 2012/02/02 19:43:02 tls Exp $); +__KERNEL_RCSID(0, $NetBSD: com.c,v 1.304.2.1 2012/04/22 17:01:44 riz Exp $); #include opt_com.h #include opt_ddb.h @@ -76,9 +76,6 @@ __KERNEL_RCSID(0, $NetBSD: com.c,v 1.30 #include opt_ntp.h #include rnd.h -#ifdef RND_COM -#include sys/rnd.h -#endif /* The COM16650 option was renamed to COM_16650. */ #ifdef COM16650 @@ -115,6 +112,10 @@ __KERNEL_RCSID(0, $NetBSD: com.c,v 1.30 #include sys/vnode.h #include sys/kauth.h #include sys/intr.h +#ifdef RND_COM +#include sys/rnd.h +#endif + #include sys/bus.h
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sun Apr 22 17:03:05 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Additional pullup for ticket 190 to fix the evbarm build. To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 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.73 src/doc/CHANGES-6.0:1.1.2.74 --- src/doc/CHANGES-6.0:1.1.2.73 Fri Apr 20 23:35:54 2012 +++ src/doc/CHANGES-6.0 Sun Apr 22 17:03:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.73 2012/04/20 23:35:54 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.74 2012/04/22 17:03:05 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -1884,6 +1884,7 @@ sys/kern/kern_rndq.c1.3 sys/kern/subr_cprng.c1.8 sys/sys/cprng.h 1.5 sys/sys/rnd.h 1.31-1.32 +sys/dev/ic/com.c1.305 Address multiple problems with rnd(4)/cprng(9): per-CPU CPRNG, Locking fixes, compilation problems.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: rmind
Date: Sun Apr 22 18:59:41 UTC 2012
Modified Files:
src/sys/arch/x86/x86: mtrr_i686.c
Log Message:
i686_mtrr_init_first: handle the case when there are no variable-size MTRR
registers available (i686_mtrr_vcnt == 0).
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/mtrr_i686.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/x86/x86/mtrr_i686.c
diff -u src/sys/arch/x86/x86/mtrr_i686.c:1.26 src/sys/arch/x86/x86/mtrr_i686.c:1.27
--- src/sys/arch/x86/x86/mtrr_i686.c:1.26 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/x86/x86/mtrr_i686.c Sun Apr 22 18:59:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrr_i686.c,v 1.26 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: mtrr_i686.c,v 1.27 2012/04/22 18:59:41 rmind Exp $ */
/*-
* Copyright (c) 2000, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mtrr_i686.c,v 1.26 2012/04/20 22:23:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: mtrr_i686.c,v 1.27 2012/04/22 18:59:41 rmind Exp $);
#include opt_multiprocessor.h
@@ -336,9 +336,11 @@ i686_mtrr_init_first(void)
kmem_zalloc(MTRR_I686_NFIXED_SOFT * sizeof(struct mtrr), KM_SLEEP);
KASSERT(mtrr_fixed != NULL);
- mtrr_var =
- kmem_zalloc(i686_mtrr_vcnt * sizeof(struct mtrr), KM_SLEEP);
- KASSERT(mtrr_var != NULL);
+ if (i686_mtrr_vcnt) {
+ mtrr_var =
+ kmem_zalloc(i686_mtrr_vcnt * sizeof(struct mtrr), KM_SLEEP);
+ KASSERT(mtrr_var != NULL);
+ }
mtrr_var_raw = mtrr_raw[0];
mtrr_fixed_raw = mtrr_raw[MTRR_I686_NVAR_MAX * 2];
CVS commit: src/share/man/man4
Module Name:src Committed By: dholland Date: Sun Apr 22 19:42:23 UTC 2012 Modified Files: src/share/man/man4: sk.4 Log Message: Update NAME (to include msk, mskc) and clarify checksum offload statements based on PR 36580. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/sk.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/sk.4 diff -u src/share/man/man4/sk.4:1.14 src/share/man/man4/sk.4:1.15 --- src/share/man/man4/sk.4:1.14 Fri Jan 15 19:24:49 2010 +++ src/share/man/man4/sk.4 Sun Apr 22 19:42:23 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sk.4,v 1.14 2010/01/15 19:24:49 joerg Exp $ +.\ $NetBSD: sk.4,v 1.15 2012/04/22 19:42:23 dholland Exp $ .\ .\ Copyright (c) 2003, The NetBSD Foundation, Inc. .\ All rights reserved. @@ -63,7 +63,9 @@ .Os .Sh NAME .Nm sk , -.Nm skc +.Nm skc , +.Nm msk , +.Nm mskc .Nd SysKonnect XMAC II and Marvell GMAC based gigabit ethernet .Sh SYNOPSIS .Cd skc* at pci? dev ? function ? @@ -194,7 +196,8 @@ utility configures the adapter to receiv Using jumbo frames can greatly improve performance for certain tasks, such as file transfers and data streaming. .Pp -Hardware TCP/IP checksum offloading for IPv4 is supported. +Hardware TCP/IP checksum offloading for IPv4 is available but not +supported by the driver. .Pp The following media types and options (as given to .Xr ifconfig 8 )
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: christos Date: Sun Apr 22 20:36:52 UTC 2012 Modified Files: src/sys/arch/i386/i386: compat_16_machdep.c Log Message: From Bob Lee [glee at force10networks dot com], Preserve the have fpu context bit for compat_16 signals, because the old 1.6 context does not deal with the fpu. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/i386/compat_16_machdep.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/i386/i386/compat_16_machdep.c diff -u src/sys/arch/i386/i386/compat_16_machdep.c:1.21 src/sys/arch/i386/i386/compat_16_machdep.c:1.22 --- src/sys/arch/i386/i386/compat_16_machdep.c:1.21 Sat Nov 6 07:40:24 2010 +++ src/sys/arch/i386/i386/compat_16_machdep.c Sun Apr 22 16:36:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_16_machdep.c,v 1.21 2010/11/06 11:40:24 uebayasi Exp $ */ +/* $NetBSD: compat_16_machdep.c,v 1.22 2012/04/22 20:36:52 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: compat_16_machdep.c,v 1.21 2010/11/06 11:40:24 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: compat_16_machdep.c,v 1.22 2012/04/22 20:36:52 christos Exp $); #ifdef _KERNEL_OPT #include opt_vm86.h @@ -260,7 +260,9 @@ sendsig_sigcontext(const ksiginfo_t *ksi /* NOTREACHED */ } + int svufpu = l-l_md.md_flags MDL_USEDFPU; buildcontext(l, sel, catcher, fp); + l-l_md.md_flags |= svufpu; /* Remember that we're now on the signal stack. */ if (onstack)
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: wiz Date: Sun Apr 22 21:27:07 UTC 2012 Modified Files: src/usr.sbin/makemandb: apropos.1 Log Message: Add HISTORY section. From Abhinav Upadhyay in private mail. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makemandb/apropos.1 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/makemandb/apropos.1 diff -u src/usr.sbin/makemandb/apropos.1:1.4 src/usr.sbin/makemandb/apropos.1:1.5 --- src/usr.sbin/makemandb/apropos.1:1.4 Mon Feb 20 18:25:51 2012 +++ src/usr.sbin/makemandb/apropos.1 Sun Apr 22 21:27:07 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: apropos.1,v 1.4 2012/02/20 18:25:51 joerg Exp $ +.\ $NetBSD: apropos.1,v 1.5 2012/04/22 21:27:07 wiz Exp $ .\ .\ Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com .\ All rights reserved. @@ -29,7 +29,7 @@ .\ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd February 20, 2012 +.Dd April 21, 2012 .Dt APROPOS 1 .Os .Sh NAME @@ -114,5 +114,12 @@ The Sqlite FTS database which contains a .Xr man 1 , .Xr whatis 1 , .Xr makemandb 8 +.Sh HISTORY +The +.Nm +command appeared in 3.0BSD. +It was rewritten in +.Nx 6.0 +to support full text search using Sqlite. .Sh AUTHORS .An Abhinav Upadhyay
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: wiz Date: Sun Apr 22 21:29:27 UTC 2012 Modified Files: src/usr.sbin/makemandb: makemandb.8 Log Message: Sync with reality, From Abhinav Upadhyay in private mail. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makemandb/makemandb.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/makemandb/makemandb.8 diff -u src/usr.sbin/makemandb/makemandb.8:1.2 src/usr.sbin/makemandb/makemandb.8:1.3 --- src/usr.sbin/makemandb/makemandb.8:1.2 Mon Feb 20 18:25:51 2012 +++ src/usr.sbin/makemandb/makemandb.8 Sun Apr 22 21:29:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: makemandb.8,v 1.2 2012/02/20 18:25:51 joerg Exp $ +.\ $NetBSD: makemandb.8,v 1.3 2012/04/22 21:29:27 wiz Exp $ .\ .\ Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com .\ All rights reserved. @@ -29,7 +29,7 @@ .\ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd February 20, 2012 +.Dd April 21, 2012 .Dt MAKEMANDB 8 .Os .Sh NAME @@ -94,7 +94,11 @@ The name of the FTS table is mandb and i .It Li env Ta The ENVIRONMENT section. .It Li files Ta The FILES section. .It Li exit_status Ta The EXIT STATUS section. +.It Li diagnostics Ta The DIAGNOSTICS section. .It Li errors Ta The ERRORS section. +.It Li md5_hash Ta MD5 checksum of the man page. +.It Li machine Ta The machine architecture (if any) for which the man +page is relevant. .El .Sh FILES .Bl -hang -width /var/db/man.db -compact
CVS commit: src/usr.bin/login
Module Name:src
Committed By: christos
Date: Sun Apr 22 23:26:19 UTC 2012
Modified Files:
src/usr.bin/login: Makefile common.c common.h k5login.c login.c
login_pam.c
Log Message:
make krb5 compile again. XXX: one function left that is deprecated, what's
the new equivalent?
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/login/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/login/common.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/login/common.h
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/login/k5login.c
cvs rdiff -u -r1.98 -r1.99 src/usr.bin/login/login.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/login/login_pam.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/login/Makefile
diff -u src/usr.bin/login/Makefile:1.52 src/usr.bin/login/Makefile:1.53
--- src/usr.bin/login/Makefile:1.52 Sun Apr 24 17:42:06 2011
+++ src/usr.bin/login/Makefile Sun Apr 22 19:26:19 2012
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2011/04/24 21:42:06 elric Exp $
+# $NetBSD: Makefile,v 1.53 2012/04/22 23:26:19 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
-WARNS?= 2 # XXX -Wcast-qual issues
+WARNS?= 5 # XXX -Wcast-qual issues
.include bsd.own.mk
@@ -25,6 +25,8 @@ CPPFLAGS+=-DLOGIN_CAP -DSUPPORT_UTMP -DS
.if (${USE_KERBEROS} != no)
SRCS+= k5login.c
CPPFLAGS+=-DKERBEROS5
+# XXX: for krb5_get_in_tkt_with_password
+CPPFLAGS+=-DKRB5_DEPRECATED=
DPADD+= ${LIBKRB5} ${LIBASN1}
LDADD+= -lkrb5 -lasn1
Index: src/usr.bin/login/common.c
diff -u src/usr.bin/login/common.c:1.3 src/usr.bin/login/common.c:1.4
--- src/usr.bin/login/common.c:1.3 Tue Dec 29 15:15:15 2009
+++ src/usr.bin/login/common.c Sun Apr 22 19:26:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.3 2009/12/29 20:15:15 christos Exp $ */
+/* $NetBSD: common.c,v 1.4 2012/04/22 23:26:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: common.c,v 1.3 2009/12/29 20:15:15 christos Exp $);
+__RCSID($NetBSD: common.c,v 1.4 2012/04/22 23:26:19 christos Exp $);
#include sys/types.h
#include sys/param.h
@@ -77,11 +77,20 @@ u_int timeout = 300;
void decode_ss(const char *);
struct passwd *pwd;
int failures, have_ss;
-char term[64], *envinit[1], *hostname, *username, *tty, *nested;
+char term[64], *envinit[1], *hostname, *tty, *nested;
+const char *username;
struct timeval now;
struct sockaddr_storage ss;
-void
+char *
+trimloginname(char *u)
+{
+ if (strlen(u) MAXLOGNAME)
+ u[MAXLOGNAME] = '\0';
+ return u;
+}
+
+char *
getloginname(void)
{
int ch;
@@ -104,8 +113,7 @@ getloginname(void)
login names may not start with '-'.\n);
else {
*p = '\0';
-username = nbuf;
-break;
+return nbuf;
}
}
}
@@ -122,7 +130,7 @@ rootterm(char *ttyn)
static jmp_buf motdinterrupt;
void
-motd(char *fname)
+motd(const char *fname)
{
int fd, nchars;
sig_t oldint;
@@ -243,7 +251,7 @@ doutmpx(void)
utmpx.ut_type = USER_PROCESS;
utmpx.ut_pid = getpid();
t = tty + strlen(tty);
- if (t - tty = sizeof(utmpx.ut_id)) {
+ if ((size_t)(t - tty) = sizeof(utmpx.ut_id)) {
(void)strncpy(utmpx.ut_id, t - sizeof(utmpx.ut_id),
sizeof(utmpx.ut_id));
} else {
Index: src/usr.bin/login/common.h
diff -u src/usr.bin/login/common.h:1.1 src/usr.bin/login/common.h:1.2
--- src/usr.bin/login/common.h:1.1 Tue Dec 29 14:26:13 2009
+++ src/usr.bin/login/common.h Sun Apr 22 19:26:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.1 2009/12/29 19:26:13 christos Exp $ */
+/* $NetBSD: common.h,v 1.2 2012/04/22 23:26:19 christos Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -33,8 +33,9 @@ __BEGIN_DECLS
void badlogin(const char *);
void update_db(int, int, int);
-void getloginname(void);
-void motd(char *);
+char *trimloginname(char *);
+char *getloginname(void);
+void motd(const char *);
int rootterm(char *);
void sigint(int);
void sleepexit(int);
@@ -45,7 +46,8 @@ void decode_ss(const char *);
extern u_int timeout;
extern struct passwd *pwd;
extern int failures, have_ss;
-extern char term[64], *envinit[1], *hostname, *username, *tty, *nested;
+extern char term[64], *envinit[1], *hostname, *tty, *nested;
+extern const char *username;
extern struct timeval now;
extern struct sockaddr_storage ss;
extern const char copyrightstr[];
Index: src/usr.bin/login/k5login.c
diff -u src/usr.bin/login/k5login.c:1.27 src/usr.bin/login/k5login.c:1.28
--- src/usr.bin/login/k5login.c:1.27 Thu Mar 23 18:33:28 2006
+++ src/usr.bin/login/k5login.c Sun Apr 22 19:26:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: k5login.c,v 1.27 2006/03/23 23:33:28 wiz Exp $ */
+/* $NetBSD: k5login.c,v 1.28 2012/04/22 23:26:19 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -51,7 +51,7 @@
#if 0
static char sccsid[] = @(#)klogin.c 5.11 (Berkeley)
CVS commit: src/usr.bin/passwd
Module Name:src
Committed By: christos
Date: Sun Apr 22 23:43:51 UTC 2012
Modified Files:
src/usr.bin/passwd: krb5_passwd.c
Log Message:
- fix non pam build
- merge duplicated error code
- fix opt struct leak
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/passwd/krb5_passwd.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/passwd/krb5_passwd.c
diff -u src/usr.bin/passwd/krb5_passwd.c:1.19 src/usr.bin/passwd/krb5_passwd.c:1.20
--- src/usr.bin/passwd/krb5_passwd.c:1.19 Sun Apr 24 17:16:43 2011
+++ src/usr.bin/passwd/krb5_passwd.c Sun Apr 22 19:43:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: krb5_passwd.c,v 1.19 2011/04/24 21:16:43 elric Exp $ */
+/* $NetBSD: krb5_passwd.c,v 1.20 2012/04/22 23:43:51 christos Exp $ */
/*
* Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -45,6 +45,17 @@
#include extern.h
+static void
+pwkrb5_warn(const char *msg, krb5_context context, krb5_error_code ret)
+{
+const char *errtxt = krb5_get_error_message(context, ret);
+if (errtxt != NULL) {
+ warnx(%s: %s, msg, errtxt);
+ krb5_free_error_message(context, errtxt);
+} else
+ warnx(%s: %d, msg, ret);
+}
+
#ifdef USE_PAM
void
@@ -75,7 +86,6 @@ pwkrb5_process(const char *username, int
krb5_data result_code_string, result_string;
char pwbuf[BUFSIZ];
int ch;
- const char *errtxt;
while ((ch = getopt(argc, argv, 5ku:)) != -1) {
switch (ch) {
@@ -131,13 +141,7 @@ pwkrb5_process(const char *username, int
ret = krb5_get_init_creds_opt_alloc(context, opt);
if (ret) {
- errtxt = krb5_get_error_message(context, ret);
- if (errtxt != NULL) {
- warnx(failed to allocate opts: %s, errtxt);
- krb5_free_error_message(context, errtxt);
- } else {
- warnx(failed to allocate opts: %d, ret);
- }
+ pwkrb5_warn(failed to allocate opts, context, ret);
goto bad;
}
@@ -147,13 +151,8 @@ pwkrb5_process(const char *username, int
ret = krb5_parse_name(context, username, principal);
if (ret) {
- errtxt = krb5_get_error_message(context, ret);
- if (errtxt != NULL) {
- warnx(failed to parse principal: %s, errtxt);
- krb5_free_error_message(context, errtxt);
- } else {
- warnx(failed to parse principal: %d, ret);
- }
+ krb5_get_init_creds_opt_free(context, opt);
+ pwkrb5_warn(failed to parse principal, context, ret);
goto bad;
}
@@ -167,7 +166,7 @@ pwkrb5_process(const char *username, int
kadmin/changepw,
opt);
-
+ krb5_get_init_creds_opt_free(context, opt);
switch (ret) {
case 0:
break;
@@ -182,13 +181,7 @@ pwkrb5_process(const char *username, int
goto bad;
default:
- errtxt = krb5_get_error_message(context, ret);
- if (errtxt != NULL) {
- warnx(failed to get credentials: %s, errtxt);
- krb5_free_error_message(context, errtxt);
- } else {
- warnx(failed to get credentials: %d, ret);
- }
+ pwkrb5_warn(failed to get credentials, context, ret);
goto bad;
}
@@ -205,13 +198,7 @@ pwkrb5_process(const char *username, int
result_code_string,
result_string);
if (ret) {
- errtxt = krb5_get_error_message(context, ret);
- if (errtxt != NULL) {
- warnx(unable to set password: %s, errtxt);
- krb5_free_error_message(context, errtxt);
- } else {
- warnx(unable to set password: %d, ret);
- }
+ pwkrb5_warn(unable to set password, context, ret);
goto bad;
}
@@ -283,48 +270,39 @@ krb5_end(void)
krb5_free_context(defcontext);
}
-
int
krb5_chpw(const char *username)
{
krb5_error_code ret;
krb5_context context;
krb5_principal principal;
-krb5_get_init_creds_opt opt;
+krb5_get_init_creds_opt *opt;
krb5_creds cred;
int result_code;
krb5_data result_code_string, result_string;
char pwbuf[BUFSIZ];
-const char *errtxt;
ret = krb5_init_context (context);
if (ret) {
- errtxt = krb5_get_error_message(context, ret);
- if (errtxt != NULL) {
- warnx(failed kerberos initialisation: %s, errtxt);
- krb5_free_error_message(context, errtxt);
- } else {
- warnx(failed kerberos initialisation: %d, ret);
- }
+ pwkrb5_warn(failed kerberos initialisation, context, ret);
return 1;
}
-krb5_get_init_creds_opt_init (opt);
+ret = krb5_get_init_creds_opt_alloc (context, opt);
+if (ret) {
+ pwkrb5_warn(failed to allocate credential opt, context, ret);
+ return 1;
+}
-krb5_get_init_creds_opt_set_tkt_life (opt, 300);
-krb5_get_init_creds_opt_set_forwardable (opt, FALSE);
-krb5_get_init_creds_opt_set_proxiable (opt, FALSE);
+krb5_get_init_creds_opt_set_tkt_life (opt, 300);
+krb5_get_init_creds_opt_set_forwardable (opt, FALSE);
+krb5_get_init_creds_opt_set_proxiable (opt, FALSE);
if(username != NULL) {
ret = krb5_parse_name (context, username, principal);
if (ret) {
- errtxt = krb5_get_error_message(context, ret);
-
CVS commit: src/sys/arch/x68k/x68k
Module Name:src Committed By: isaki Date: Mon Apr 23 05:31:31 UTC 2012 Modified Files: src/sys/arch/x68k/x68k: autoconf.c Log Message: Print a message before enabling interrupts. It's helpful to know when a kernel was hung up. Suggested by tsutsui@, the message is derived from arch/sun3/sun3/autoconf.c. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x68k/x68k/autoconf.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/x68k/autoconf.c diff -u src/sys/arch/x68k/x68k/autoconf.c:1.65 src/sys/arch/x68k/x68k/autoconf.c:1.66 --- src/sys/arch/x68k/x68k/autoconf.c:1.65 Thu Nov 5 18:13:07 2009 +++ src/sys/arch/x68k/x68k/autoconf.c Mon Apr 23 05:31:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.65 2009/11/05 18:13:07 dyoung Exp $ */ +/* $NetBSD: autoconf.c,v 1.66 2012/04/23 05:31:31 isaki Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.65 2009/11/05 18:13:07 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.66 2012/04/23 05:31:31 isaki Exp $); #include opt_compat_netbsd.h #include scsibus.h @@ -68,6 +68,7 @@ cpu_configure(void) panic(no mainbus found); /* Turn on interrupts */ + printf(enabling interrupts\n); (void) spl0(); }
