CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Wed Jun 29 06:38:12 UTC 2016 Modified Files: src/sys/dev/usb [nick-nhusb]: ucom.c Log Message: Comment out incorrect KASSERTs To generate a diff of this commit: cvs rdiff -u -r1.108.2.16 -r1.108.2.17 src/sys/dev/usb/ucom.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/ucom.c diff -u src/sys/dev/usb/ucom.c:1.108.2.16 src/sys/dev/usb/ucom.c:1.108.2.17 --- src/sys/dev/usb/ucom.c:1.108.2.16 Tue Jun 28 11:47:53 2016 +++ src/sys/dev/usb/ucom.c Wed Jun 29 06:38:12 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ucom.c,v 1.108.2.16 2016/06/28 11:47:53 skrll Exp $ */ +/* $NetBSD: ucom.c,v 1.108.2.17 2016/06/29 06:38:12 skrll Exp $ */ /* * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.16 2016/06/28 11:47:53 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.17 2016/06/29 06:38:12 skrll Exp $"); #include #include @@ -268,8 +268,8 @@ ucom_attach(device_t parent, device_t se prop_dictionary_set_int32(device_properties(self), "port", ucaa->ucaa_portno); - KASSERT(ucaa->ucaa_bulkin != -1 || (ucaa->ucaa_ipipe && ucaa->ucaa_ixfer)); - KASSERT(ucaa->ucaa_bulkout != -1 || (ucaa->ucaa_opipe && ucaa->ucaa_oxfer)); + //KASSERT(ucaa->ucaa_bulkin != -1 || (ucaa->ucaa_ipipe && ucaa->ucaa_ixfer)); + //KASSERT(ucaa->ucaa_bulkout != -1 || (ucaa->ucaa_opipe && ucaa->ucaa_oxfer)); sc->sc_dev = self; sc->sc_udev = ucaa->ucaa_device;
CVS commit: src/doc
Module Name:src Committed By: abhinav Date: Wed Jun 29 06:12:49 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: SQLite 3.13.0 was released. To generate a diff of this commit: cvs rdiff -u -r1.1339 -r1.1340 src/doc/3RDPARTY 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.1339 src/doc/3RDPARTY:1.1340 --- src/doc/3RDPARTY:1.1339 Fri Jun 17 19:45:24 2016 +++ src/doc/3RDPARTY Wed Jun 29 06:12:49 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1339 2016/06/17 19:45:24 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1340 2016/06/29 06:12:49 abhinav Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1256,7 +1256,7 @@ original. Package: sqlite Version: 3.8.3.1 -Current Vers: 3.10 +Current Vers: 3.13.0 Maintainer: Richard Hipp Home Page: http://www.sqlite.org Responsible: joerg
CVS commit: src/distrib/notes/common
Module Name:src Committed By: maya Date: Tue Jun 28 16:45:06 UTC 2016 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.529 -r1.530 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.529 src/distrib/notes/common/main:1.530 --- src/distrib/notes/common/main:1.529 Wed May 18 16:36:53 2016 +++ src/distrib/notes/common/main Tue Jun 28 16:45:06 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.529 2016/05/18 16:36:53 abhinav Exp $ +.\" $NetBSD: main,v 1.530 2016/06/28 16:45:06 maya Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1338,6 +1338,7 @@ If you're one of them, and would like to .It Ta Adrian Portelli Ta Mt adri...@netbsd.org .It Ta Pierre Pronchery Ta Mt khor...@netbsd.org .It Ta Chris Provenzano Ta Mt pro...@netbsd.org +.It Ta Maya Rashish Ta Mt m...@netbsd.org .It Ta Mindaugas Rasiukevicius Ta Mt rm...@netbsd.org .It Ta Nils Ratusznik Ta Mt n...@netbsd.org .It Ta Michael Rauch Ta Mt mra...@netbsd.org
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: christos
Date: Tue Jun 28 16:34:40 UTC 2016
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
Log Message:
CID 977755: Resource leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
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/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.97 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.98
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.97 Sun Feb 7 00:03:36 2016
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Tue Jun 28 12:34:40 2016
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.97 2016/02/07 05:03:36 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.98 2016/06/28 16:34:40 christos Exp $");
#endif
#include
@@ -1186,6 +1186,7 @@ netpgp_generate_key(netpgp_t *netpgp, ch
int passc;
int fd;
int cc;
+ int rv = 0;
uid = NULL;
io = netpgp->io;
@@ -1212,13 +1213,13 @@ netpgp_generate_key(netpgp_t *netpgp, ch
netpgp_setvar(netpgp, "generated userid", &dir[cc - 16]);
if (mkdir(dir, 0700) < 0) {
(void) fprintf(io->errs, "can't mkdir '%s'\n", dir);
- return 0;
+ goto out;
}
(void) fprintf(io->errs, "netpgp: generated keys in directory %s\n", dir);
(void) snprintf(ringfile = filename, sizeof(filename), "%s/pubring.gpg", dir);
if (!appendkey(io, key, ringfile)) {
(void) fprintf(io->errs, "Cannot write pubkey to '%s'\n", ringfile);
- return 0;
+ goto out;
}
if (netpgp->pubring != NULL) {
pgp_keyring_free(netpgp->pubring);
@@ -1230,7 +1231,7 @@ netpgp_generate_key(netpgp_t *netpgp, ch
}
if (fd < 0) {
(void) fprintf(io->errs, "can't append secring '%s'\n", ringfile);
- return 0;
+ goto out;
}
/* get the passphrase */
if ((numtries = netpgp_getvar(netpgp, "numtries")) == NULL ||
@@ -1242,15 +1243,18 @@ netpgp_generate_key(netpgp_t *netpgp, ch
passc = find_passphrase(netpgp->passfp, &cp[ID_OFFSET], passphrase, sizeof(passphrase), attempts);
if (!pgp_write_xfer_seckey(create, key, (uint8_t *)passphrase, (const unsigned)passc, noarmor)) {
(void) fprintf(io->errs, "Cannot write seckey\n");
- return 0;
+ goto out1;
}
+ rv = 1;
+out1:
pgp_teardown_file_write(create, fd);
if (netpgp->secring != NULL) {
pgp_keyring_free(netpgp->secring);
}
+out:
pgp_keydata_free(key);
free(cp);
- return 1;
+ return rv;
}
/* encrypt a file */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: skrll
Date: Tue Jun 28 16:00:32 UTC 2016
Modified Files:
src/sys/dev/ic: sl811hs.c
Log Message:
Add slhci_memtest which is run when SLHCI_DEBUG is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ic/sl811hs.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/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.85 src/sys/dev/ic/sl811hs.c:1.86
--- src/sys/dev/ic/sl811hs.c:1.85 Mon Jun 20 14:18:30 2016
+++ src/sys/dev/ic/sl811hs.c Tue Jun 28 16:00:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.85 2016/06/20 14:18:30 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.86 2016/06/28 16:00:32 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.85 2016/06/20 14:18:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.86 2016/06/28 16:00:32 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_slhci.h"
@@ -516,6 +516,8 @@ static void slhci_get_status(struct slhc
#define SLHCIHIST_CALLED() USBHIST_CALLED(slhcidebug)
#ifdef SLHCI_DEBUG
+static int slhci_memtest(struct slhci_softc *);
+
void slhci_log_buffer(struct usbd_xfer *);
void slhci_log_req(usb_device_request_t *);
void slhci_log_dumpreg(void);
@@ -1205,6 +1207,13 @@ slhci_attach(struct slhci_softc *sc)
return -1;
}
+#ifdef SLHCI_DEBUG
+ if (slhci_memtest(sc)) {
+ printf("%s: memory/bus error!\n", SC_NAME(sc));
+ return -1;
+ }
+#endif
+
callout_init(&sc->sc_timer, CALLOUT_MPSAFE);
callout_setfunc(&sc->sc_timer, slhci_reset_entry, sc);
@@ -2885,6 +2894,88 @@ slhci_reset(struct slhci_softc *sc)
DLOG(D_MSG, "RESET done flags %#x", t->flags, 0,0,0);
}
+
+#ifdef SLHCI_DEBUG
+static int
+slhci_memtest(struct slhci_softc *sc)
+{
+ enum { ASC, DESC, EITHER = ASC }; /* direction */
+ enum { READ, WRITE }; /* operation */
+ const char *ptr, *elem;
+ size_t i;
+ const int low = SL11_BUFFER_START, high = SL11_BUFFER_END;
+ int addr = 0, dir = ASC, op = READ;
+ /* Extended March C- test algorithm (SOFs also) */
+ const char test[] = "E(w0) A(r0w1r1) A(r1w0r0) D(r0w1) D(r1w0) E(r0)";
+ char c;
+ const uint8_t dbs[] = { 0x00, 0x0f, 0x33, 0x55 }; /* data backgrounds */
+ uint8_t db;
+
+ /* Perform memory test for all data backgrounds. */
+ for (i = 0; i < __arraycount(dbs); i++) {
+ ptr = test;
+ elem = ptr;
+ /* Walk test algorithm string. */
+ while ((c = *ptr++) != '\0')
+ switch (tolower((int)c)) {
+ case 'a':
+/* Address sequence is in ascending order. */
+dir = ASC;
+break;
+ case 'd':
+/* Address sequence is in descending order. */
+dir = DESC;
+break;
+ case 'e':
+/* Address sequence is in either order. */
+dir = EITHER;
+break;
+ case '(':
+/* Start of test element (sequence). */
+elem = ptr;
+addr = (dir == ASC) ? low : high;
+break;
+ case 'r':
+/* read operation */
+op = READ;
+break;
+ case 'w':
+/* write operation */
+op = WRITE;
+break;
+ case '0':
+ case '1':
+/*
+ * Execute previously set-up operation by
+ * reading/writing non-inverted ('0') or
+ * inverted ('1') data background.
+ */
+db = (c - '0') ? ~dbs[i] : dbs[i];
+if (op == READ) {
+ if (slhci_read(sc, addr) != db)
+ return -1;
+} else
+ slhci_write(sc, addr, db);
+break;
+ case ')':
+/*
+ * End of element: Repeat same element with next
+ * address or continue to next element.
+ */
+addr = (dir == ASC) ? addr + 1 : addr - 1;
+if (addr >= low && addr <= high)
+ ptr = elem;
+break;
+ default:
+/* Do nothing. */
+break;
+ }
+ }
+
+ return 0;
+}
+#endif
+
/* returns 1 if succeeded, 0 if failed, reserve == 0 is unreserve */
static int
slhci_reserve_bustime(struct slhci_softc *sc, struct slhci_pipe *spipe, int
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Jun 28 11:47:53 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ucom.c
Log Message:
Make sure ub_data has the transfer buffer
To generate a diff of this commit:
cvs rdiff -u -r1.108.2.15 -r1.108.2.16 src/sys/dev/usb/ucom.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/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.108.2.15 src/sys/dev/usb/ucom.c:1.108.2.16
--- src/sys/dev/usb/ucom.c:1.108.2.15 Mon May 30 06:54:17 2016
+++ src/sys/dev/usb/ucom.c Tue Jun 28 11:47:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.108.2.15 2016/05/30 06:54:17 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.108.2.16 2016/06/28 11:47:53 skrll Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.15 2016/05/30 06:54:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.16 2016/06/28 11:47:53 skrll Exp $");
#include
#include
@@ -1492,6 +1492,7 @@ ucomreadcb(struct usbd_xfer *xfer, void
return;
}
+ ub->ub_data = usbd_get_buffer(xfer);
if (sc->sc_methods->ucom_read != NULL) {
sc->sc_methods->ucom_read(sc->sc_parent, sc->sc_portno,
&cp, &cc);
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: skrll
Date: Tue Jun 28 09:31:15 UTC 2016
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
Fix PR/51288 reproducable panic on evbmips64-eb (erlite)
pmap_page_remove from the previous change neglected to terminate the pv
list correctly when it started with an initial unmanaged mapping and
subsequent managed mappings. Fix this.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/arch/mips/mips/pmap.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/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.221 src/sys/arch/mips/mips/pmap.c:1.222
--- src/sys/arch/mips/mips/pmap.c:1.221 Mon Jun 27 07:12:18 2016
+++ src/sys/arch/mips/mips/pmap.c Tue Jun 28 09:31:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.221 2016/06/27 07:12:18 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.222 2016/06/28 09:31:15 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.221 2016/06/27 07:12:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.222 2016/06/28 09:31:15 skrll Exp $");
/*
* Manages physical address maps.
@@ -2327,6 +2327,11 @@ pmap_page_remove(struct vm_page *pg)
__func__, pv, pv->pv_pmap, pv->pv_va);
}
#endif
+ KASSERT(pv->pv_pmap == pmap_kernel());
+
+ /* Assume no more - it'll get fixed if there are */
+ pv->pv_next = NULL;
+
/*
* pvp is non-null when we already have a PV_KENTER
* pv in pvh_first; otherwise we haven't seen a
@@ -2342,14 +2347,12 @@ pmap_page_remove(struct vm_page *pg)
} else {
pv_entry_t fpv = &md->pvh_first;
*fpv = *pv;
+KASSERT(fpv->pv_pmap == pmap_kernel());
}
- /* Assume no more - it'll get fixed if there are */
- pv->pv_next = NULL;
pvp = pv;
continue;
}
-
const pmap_t pmap = pv->pv_pmap;
vaddr_t va = trunc_page(pv->pv_va);
pt_entry_t *pte = pmap_pte(pmap, va);
@@ -2385,6 +2388,8 @@ pmap_page_remove(struct vm_page *pg)
* free it.
*/
if (pvp) {
+ KASSERT(pvp->pv_pmap == pmap_kernel());
+ KASSERT(pvp->pv_next == NULL);
pmap_pv_free(pv);
} else {
pv->pv_pmap = NULL;
CVS commit: src/games/quiz/datfiles
Module Name:src
Committed By: pgoyette
Date: Tue Jun 28 09:27:26 UTC 2016
Modified Files:
src/games/quiz/datfiles: asia
Log Message:
Update entries for North and South Yemen, since the two countries were
united a long time ago (according to WikiPedia).
Thanks, wiz, for double-checking!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/games/quiz/datfiles/asia
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/quiz/datfiles/asia
diff -u src/games/quiz/datfiles/asia:1.6 src/games/quiz/datfiles/asia:1.7
--- src/games/quiz/datfiles/asia:1.6 Tue Jun 28 09:17:06 2016
+++ src/games/quiz/datfiles/asia Tue Jun 28 09:27:26 2016
@@ -38,7 +38,6 @@ Russia:Moscow
Saudi Arabia:Riyadh
Singapore:Singapore
South Korea:Seoul
-[South|Peoples' Democratic Republic of] Yemen:Aden
Sri Lanka:[Kotte|Sri Jayewardenepura]
Syria:Damascus
Tajikistan:Dushanbe
@@ -49,4 +48,4 @@ Turkmenistan:Ashqabat
[UAE|United Arab Emirates]:Abu Dhabi
Uzbekistan:Tashkent
Vietnam:Hanoi
-[North Yemen|Yemen Arab Republic]:Sana'a
+{Republic of }Yemen:Sana'a
CVS commit: src/usr.bin/mkesdb
Module Name:src Committed By: wiz Date: Tue Jun 28 09:25:21 UTC 2016 Modified Files: src/usr.bin/mkesdb: mkesdb.1 Log Message: Sync usage with program. Add RCS Id. Increase column width. Fix macro usage. Improve wording. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/mkesdb/mkesdb.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/mkesdb/mkesdb.1 diff -u src/usr.bin/mkesdb/mkesdb.1:1.1 src/usr.bin/mkesdb/mkesdb.1:1.2 --- src/usr.bin/mkesdb/mkesdb.1:1.1 Mon Jun 27 20:09:18 2016 +++ src/usr.bin/mkesdb/mkesdb.1 Tue Jun 28 09:25:21 2016 @@ -1,3 +1,5 @@ +.\" $NetBSD: mkesdb.1,v 1.2 2016/06/28 09:25:21 wiz Exp $ +.\" .\" Copyright (c) 2009 Gabor Kovesdan .\" All rights reserved. .\" @@ -39,18 +41,17 @@ .Os .Sh NAME .Nm mkesdb -.Nd generates conversion catalog for +.Nd generate a conversion catalog for .Xr iconv 3 .Sh SYNOPSIS .Nm -.Op Fl md -.Fl o -.Ar outfile -.Ar infile +.Op Fl dm +.Op Fl o Ar outfile +.Op Ar infile .Sh DESCRIPTION The .Nm -utility generates conversion catalog for the +utility generates a conversion catalog for the .Xr iconv 3 library. The generated data includes a list of supported encodings @@ -58,7 +59,7 @@ and their most important characteristics module to use .Pp The following options are available: -.Bl -tag -width 0123 +.Bl -tag -width XoXoutfileXX .It Fl d Turns on debug mode. .It Fl m @@ -77,7 +78,8 @@ Put generated binary data to .Sh HISTORY .Nm first appeared in -.Nx 2.0 , and made its appearance in +.Nx 2.0 , +and made its appearance in .Fx 9.0 . .Sh AUTHORS This manual page was written by
CVS commit: src/usr.bin/mkesdb
Module Name:src
Committed By: wiz
Date: Tue Jun 28 09:24:46 UTC 2016
Modified Files:
src/usr.bin/mkesdb: yacc.y
Log Message:
Sort options in usage.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/mkesdb/yacc.y
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/mkesdb/yacc.y
diff -u src/usr.bin/mkesdb/yacc.y:1.10 src/usr.bin/mkesdb/yacc.y:1.11
--- src/usr.bin/mkesdb/yacc.y:1.10 Mon Jun 27 20:15:16 2016
+++ src/usr.bin/mkesdb/yacc.y Tue Jun 28 09:24:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.10 2016/06/27 20:15:16 maya Exp $ */
+/* $NetBSD: yacc.y,v 1.11 2016/06/28 09:24:46 wiz Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.10 2016/06/27 20:15:16 maya Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.11 2016/06/28 09:24:46 wiz Exp $");
#endif /* not lint */
#include
@@ -290,7 +290,7 @@ do_mkdb(FILE *in)
__dead static void
usage(void)
{
- fprintf(stderr, "Usage: %s [-md] [-o outfile] [infile]\n",
+ fprintf(stderr, "Usage: %s [-dm] [-o outfile] [infile]\n",
getprogname());
exit(EXIT_FAILURE);
}
CVS commit: src/usr.bin/mkcsmapper
Module Name:src Committed By: wiz Date: Tue Jun 28 09:23:09 UTC 2016 Modified Files: src/usr.bin/mkcsmapper: mkcsmapper.1 Log Message: Infile is also optional. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/mkcsmapper/mkcsmapper.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/mkcsmapper/mkcsmapper.1 diff -u src/usr.bin/mkcsmapper/mkcsmapper.1:1.3 src/usr.bin/mkcsmapper/mkcsmapper.1:1.4 --- src/usr.bin/mkcsmapper/mkcsmapper.1:1.3 Tue Jun 28 09:22:16 2016 +++ src/usr.bin/mkcsmapper/mkcsmapper.1 Tue Jun 28 09:23:09 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: mkcsmapper.1,v 1.3 2016/06/28 09:22:16 wiz Exp $ +.\" $NetBSD: mkcsmapper.1,v 1.4 2016/06/28 09:23:09 wiz Exp $ .\" .\" Copyright (c) 2009 Gabor Kovesdan .\" All rights reserved. @@ -48,7 +48,7 @@ .Op Fl d .Op Fl m | Fl p .Op Fl o Ar outfile -.Ar infile +.Op Ar infile .Sh DESCRIPTION The .Nm
CVS commit: src/usr.bin/mkcsmapper
Module Name:src
Committed By: wiz
Date: Tue Jun 28 09:22:16 UTC 2016
Modified Files:
src/usr.bin/mkcsmapper: mkcsmapper.1 yacc.y
Log Message:
Sync usage between program and man page. Increase column width.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/mkcsmapper/mkcsmapper.1
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/mkcsmapper/yacc.y
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/mkcsmapper/mkcsmapper.1
diff -u src/usr.bin/mkcsmapper/mkcsmapper.1:1.2 src/usr.bin/mkcsmapper/mkcsmapper.1:1.3
--- src/usr.bin/mkcsmapper/mkcsmapper.1:1.2 Tue Jun 28 09:20:30 2016
+++ src/usr.bin/mkcsmapper/mkcsmapper.1 Tue Jun 28 09:22:16 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkcsmapper.1,v 1.2 2016/06/28 09:20:30 wiz Exp $
+.\" $NetBSD: mkcsmapper.1,v 1.3 2016/06/28 09:22:16 wiz Exp $
.\"
.\" Copyright (c) 2009 Gabor Kovesdan
.\" All rights reserved.
@@ -45,8 +45,9 @@
.Xr iconv 3
.Sh SYNOPSIS
.Nm
-.Op Fl dmp
-.Fl o Ar outfile
+.Op Fl d
+.Op Fl m | Fl p
+.Op Fl o Ar outfile
.Ar infile
.Sh DESCRIPTION
The
@@ -61,7 +62,7 @@ A pivot file, which the possible source
pairs or the set of mappings to use for a compound encoding.
.Pp
The following options are available:
-.Bl -tag -width 0123
+.Bl -tag -width XoXoutfileXX
.It Fl d
Turns on debug mode.
.It Fl m
Index: src/usr.bin/mkcsmapper/yacc.y
diff -u src/usr.bin/mkcsmapper/yacc.y:1.10 src/usr.bin/mkcsmapper/yacc.y:1.11
--- src/usr.bin/mkcsmapper/yacc.y:1.10 Tue Jun 16 22:54:10 2015
+++ src/usr.bin/mkcsmapper/yacc.y Tue Jun 28 09:22:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.10 2015/06/16 22:54:10 christos Exp $ */
+/* $NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.10 2015/06/16 22:54:10 christos Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $");
#endif /* not lint */
#include
@@ -673,7 +673,7 @@ do_mkpv(FILE *in)
__dead static void
usage(void)
{
- fprintf(stderr, "Usage: %s [-m|-p] [-d] [-o outfile] [infile]\n",
+ fprintf(stderr, "Usage: %s [-d] [-m|-p] [-o outfile] [infile]\n",
getprogname());
exit(EXIT_FAILURE);
}
CVS commit: src/usr.bin/mkcsmapper
Module Name:src Committed By: wiz Date: Tue Jun 28 09:20:30 UTC 2016 Modified Files: src/usr.bin/mkcsmapper: mkcsmapper.1 Log Message: Add RCS Id. Sort options in SYNOPSIS. Fix macro usage. Fix Dd. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/mkcsmapper/mkcsmapper.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/mkcsmapper/mkcsmapper.1 diff -u src/usr.bin/mkcsmapper/mkcsmapper.1:1.1 src/usr.bin/mkcsmapper/mkcsmapper.1:1.2 --- src/usr.bin/mkcsmapper/mkcsmapper.1:1.1 Mon Jun 27 20:07:26 2016 +++ src/usr.bin/mkcsmapper/mkcsmapper.1 Tue Jun 28 09:20:30 2016 @@ -1,3 +1,5 @@ +.\" $NetBSD: mkcsmapper.1,v 1.2 2016/06/28 09:20:30 wiz Exp $ +.\" .\" Copyright (c) 2009 Gabor Kovesdan .\" All rights reserved. .\" @@ -34,7 +36,7 @@ .\" .\" $FreeBSD: head/usr.bin/mkcsmapper/mkcsmapper.1 276258 2014-12-26 21:56:23Z joel $ .\" -.Dd Sep 6, 2009 +.Dd September 6, 2009 .Dt MKCSMAPPER 1 .Os .Sh NAME @@ -43,9 +45,8 @@ .Xr iconv 3 .Sh SYNOPSIS .Nm -.Op Fl mpd -.Fl o -.Ar outfile +.Op Fl dmp +.Fl o Ar outfile .Ar infile .Sh DESCRIPTION The @@ -82,7 +83,8 @@ Generate pivot data from .Sh HISTORY .Nm first appeared in -.Nx 2.0 , and made its appearance in +.Nx 2.0 , +and made its appearance in .Fx 9.0 . .Sh AUTHORS This manual page was written by
CVS commit: src/games/quiz/datfiles
Module Name:src
Committed By: wiz
Date: Tue Jun 28 09:17:06 UTC 2016
Modified Files:
src/games/quiz/datfiles: asia
Log Message:
Fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/games/quiz/datfiles/asia
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/quiz/datfiles/asia
diff -u src/games/quiz/datfiles/asia:1.5 src/games/quiz/datfiles/asia:1.6
--- src/games/quiz/datfiles/asia:1.5 Tue Jun 28 00:15:40 2016
+++ src/games/quiz/datfiles/asia Tue Jun 28 09:17:06 2016
@@ -7,7 +7,7 @@ Bangladesh:Dacca
Bhutan:Thimbu
Brunei:Bandar Seri Begawan
Cambodia:P{h}nom Penh
-{{Peoples' }Republic of }China:Peking
+{{People's }Republic of }China:Peking
Cyprus:Nicosia
East Timor:Dili
Georgia:Tbilisi
