CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Mon Aug 31 20:48:14 UTC 2009 Modified Files: src/sys/kern: sys_pipe.c Log Message: Turn off pipe's direct I/O again, it corrupts the data (although build and various activity survived while testing this). Corruptions also happen on sparc64 where emap is not in effect, therefore bugs are in direct I/O code. To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/kern/sys_pipe.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/kern/sys_pipe.c diff -u src/sys/kern/sys_pipe.c:1.118 src/sys/kern/sys_pipe.c:1.119 --- src/sys/kern/sys_pipe.c:1.118 Sat Aug 29 00:06:43 2009 +++ src/sys/kern/sys_pipe.c Mon Aug 31 20:48:14 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_pipe.c,v 1.118 2009/08/29 00:06:43 rmind Exp $ */ +/* $NetBSD: sys_pipe.c,v 1.119 2009/08/31 20:48:14 rmind Exp $ */ /*- * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.118 2009/08/29 00:06:43 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.119 2009/08/31 20:48:14 rmind Exp $"); #include #include @@ -99,6 +99,9 @@ * #define PIPE_NODIRECT */ +/* XXX Disabled for now; rare hangs switching between direct/buffered */ +#define PIPE_NODIRECT + static int pipe_read(file_t *, off_t *, struct uio *, kauth_cred_t, int); static int pipe_write(file_t *, off_t *, struct uio *, kauth_cred_t, int); static int pipe_close(file_t *);
CVS commit: src/doc
Module Name:src Committed By: tron Date: Mon Aug 31 19:06:26 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of Postfix 2.6.5. To generate a diff of this commit: cvs rdiff -u -r1.715 -r1.716 src/doc/3RDPARTY cvs rdiff -u -r1.1281 -r1.1282 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/3RDPARTY diff -u src/doc/3RDPARTY:1.715 src/doc/3RDPARTY:1.716 --- src/doc/3RDPARTY:1.715 Wed Aug 19 09:35:01 2009 +++ src/doc/3RDPARTY Mon Aug 31 19:06:25 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.715 2009/08/19 09:35:01 martti Exp $ +# $NetBSD: 3RDPARTY,v 1.716 2009/08/31 19:06:25 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -838,8 +838,8 @@ and more. Package: postfix -Version: 2.6.2 -Current Vers: 2.6.2 +Version: 2.6.5 +Current Vers: 2.6.5 Maintainer: Wietse Venema Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1281 src/doc/CHANGES:1.1282 --- src/doc/CHANGES:1.1281 Thu Aug 27 14:29:22 2009 +++ src/doc/CHANGES Mon Aug 31 19:06:25 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1281 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1282 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -376,3 +376,4 @@ genfb(4) display driver. [jmcneill 20090823] suntcx(4): imported the xf86-video-suntcx driver and added hardware acceleration [macallan 20090827] + postfix(1): Import version 2.6.5 [tron 20090831]
CVS commit: src/external/ibm-public/postfix/dist
Module Name:src Committed By: tron Date: Mon Aug 31 17:57:09 UTC 2009 Modified Files: src/external/ibm-public/postfix/dist/html: postconf.5.html src/external/ibm-public/postfix/dist/man/man5: postconf.5 src/external/ibm-public/postfix/dist/proto: postconf.proto Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.2 -r1.3 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.2 -r1.3 \ src/external/ibm-public/postfix/dist/proto/postconf.proto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/html/postconf.5.html diff -u src/external/ibm-public/postfix/dist/html/postconf.5.html:1.2 src/external/ibm-public/postfix/dist/html/postconf.5.html:1.3 --- src/external/ibm-public/postfix/dist/html/postconf.5.html:1.2 Tue Jun 23 11:41:06 2009 +++ src/external/ibm-public/postfix/dist/html/postconf.5.html Mon Aug 31 17:57:09 2009 @@ -10657,11 +10657,15 @@ commands ahead of time without knowing that Postfix actually supports ESMTP command pipelining. This stops mail from bulk mail software that improperly uses ESMTP command pipelining in order to speed up -deliveries. Note: reject_unauth_pipelining is not useful -outside smtpd_data_restrictions when 1) the client uses ESMTP (EHLO -instead of HELO) and 2) with "smtpd_delay_reject = yes" (the -default). The use of reject_unauth_pipelining in the other -restriction contexts is therefore not recommended. +deliveries. + With Postfix 2.6 and later, the SMTP server sets a per-session +flag whenever it detects illegal pipelining, including pipelined +EHLO or HELO commands. The reject_unauth_pipelining feature simply +tests whether the flag was set at any point in time during the +session. + With older Postfix versions, reject_unauth_pipelining checks +the current status of the input read queue, and its usage is not +recommended in contexts other than smtpd_data_restrictions. reject Index: src/external/ibm-public/postfix/dist/man/man5/postconf.5 diff -u src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.2 src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.3 --- src/external/ibm-public/postfix/dist/man/man5/postconf.5:1.2 Tue Jun 23 11:41:06 2009 +++ src/external/ibm-public/postfix/dist/man/man5/postconf.5 Mon Aug 31 17:57:09 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: postconf.5,v 1.2 2009/06/23 11:41:06 tron Exp $ +.\" $NetBSD: postconf.5,v 1.3 2009/08/31 17:57:09 tron Exp $ .\" .TH POSTCONF 5 .SH NAME @@ -6521,11 +6521,15 @@ that improperly uses ESMTP command pipelining in order to speed up deliveries. .br -Note: reject_unauth_pipelining is not useful -outside smtpd_data_restrictions when 1) the client uses ESMTP (EHLO -instead of HELO) and 2) with "smtpd_delay_reject = yes" (the -default). The use of reject_unauth_pipelining in the other -restriction contexts is therefore not recommended. +With Postfix 2.6 and later, the SMTP server sets a per-session +flag whenever it detects illegal pipelining, including pipelined +EHLO or HELO commands. The reject_unauth_pipelining feature simply +tests whether the flag was set at any point in time during the +session. +.br +With older Postfix versions, reject_unauth_pipelining checks +the current status of the input read queue, and its usage is not +recommended in contexts other than smtpd_data_restrictions. .IP "\fBreject\fR" Reject the request. This restriction is useful at the end of a restriction list, to make the default policy explicit. The Index: src/external/ibm-public/postfix/dist/proto/postconf.proto diff -u src/external/ibm-public/postfix/dist/proto/postconf.proto:1.2 src/external/ibm-public/postfix/dist/proto/postconf.proto:1.3 --- src/external/ibm-public/postfix/dist/proto/postconf.proto:1.2 Tue Jun 23 11:41:06 2009 +++ src/external/ibm-public/postfix/dist/proto/postconf.proto Mon Aug 31 17:57:09 2009 @@ -4939,11 +4939,15 @@ commands ahead of time without knowing that Postfix actually supports ESMTP command pipelining. This stops mail from bulk mail software that improperly uses ESMTP command pipelining in order to speed up -deliveries. Note: reject_unauth_pipelining is not useful -outside smtpd_data_restrictions when 1) the client uses ESMTP (EHLO -instead of HELO) and 2) with "smtpd_delay_reject = yes" (the -default). The use of reject_unauth_pipelining in the other -restriction contexts is therefore not recommended. +deliveries. + With Postfix 2.6 and later, the SMTP server sets a per-session +flag whenever it detects illegal pipelining, including pipelined +EHLO or HELO commands. The reject_unauth_pipelining feature simply +tests whether the flag was set at any point in time during the +session. + With older Postfix versions, reject_unauth_pipelining c
CVS commit: src/sys/arch/cobalt/dev
Module Name:src
Committed By: tsutsui
Date: Mon Aug 31 15:18:55 UTC 2009
Modified Files:
src/sys/arch/cobalt/dev: panel.c
Log Message:
Replace shutdownhook_establish(9) with pmf_device_register1(9).
Also check howto to print appropriate "Rebooting..." or "Halting..." messages.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cobalt/dev/panel.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/cobalt/dev/panel.c
diff -u src/sys/arch/cobalt/dev/panel.c:1.19 src/sys/arch/cobalt/dev/panel.c:1.20
--- src/sys/arch/cobalt/dev/panel.c:1.19 Thu Aug 20 11:43:59 2009
+++ src/sys/arch/cobalt/dev/panel.c Mon Aug 31 15:18:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: panel.c,v 1.19 2009/08/20 11:43:59 tsutsui Exp $ */
+/* $NetBSD: panel.c,v 1.20 2009/08/31 15:18:55 tsutsui Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.19 2009/08/20 11:43:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.20 2009/08/31 15:18:55 tsutsui Exp $");
#include
#include
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
@@ -76,14 +77,18 @@
"NetBSD/cobalt ",
"Starting up... "
};
-static const struct lcd_message shutdown_message = {
+static const struct lcd_message halt_message = {
"NetBSD/cobalt ",
- "Shutting down..."
+ "Halting... "
+};
+static const struct lcd_message reboot_message = {
+ "NetBSD/cobalt ",
+ "Rebooting..."
};
static int panel_match(device_t, cfdata_t, void *);
static void panel_attach(device_t, device_t, void *);
-static void panel_shutdown(void *);
+static bool panel_shutdown(device_t, int);
static void panel_soft(void *);
@@ -158,7 +163,7 @@
hd44780_ddram_io(&sc->sc_lcd, sc->sc_lcd.sc_curchip, &io,
HD_DDRAM_WRITE);
- shutdownhook_establish(panel_shutdown, sc);
+ pmf_device_register1(self, NULL, NULL, panel_shutdown);
sc->sc_kp.sc_iot = maa->ma_iot;
sc->sc_kp.sc_ioh = MIPS_PHYS_TO_KSEG1(PANEL_BASE); /* XXX */
@@ -173,18 +178,23 @@
selinit(&sc->sc_selq);
}
-static void
-panel_shutdown(void *arg)
+static bool
+panel_shutdown(device_t self, int howto)
{
- struct panel_softc *sc = arg;
+ struct panel_softc *sc = device_private(self);
struct hd44780_io io;
/* Goodbye World */
io.dat = 0;
io.len = PANEL_VCOLS * PANEL_ROWS;
- memcpy(io.buf, &shutdown_message, io.len);
+ if (howto & RB_HALT)
+ memcpy(io.buf, &halt_message, io.len);
+ else
+ memcpy(io.buf, &reboot_message, io.len);
hd44780_ddram_io(&sc->sc_lcd, sc->sc_lcd.sc_curchip, &io,
HD_DDRAM_WRITE);
+
+ return true;
}
static uint8_t
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: cube Date: Mon Aug 31 14:48:41 UTC 2009 Modified Files: src/sys/dev/acpi: files.acpi Log Message: Don't reference files that don't exist, and cvs diff before commit. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/dev/acpi/files.acpi 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/files.acpi diff -u src/sys/dev/acpi/files.acpi:1.57 src/sys/dev/acpi/files.acpi:1.58 --- src/sys/dev/acpi/files.acpi:1.57 Tue Aug 18 16:41:02 2009 +++ src/sys/dev/acpi/files.acpi Mon Aug 31 14:48:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.acpi,v 1.57 2009/08/18 16:41:02 jmcneill Exp $ +# $NetBSD: files.acpi,v 1.58 2009/08/31 14:48:41 cube Exp $ include "dev/acpi/acpica/files.acpica" @@ -52,11 +52,6 @@ attach acpibat at acpinodebus file dev/acpi/acpi_bat.c acpibat -# ACPI Display Device -device acpidisplay -attach acpidisplay at acpinodebus -file dev/acpi/acpi_display.c acpidisplay - # ACPI Thermal Zone device acpitz: sysmon_envsys attach acpitz at acpinodebus
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tsutsui Date: Mon Aug 31 13:05:30 UTC 2009 Modified Files: src/sys/dev/ic: rtl8169.c Log Message: Treat 8168DP as well as 8168C/CP/D. From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/dev/ic/rtl8169.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/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.123 src/sys/dev/ic/rtl8169.c:1.124 --- src/sys/dev/ic/rtl8169.c:1.123 Sat Aug 29 14:06:22 2009 +++ src/sys/dev/ic/rtl8169.c Mon Aug 31 13:05:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.123 2009/08/29 14:06:22 tsutsui Exp $ */ +/* $NetBSD: rtl8169.c,v 1.124 2009/08/31 13:05:30 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.123 2009/08/29 14:06:22 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.124 2009/08/31 13:05:30 tsutsui Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -585,6 +585,7 @@ case RTK_HWREV_8168C_SPIN2: case RTK_HWREV_8168CP: case RTK_HWREV_8168D: + case RTK_HWREV_8168DP: sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_MACSTAT | RTKQ_CMDSTOP; /*
CVS commit: src/sys/netinet6
Module Name:src Committed By: yamt Date: Mon Aug 31 12:37:59 UTC 2009 Modified Files: src/sys/netinet6: nd6.c Log Message: nd6_ifattach: fix a missing parens bug in rev.1.132. To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/netinet6/nd6.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/netinet6/nd6.c diff -u src/sys/netinet6/nd6.c:1.133 src/sys/netinet6/nd6.c:1.134 --- src/sys/netinet6/nd6.c:1.133 Thu Aug 6 12:17:11 2009 +++ src/sys/netinet6/nd6.c Mon Aug 31 12:37:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: nd6.c,v 1.133 2009/08/06 12:17:11 cegger Exp $ */ +/* $NetBSD: nd6.c,v 1.134 2009/08/31 12:37:59 yamt Exp $ */ /* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.133 2009/08/06 12:17:11 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.134 2009/08/31 12:37:59 yamt Exp $"); #include "opt_ipsec.h" @@ -177,7 +177,7 @@ * here. */ nd->flags = (ND6_IFF_PERFORMNUD | - ip6_accept_rtadv ? ND6_IFF_ACCEPT_RTADV : 0); + (ip6_accept_rtadv ? ND6_IFF_ACCEPT_RTADV : 0)); /* XXX: we cannot call nd6_setmtu since ifp is not fully initialized */ nd6_setmtu0(ifp, nd);
CVS commit: src/games/phantasia
Module Name:src Committed By: dholland Date: Mon Aug 31 08:27:16 UTC 2009 Modified Files: src/games/phantasia: fight.c gamesupport.c interplayer.c io.c main.c misc.c phantglobs.c setup.c Removed Files: src/games/phantasia: include.h Log Message: Dumping all system includes anything uses in one big header file is so 1986. XXX: Removing unused declarations (thus, unused headers can trigger XXX: it) sometimes causes gcc to generate substantially different XXX: code. Dunno why but it looks rather like a gcc bug. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/games/phantasia/fight.c cvs rdiff -u -r1.10 -r1.11 src/games/phantasia/gamesupport.c cvs rdiff -u -r1.6 -r0 src/games/phantasia/include.h cvs rdiff -u -r1.11 -r1.12 src/games/phantasia/interplayer.c cvs rdiff -u -r1.13 -r1.14 src/games/phantasia/io.c cvs rdiff -u -r1.22 -r1.23 src/games/phantasia/main.c cvs rdiff -u -r1.18 -r1.19 src/games/phantasia/misc.c cvs rdiff -u -r1.5 -r1.6 src/games/phantasia/phantglobs.c cvs rdiff -u -r1.20 -r1.21 src/games/phantasia/setup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/phantasia/fight.c diff -u src/games/phantasia/fight.c:1.12 src/games/phantasia/fight.c:1.13 --- src/games/phantasia/fight.c:1.12 Wed Aug 12 08:21:41 2009 +++ src/games/phantasia/fight.c Mon Aug 31 08:27:16 2009 @@ -1,10 +1,19 @@ -/* $NetBSD: fight.c,v 1.12 2009/08/12 08:21:41 dholland Exp $ */ +/* $NetBSD: fight.c,v 1.13 2009/08/31 08:27:16 dholland Exp $ */ /* * fight.c Phantasia monster fighting routines */ -#include "include.h" +#include +#include +#include +#include + +#include "macros.h" +#include "phantdefs.h" +#include "phantstruct.h" +#include "phantglobs.h" + #undef bool #include Index: src/games/phantasia/gamesupport.c diff -u src/games/phantasia/gamesupport.c:1.10 src/games/phantasia/gamesupport.c:1.11 --- src/games/phantasia/gamesupport.c:1.10 Mon May 25 23:08:45 2009 +++ src/games/phantasia/gamesupport.c Mon Aug 31 08:27:16 2009 @@ -1,10 +1,19 @@ -/* $NetBSD: gamesupport.c,v 1.10 2009/05/25 23:08:45 dholland Exp $ */ +/* $NetBSD: gamesupport.c,v 1.11 2009/08/31 08:27:16 dholland Exp $ */ /* * gamesupport.c - auxiliary routines for support of Phantasia */ -#include "include.h" +#include +#include +#include +#include + +#include "phantdefs.h" +#include "phantstruct.h" +#include "phantglobs.h" +#include "pathnames.h" + #undef bool #include Index: src/games/phantasia/interplayer.c diff -u src/games/phantasia/interplayer.c:1.11 src/games/phantasia/interplayer.c:1.12 --- src/games/phantasia/interplayer.c:1.11 Wed Aug 12 08:21:41 2009 +++ src/games/phantasia/interplayer.c Mon Aug 31 08:27:16 2009 @@ -1,10 +1,21 @@ -/* $NetBSD: interplayer.c,v 1.11 2009/08/12 08:21:41 dholland Exp $ */ +/* $NetBSD: interplayer.c,v 1.12 2009/08/31 08:27:16 dholland Exp $ */ /* * interplayer.c - player to player routines for Phantasia */ -#include "include.h" +#include +#include +#include +#include +#include + +#include "macros.h" +#include "phantdefs.h" +#include "phantstruct.h" +#include "phantglobs.h" +#include "pathnames.h" + #undef bool #include Index: src/games/phantasia/io.c diff -u src/games/phantasia/io.c:1.13 src/games/phantasia/io.c:1.14 --- src/games/phantasia/io.c:1.13 Wed Aug 12 08:21:41 2009 +++ src/games/phantasia/io.c Mon Aug 31 08:27:16 2009 @@ -1,12 +1,26 @@ -/* $NetBSD: io.c,v 1.13 2009/08/12 08:21:41 dholland Exp $ */ +/* $NetBSD: io.c,v 1.14 2009/08/31 08:27:16 dholland Exp $ */ /* * io.c - input/output routines for Phantasia */ -#include "include.h" -#undef bool #include + +#include +#include +#include +#include +#include +#include +#include + +#include "macros.h" +#include "phantdefs.h" +#include "phantstruct.h" +#include "phantglobs.h" +//#include "pathnames.h" + +#undef bool #include static void catchalarm(int) __dead; Index: src/games/phantasia/main.c diff -u src/games/phantasia/main.c:1.22 src/games/phantasia/main.c:1.23 --- src/games/phantasia/main.c:1.22 Wed Aug 12 08:21:41 2009 +++ src/games/phantasia/main.c Mon Aug 31 08:27:16 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.22 2009/08/12 08:21:41 dholland Exp $ */ +/* $NetBSD: main.c,v 1.23 2009/08/31 08:27:16 dholland Exp $ */ /* * Phantasia 3.3.2 -- Interterminal fantasy game @@ -27,10 +27,25 @@ * AT&T is in no way connected with this game. */ -#include #include +#include #include +#include #include +#include +#include +#include +#include +#include + +#include "macros.h" +#include "phantdefs.h" +#include "phantstruct.h" +#include "phantglobs.h" +#include "pathnames.h" + +#undef bool +#include /* * The program allocates as much file space as it needs to store characters, @@ -57,10 +72,6 @@ * main.c Main routines for Phantasia */ -#include "include.h" -#undef bool -#include - static void genchar(i
CVS commit: src/usr.bin/config
Module Name:src Committed By: wiz Date: Mon Aug 31 07:45:24 UTC 2009 Modified Files: src/usr.bin/config: config.1 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/config/config.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/config/config.1 diff -u src/usr.bin/config/config.1:1.9 src/usr.bin/config/config.1:1.10 --- src/usr.bin/config/config.1:1.9 Mon Aug 31 03:39:00 2009 +++ src/usr.bin/config/config.1 Mon Aug 31 07:45:24 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: config.1,v 1.9 2009/08/31 03:39:00 cube Exp $ +.\" $NetBSD: config.1,v 1.10 2009/08/31 07:45:24 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -86,7 +86,7 @@ is a tool for the kernel developer and generates a .Dq lint configuration file to be used during regression testing. -Refer to section +Refer to section .Sx LINT CONFIGURATION for the details of that use of .Nm . @@ -100,7 +100,8 @@ as the kernel build directory, instead of computing and creating one automatically. .It Fl L -Generate a lint configuration. See section +Generate a lint configuration. +See section .Sx LINT CONFIGURATION for details. .It Fl P
CVS commit: src/bin/rcp
Module Name:src
Committed By: dholland
Date: Mon Aug 31 07:11:17 UTC 2009
Modified Files:
src/bin/rcp: rcp.c
Log Message:
Fix up seriously borked mallocing of a static buffer, which seems to
have been this way since at least 4.4. This will still dump core if
malloc fails on the first trip through, instead of on any malloc
failure, but should otherwise behave much more reasonably.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/bin/rcp/rcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/rcp/rcp.c
diff -u src/bin/rcp/rcp.c:1.47 src/bin/rcp/rcp.c:1.48
--- src/bin/rcp/rcp.c:1.47 Sun Jul 20 00:52:40 2008
+++ src/bin/rcp/rcp.c Mon Aug 31 07:11:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rcp.c,v 1.47 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $ */
/*
* Copyright (c) 1983, 1990, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: rcp.c,v 1.47 2008/07/20 00:52:40 lukem Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $");
#endif
#endif /* not lint */
@@ -583,15 +583,22 @@
SCREWUP("size not delimited");
if (targisdir) {
static char *namebuf;
- static int cursize;
+ static size_t cursize;
+ char *newnamebuf;
size_t need;
need = strlen(targ) + strlen(cp) + 250;
if (need > cursize) {
-if (!(namebuf = malloc(need)))
+newnamebuf = realloc(namebuf, need);
+if (newnamebuf != NULL) {
+ namebuf = newnamebuf;
+ cursize = need;
+} else {
+ /* note: run_err is not fatal */
run_err("%s", strerror(errno));
+}
}
- (void)snprintf(namebuf, need, "%s%s%s", targ,
+ (void)snprintf(namebuf, cursize, "%s%s%s", targ,
*targ ? "/" : "", cp);
np = namebuf;
} else
