CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Oct 6 08:27:00 UTC 2013 Modified Files: src/share/man/man4: netintro.4 Log Message: bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man4/netintro.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/netintro.4 diff -u src/share/man/man4/netintro.4:1.26 src/share/man/man4/netintro.4:1.27 --- src/share/man/man4/netintro.4:1.26 Sat Oct 5 23:16:54 2013 +++ src/share/man/man4/netintro.4 Sun Oct 6 08:27:00 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: netintro.4,v 1.26 2013/10/05 23:16:54 christos Exp $ +.\ $NetBSD: netintro.4,v 1.27 2013/10/06 08:27:00 wiz Exp $ .\ .\ Copyright (c) 1983, 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)netintro.4 8.2 (Berkeley) 11/30/93 .\ -.Dd February 5, 2013 +.Dd October 5, 2013 .Dt NETINTRO 4 .Os .Sh NAME
CVS commit: src/sbin/fdisk
Module Name:src Committed By: apb Date: Sun Oct 6 12:27:15 UTC 2013 Modified Files: src/sbin/fdisk: fdisk.8 Log Message: Suggest using -b 1023/255/63 for modern disks where the BIOS is configured to use LBA-Assisted translation. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sbin/fdisk/fdisk.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/fdisk/fdisk.8 diff -u src/sbin/fdisk/fdisk.8:1.80 src/sbin/fdisk/fdisk.8:1.81 --- src/sbin/fdisk/fdisk.8:1.80 Sat Oct 6 09:11:34 2012 +++ src/sbin/fdisk/fdisk.8 Sun Oct 6 12:27:15 2013 @@ -1,6 +1,6 @@ -.\ $NetBSD: fdisk.8,v 1.80 2012/10/06 09:11:34 wiz Exp $ +.\ $NetBSD: fdisk.8,v 1.81 2013/10/06 12:27:15 apb Exp $ .\ -.Dd April 6, 2012 +.Dd October 6, 2013 .Dt FDISK 8 .Os .Sh NAME @@ -190,6 +190,12 @@ amd64) or by solving the simultaenous eq information. If that fails then either the geometry from the disklabel or 63 sectors and 16 heads is used. +For modern disks larger than about 8GB, and where the BIOS is configured +to use LBA-Assisted translation, a setting of +.Fl b Ar 1023/255/63 +is likely to work. +.\ see http://web.inter.nl.net/hcc/J.Steunebrink/bioslim.htm#LBA +.\ for a table of C/H/S values used in LBA-Assisted translation mode .It Fl c Ar bootcode Specify the filename that .Nm
CVS commit: src/usr.bin/man
Module Name:src
Committed By: christos
Date: Sun Oct 6 16:29:26 UTC 2013
Modified Files:
src/usr.bin/man: man.c
Log Message:
Be more permissive in interpreting man pages as filenames, from Franco
Fichter via dfly. fixes:
$ man usr.bin/man/man.1
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/man/man.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/man/man.c
diff -u src/usr.bin/man/man.c:1.56 src/usr.bin/man/man.c:1.57
--- src/usr.bin/man/man.c:1.56 Tue Jul 30 11:10:04 2013
+++ src/usr.bin/man/man.c Sun Oct 6 12:29:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.56 2013/07/30 15:10:04 joerg Exp $ */
+/* $NetBSD: man.c,v 1.57 2013/10/06 16:29:26 christos Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = @(#)man.c 8.17 (Berkeley) 1/31/95;
#else
-__RCSID($NetBSD: man.c,v 1.56 2013/07/30 15:10:04 joerg Exp $);
+__RCSID($NetBSD: man.c,v 1.57 2013/10/06 16:29:26 christos Exp $);
#endif
#endif /* not lint */
@@ -536,10 +536,10 @@ manual(char *page, struct manstate *mp,
*eptr = '\0';
/*
- * If 'page' is given with a full or relative path
- * then interpret it as a file specification.
+ * If 'page' contains a slash then it's
+ * interpreted as a file specification.
*/
- if ((page[0] == '/') || (page[0] == '.')) {
+ if (strchr(page, '/') != NULL) {
/* check if file actually exists */
(void)strlcpy(buf, escpage, sizeof(buf));
error = glob(buf, GLOB_APPEND | GLOB_BRACE | GLOB_NOSORT, NULL, pg);
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: jakllsch
Date: Sun Oct 6 16:34:49 UTC 2013
Modified Files:
src/sys/arch/x86/acpi: acpi_machdep.c
Log Message:
Correct acpi_md_OsWritable() logic so that it can return TRUE.
From Masanori Kanaoka in PR 47571.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/acpi/acpi_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/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.6 src/sys/arch/x86/acpi/acpi_machdep.c:1.7
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.6 Sun Mar 31 19:34:24 2013
+++ src/sys/arch/x86/acpi/acpi_machdep.c Sun Oct 6 16:34:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.6 2013/03/31 19:34:24 chs Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.7 2013/10/06 16:34:48 jakllsch Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_machdep.c,v 1.6 2013/03/31 19:34:24 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_machdep.c,v 1.7 2013/10/06 16:34:48 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -297,7 +297,7 @@ acpi_md_OsReadable(void *Pointer, uint32
BOOLEAN
acpi_md_OsWritable(void *Pointer, uint32_t Length)
{
- BOOLEAN rv = FALSE;
+ BOOLEAN rv = TRUE;
vaddr_t sva, eva;
pt_entry_t *pte;
CVS commit: src/usr.bin/man
Module Name:src
Committed By: christos
Date: Sun Oct 6 17:14:49 UTC 2013
Modified Files:
src/usr.bin/man: man.c
Log Message:
add more compression suffixes and local suffixes.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/man/man.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/man/man.c
diff -u src/usr.bin/man/man.c:1.58 src/usr.bin/man/man.c:1.59
--- src/usr.bin/man/man.c:1.58 Sun Oct 6 12:43:41 2013
+++ src/usr.bin/man/man.c Sun Oct 6 13:14:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.58 2013/10/06 16:43:41 christos Exp $ */
+/* $NetBSD: man.c,v 1.59 2013/10/06 17:14:49 christos Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = @(#)man.c 8.17 (Berkeley) 1/31/95;
#else
-__RCSID($NetBSD: man.c,v 1.58 2013/10/06 16:43:41 christos Exp $);
+__RCSID($NetBSD: man.c,v 1.59 2013/10/06 17:14:49 christos Exp $);
#endif
#endif /* not lint */
@@ -556,11 +556,13 @@ manual(char *page, struct manstate *mp,
/* clip suffix for the suffix check below */
if ((p = strrchr(escpage, '.')) != NULL) {
- if (strcmp(p, .gz) == 0 || strcmp(p, .bz2) == 0) {
+ /* Should get suffixes from the configuration file */
+ if (strcmp(p, .gz) == 0 || strcmp(p, .bz2) == 0 ||
+ strcmp(p, .Z) == 0 || strcmp(p, .xz) == 0) {
*p = '\0';
p = strrchr(escpage, '.');
}
- if (p isdigit((unsigned char)p[1]))
+ if (p strchr(0123456789ln, p[1]) != NULL)
*p = '\0';
}
CVS commit: src/usr.bin/man
Module Name:src
Committed By: christos
Date: Sun Oct 6 16:43:41 UTC 2013
Modified Files:
src/usr.bin/man: man.c
Log Message:
Recognize .gz and .bz2 suffixes so $ man ./man.1.gz works. From Franco Fichter
via dfly.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/man/man.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/man/man.c
diff -u src/usr.bin/man/man.c:1.57 src/usr.bin/man/man.c:1.58
--- src/usr.bin/man/man.c:1.57 Sun Oct 6 12:29:26 2013
+++ src/usr.bin/man/man.c Sun Oct 6 12:43:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.57 2013/10/06 16:29:26 christos Exp $ */
+/* $NetBSD: man.c,v 1.58 2013/10/06 16:43:41 christos Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = @(#)man.c 8.17 (Berkeley) 1/31/95;
#else
-__RCSID($NetBSD: man.c,v 1.57 2013/10/06 16:29:26 christos Exp $);
+__RCSID($NetBSD: man.c,v 1.58 2013/10/06 16:43:41 christos Exp $);
#endif
#endif /* not lint */
@@ -555,9 +555,14 @@ manual(char *page, struct manstate *mp,
goto notfound;
/* clip suffix for the suffix check below */
- p = strrchr(escpage, '.');
- if (p p[0] == '.' isdigit((unsigned char)p[1]))
- p[0] = '\0';
+ if ((p = strrchr(escpage, '.')) != NULL) {
+ if (strcmp(p, .gz) == 0 || strcmp(p, .bz2) == 0) {
+*p = '\0';
+p = strrchr(escpage, '.');
+ }
+ if (p isdigit((unsigned char)p[1]))
+*p = '\0';
+ }
found = 0;
for (cnt = pg-gl_pathc - pg-gl_matchc;
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: jym Date: Sun Oct 6 17:25:34 UTC 2013 Modified Files: src/crypto/external/bsd/openssh/dist: ssh_config Log Message: Enable VerifyHostKeyDNS (SSHFP records verification) from DNS for hosts under NetBSD.org domain. Multiple TNF hosts have an up-to-date SSHFP record inside the DNS. This offers a second channel verification for host key fingerprints (weaker than known_hosts, but spoofing a host on first connect would also require DNS forgery). This can provide a trusted second channel (like DANE TLSA records) once DNSSEC gets more widely used, but for now it is purely informational. No regression expected, except that the ssh client will print a message upon first connect to confirm/infirm that it got a correct SSHFP record from DNS. Only done for NetBSD.org domain, SSHFP are sadly more an exception than the rule. Notified on netbsd-users@, no objection after a week -- committed. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/ssh_config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/ssh_config diff -u src/crypto/external/bsd/openssh/dist/ssh_config:1.4 src/crypto/external/bsd/openssh/dist/ssh_config:1.5 --- src/crypto/external/bsd/openssh/dist/ssh_config:1.4 Sun Nov 21 18:29:49 2010 +++ src/crypto/external/bsd/openssh/dist/ssh_config Sun Oct 6 17:25:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_config,v 1.4 2010/11/21 18:29:49 adam Exp $ +# $NetBSD: ssh_config,v 1.5 2013/10/06 17:25:34 jym Exp $ # $OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $ # This is the ssh client system-wide configuration file. See @@ -48,3 +48,7 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # If you use xorg from pkgsrc then uncomment the following line. # XAuthLocation /usr/pkg/bin/xauth + +# NetBSD.org DNS provides SSHFP records - use them when possible +Host *.netbsd.org *.NetBSD.org +VerifyHostKeyDNS ask
CVS commit: src
Module Name:src
Committed By: ast
Date: Sun Oct 6 21:05:50 UTC 2013
Modified Files:
src/bin/sh: expand.c
src/tests/bin/sh: t_expand.sh
Log Message:
Fix PR bin/48202 [non-critical/low]:
sh +nounset and `for X; do` iteration fails if parameter set empty
by applying and testing FreeBSD's patch of Oct 24 2009 for this; see
http://svnweb.freebsd.org/base/head/bin/sh/expand.c?r1=198453r2=198454
Also created an ATF test in tests/bin/sh/t_expand.sh for this error and
corrected a space-tabs problem there as well.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/bin/sh/expand.c
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.89 src/bin/sh/expand.c:1.90
--- src/bin/sh/expand.c:1.89 Wed Oct 2 19:52:58 2013
+++ src/bin/sh/expand.c Sun Oct 6 21:05:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.89 2013/10/02 19:52:58 christos Exp $ */
+/* $NetBSD: expand.c,v 1.90 2013/10/06 21:05:50 ast Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)expand.c 8.5 (Berkeley) 5/15/95;
#else
-__RCSID($NetBSD: expand.c,v 1.89 2013/10/02 19:52:58 christos Exp $);
+__RCSID($NetBSD: expand.c,v 1.90 2013/10/06 21:05:50 ast Exp $);
#endif
#endif /* not lint */
@@ -667,7 +667,7 @@ again: /* jump here after setting a vari
varlen = 0;
startloc = expdest - stackblock();
- if (!set uflag) {
+ if (!set uflag *var != '@' *var != '*') {
switch (subtype) {
case VSNORMAL:
case VSTRIMLEFT:
Index: src/tests/bin/sh/t_expand.sh
diff -u src/tests/bin/sh/t_expand.sh:1.1 src/tests/bin/sh/t_expand.sh:1.2
--- src/tests/bin/sh/t_expand.sh:1.1 Sat Mar 17 16:33:11 2012
+++ src/tests/bin/sh/t_expand.sh Sun Oct 6 21:05:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: t_expand.sh,v 1.2 2013/10/06 21:05:50 ast Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,7 +37,7 @@ delim_argv() {
else
str=${str} $1
fi
-shift
+ shift
done
echo ${str}
}
@@ -119,10 +119,24 @@ arithmetic_body() {
atf_check_equal '9223372036854775807' '$(((1 63) - 1))'
}
+atf_test_case iteration_on_null_parameter
+iteration_on_null_parameter_head() {
+ atf_set descr Check iteration of \$@ in for loop when set to null; \
+ the error \sh: @: parameter not set\ is incorrect. \
+ PR bin/48202.
+}
+iteration_on_null_parameter_body() {
+ s1=`/bin/sh -uc 'N=; set -- ${N}; for X; do echo [$X]; done' 21`
+ s2=`/bin/sh -uc 'N=; set -- ${N:-}; for X; do echo [$X]; done' 21`
+ atf_check_equal '' '$s1'
+ atf_check_equal '[]' '$s2'
+}
+
atf_init_test_cases() {
atf_add_test_case dollar_at
atf_add_test_case dollar_at_with_text
atf_add_test_case strip
atf_add_test_case varpattern_backslashes
atf_add_test_case arithmetic
+ atf_add_test_case iteration_on_null_parameter
}
CVS commit: src/usr.bin/cdplay
Module Name:src
Committed By: dholland
Date: Mon Oct 7 00:16:19 UTC 2013
Modified Files:
src/usr.bin/cdplay: cdplay.c
Log Message:
Merge some of the cleanup from PR 21894. Do a bit more of my own.
lint still squawks quite a bit, and it woudl probably be worthwhile
for someone to go through and make all the signedness consistent, but
I think I've got the valuable bits.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/cdplay/cdplay.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/cdplay/cdplay.c
diff -u src/usr.bin/cdplay/cdplay.c:1.46 src/usr.bin/cdplay/cdplay.c:1.47
--- src/usr.bin/cdplay/cdplay.c:1.46 Wed Jan 4 17:26:21 2012
+++ src/usr.bin/cdplay/cdplay.c Mon Oct 7 00:16:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cdplay.c,v 1.46 2012/01/04 17:26:21 drochner Exp $ */
+/* $NetBSD: cdplay.c,v 1.47 2013/10/07 00:16:19 dholland Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: cdplay.c,v 1.46 2012/01/04 17:26:21 drochner Exp $);
+__RCSID($NetBSD: cdplay.c,v 1.47 2013/10/07 00:16:19 dholland Exp $);
#endif /* not lint */
#include sys/types.h
@@ -164,7 +164,7 @@ static EditLine *elptr;
static int get_status(int *, int *, int *, int *, int *);
static void help(void);
-static int info(const char *);
+static int info(void);
static void lba2msf(u_long, u_int *, u_int *, u_int *);
static u_int msf2lba(u_int, u_int, u_int);
static int opencd(void);
@@ -175,11 +175,11 @@ static int play_blocks(int, int);
static int play_digital(int, int);
static int play_msf(int, int, int, int, int, int);
static int play_track(int, int, int, int);
-static int print_status(const char *);
+static int print_status(void);
static void print_track(struct cd_toc_entry *);
static const char *prompt(void);
static int readaudio(int, int, int, u_char *);
-static int read_toc_entrys(int);
+static int read_toc_entries(int);
static int run(int, const char *);
static int start_analog(void);
static int start_digital(const char *);
@@ -199,10 +199,11 @@ main(int argc, char **argv)
const char *arg;
char buf[80], *p;
static char defdev[16];
- int cmd, len, c;
+ int cmd, c;
+ size_t len;
char *line;
const char *elline;
- int scratch, rv;
+ int scratch;
struct sigaction sa_timer;
const char *use_digital = NULL; /* historical default */
@@ -255,7 +256,7 @@ main(int argc, char **argv)
sigemptyset(sa_timer.sa_mask);
sa_timer.sa_handler = sig_timer;
sa_timer.sa_flags = SA_RESTART;
- if ((rv = sigaction(SIGALRM, sa_timer, NULL)) 0)
+ if (sigaction(SIGALRM, sa_timer, NULL) 0)
err(EXIT_FAILURE, sigaction());
if (use_digital)
@@ -441,11 +442,11 @@ run(int cmd, const char *arg)
switch (cmd) {
case CMD_INFO:
- rv = info(arg);
+ rv = info();
break;
case CMD_STATUS:
- rv = print_status(arg);
+ rv = print_status();
break;
case CMD_PAUSE:
@@ -486,14 +487,15 @@ run(int cmd, const char *arg)
if (digital)
da.playing = 0;
if (shuffle)
- run(CMD_SHUFFLE, NULL);
+ rv = run(CMD_SHUFFLE, NULL);
if (ioctl(fd, CDIOCALLOW) 0)
warn(ioctl(CDIOCALLOW));
IOCTL_SIMPLE(fd, CDIOCEJECT);
break;
case CMD_CLOSE:
- ioctl(fd, CDIOCALLOW);
+ if (ioctl(fd, CDIOCALLOW) 0)
+ warn(ioctl(CDIOCALLOW));
IOCTL_SIMPLE(fd, CDIOCCLOSE);
if (interactive fd == -1)
opencd();
@@ -585,7 +587,7 @@ run(int cmd, const char *arg)
if (!shuffle)
warnx(`skip' valid only in shuffle mode);
else
- skip(0, 1);
+ rv = skip(0, 1);
break;
case CMD_SET:
@@ -656,7 +658,7 @@ play(const char *arg, int fromuser)
end = 0;
istart = iend = 1;
n = h.ending_track - h.starting_track + 1;
- rv = read_toc_entrys((n + 1) * sizeof(struct cd_toc_entry));
+ rv = read_toc_entries((n + 1) * sizeof(struct cd_toc_entry));
if (rv 0)
return (rv);
@@ -968,7 +970,7 @@ strstatus(int sts)
}
static int
-print_status(const char *arg)
+print_status(void)
{
struct cd_sub_channel_info data;
struct ioc_read_subchannel ss;
@@ -1004,7 +1006,7 @@ print_status(const char *arg)
ss.address_format = msf ? CD_MSF_FORMAT : CD_LBA_FORMAT;
ss.data_format = CD_MEDIA_CATALOG;
- if (!digital ioctl(fd, CDIOCREADSUBCHANNEL, (char *) ss) = 0) {
+ if (!digital ioctl(fd, CDIOCREADSUBCHANNEL, ss) = 0) {
printf(media catalog:\t%sactive,
ss.data-what.media_catalog.mc_valid ? : in);
if (ss.data-what.media_catalog.mc_valid
@@ -1029,7 +1031,7 @@ print_status(const char *arg)
}
static int
-info(const char *arg)
+info(void)
{
struct ioc_toc_header h;
int rc, i, n;
@@ -1040,7 +1042,7 @@ info(const char *arg)
}
n = h.ending_track - h.starting_track + 1;
- rc = read_toc_entrys((n + 1) * sizeof(struct cd_toc_entry));
+ rc = read_toc_entries((n + 1) * sizeof(struct cd_toc_entry));
if (rc 0)
return (rc);
@@ -1190,7 +1192,7 @@ setvol(int
CVS commit: src/usr.bin/iconv
Module Name:src
Committed By: dholland
Date: Mon Oct 7 02:00:46 UTC 2013
Modified Files:
src/usr.bin/iconv: iconv.c
Log Message:
Save errno around fwrite(), which can otherwise trash it; PR 47813.
This appears to fully resolve the problem described in the PR, even
though one might think it wouldn't.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/iconv/iconv.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/iconv/iconv.c
diff -u src/usr.bin/iconv/iconv.c:1.18 src/usr.bin/iconv/iconv.c:1.19
--- src/usr.bin/iconv/iconv.c:1.18 Mon Oct 31 13:27:51 2011
+++ src/usr.bin/iconv/iconv.c Mon Oct 7 02:00:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iconv.c,v 1.18 2011/10/31 13:27:51 yamt Exp $ */
+/* $NetBSD: iconv.c,v 1.19 2013/10/07 02:00:46 dholland Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: iconv.c,v 1.18 2011/10/31 13:27:51 yamt Exp $);
+__RCSID($NetBSD: iconv.c,v 1.19 2013/10/07 02:00:46 dholland Exp $);
#endif /* LIBC_SCCS and not lint */
#include err.h
@@ -99,6 +99,7 @@ do_conv(const char *fn, FILE *fp, const
size_t inbytes, outbytes, ret, invalids;
iconv_t cd;
uint32_t flags = 0;
+ int serrno;
if (hide_invalid)
flags |= __ICONV_F_HIDE_INVALID;
@@ -116,10 +117,12 @@ do_conv(const char *fn, FILE *fp, const
outbytes = OUTBUFSIZE;
ret = __iconv(cd, in, inbytes, out, outbytes,
flags, inval);
+ serrno = errno;
invalids += inval;
if (outbytes OUTBUFSIZE)
(void)fwrite(outbuf, 1, OUTBUFSIZE - outbytes,
stdout);
+ errno = serrno;
if (ret == (size_t)-1 errno != E2BIG) {
/*
* XXX: iconv(3) is bad interface.
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: dholland Date: Mon Oct 7 04:04:58 UTC 2013 Modified Files: src/share/man/man4/man4.x86: vmt.4 Log Message: Update SYNOPSIS; PR 48080. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.x86/vmt.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.x86/vmt.4 diff -u src/share/man/man4/man4.x86/vmt.4:1.5 src/share/man/man4/man4.x86/vmt.4:1.6 --- src/share/man/man4/man4.x86/vmt.4:1.5 Sat Jul 20 21:39:59 2013 +++ src/share/man/man4/man4.x86/vmt.4 Mon Oct 7 04:04:57 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: vmt.4,v 1.5 2013/07/20 21:39:59 wiz Exp $ +.\ $NetBSD: vmt.4,v 1.6 2013/10/07 04:04:57 dholland Exp $ .\ $OpenBSD: vmt.4,v 1.4 2010/10/26 05:07:31 jmc Exp $ .\ .\ Copyright (c) 2008 Marco Peereboom ma...@openbsd.org @@ -15,14 +15,14 @@ .\ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\ ACTION OF CONTRACT, NEGLIGENCE OR TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd March 16, 2013 +.Dd October 6, 2013 .Dt VMT 4 x86 .Os .Sh NAME .Nm vmt .Nd VMware Tools driver .Sh SYNOPSIS -.Cd vmt0 at cpufeaturebus* +.Cd vmt0 at cpu0 .Sh DESCRIPTION The .Nm
CVS commit: src/sbin/route
Module Name:src Committed By: dholland Date: Mon Oct 7 05:06:45 UTC 2013 Modified Files: src/sbin/route: route.8 Log Message: english usage patrol To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sbin/route/route.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/route/route.8 diff -u src/sbin/route/route.8:1.48 src/sbin/route/route.8:1.49 --- src/sbin/route/route.8:1.48 Wed Jul 24 06:28:10 2013 +++ src/sbin/route/route.8 Mon Oct 7 05:06:45 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: route.8,v 1.48 2013/07/24 06:28:10 kefren Exp $ +.\ $NetBSD: route.8,v 1.49 2013/10/07 05:06:45 dholland Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -244,19 +244,19 @@ symbolic names. .Pp The optional modifier .Fl tag -specifies an address associated to the route. +specifies an address associated with the route. How the address is used is specific to the address family of the destination and the interface used to forward the packet. Currently route tags are consumed only by the .Xr mpls 4 -stack, therefore +stack; therefore .Nm assumes that the subsequent addresses are in the .Tn MPLS address family. See .Xr mpls 4 -for examples about setting routes involving MPLS. +for examples of setting routes involving MPLS. .Pp The optional .Fl netmask
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: dholland Date: Mon Oct 7 05:19:23 UTC 2013 Modified Files: src/sys/ufs/lfs: lfs_syscalls.c Log Message: Remove stray KERNEL_UNLOCK_ONE() in error path of lfs_markv(). From Wolfgang Stukenbrock in PR 44370. This error path is only reachable if lfs_markv is handed an out of range inode number, so it's unlikely that it gets tickled very often. It isn't clear to me that we need the kernel lock in here at all, as the path to lfs_markv that's actually used at this point (via fcntl) doesn't take it. But, one thing at a time. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/ufs/lfs/lfs_syscalls.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/ufs/lfs/lfs_syscalls.c diff -u src/sys/ufs/lfs/lfs_syscalls.c:1.148 src/sys/ufs/lfs/lfs_syscalls.c:1.149 --- src/sys/ufs/lfs/lfs_syscalls.c:1.148 Sun Jul 28 01:05:52 2013 +++ src/sys/ufs/lfs/lfs_syscalls.c Mon Oct 7 05:19:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_syscalls.c,v 1.148 2013/07/28 01:05:52 dholland Exp $ */ +/* $NetBSD: lfs_syscalls.c,v 1.149 2013/10/07 05:19:23 dholland Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008 @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lfs_syscalls.c,v 1.148 2013/07/28 01:05:52 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: lfs_syscalls.c,v 1.149 2013/10/07 05:19:23 dholland Exp $); #ifndef LFS # define LFS /* for prototypes in syscallargs.h */ @@ -524,7 +524,6 @@ err2: */ err3: - KERNEL_UNLOCK_ONE(NULL); /* * XXX should do segwrite here anyway? */
