From 2b7af31cf5e70677f52214702a95d4225564c52d Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 23 Jun 2014 08:23:05 +0000 Subject: use .Mt to mark up email addresses consistently (part3) PR: 191174 Submitted by: Franco Fichtner --- lib/libutil/flopen.3 | 2 +- lib/libutil/kld.3 | 2 +- lib/libutil/pidfile.3 | 4 ++-- lib/libutil/pw_util.3 | 2 +- lib/libutil/quotafile.3 | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/libutil') diff --git a/lib/libutil/flopen.3 b/lib/libutil/flopen.3 index 66657022c0ee..aba788c67d85 100644 --- a/lib/libutil/flopen.3 +++ b/lib/libutil/flopen.3 @@ -98,4 +98,4 @@ and The .Nm function and this manual page were written by -.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . diff --git a/lib/libutil/kld.3 b/lib/libutil/kld.3 index 595ac96730b4..f6b2c1394c12 100644 --- a/lib/libutil/kld.3 +++ b/lib/libutil/kld.3 @@ -90,4 +90,4 @@ The and .Fn kld_load functions and this manual page were written by -.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . diff --git a/lib/libutil/pidfile.3 b/lib/libutil/pidfile.3 index 30c880c1ad06..d5e2470752c1 100644 --- a/lib/libutil/pidfile.3 +++ b/lib/libutil/pidfile.3 @@ -291,7 +291,7 @@ Probably called not from the process which used The .Nm pidfile functionality is based on ideas from -.An John-Mark Gurney Aq jmg@FreeBSD.org . +.An John-Mark Gurney Aq Mt jmg@FreeBSD.org . .Pp The code and manual page was written by -.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org . +.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org . diff --git a/lib/libutil/pw_util.3 b/lib/libutil/pw_util.3 index 6c449ba069cb..0d8c76325722 100644 --- a/lib/libutil/pw_util.3 +++ b/lib/libutil/pw_util.3 @@ -283,4 +283,4 @@ DARPA/SPAWAR contract N66001-01-C-8035 as part of the DARPA CHATS research program. .Pp This manual page was written by -.An Baptiste Daroussin Aq bapt@FreeBSD.org . +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org . diff --git a/lib/libutil/quotafile.3 b/lib/libutil/quotafile.3 index 1e75e9a87164..001a66c0e18d 100644 --- a/lib/libutil/quotafile.3 +++ b/lib/libutil/quotafile.3 @@ -285,6 +285,6 @@ functions first appeared in The .Nm quotafile functions and this manual page were written by -.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org and -.An Marshall Kirk McKusick Aq mckusick@mckusick.com . +.An Marshall Kirk McKusick Aq Mt mckusick@mckusick.com . -- cgit v1.3 From df2d82e00354369047e55789c2281af6f7f81e4b Mon Sep 17 00:00:00 2001 From: Joel Dahl Date: Mon, 23 Jun 2014 18:40:21 +0000 Subject: mdoc: remove superfluous paragraph macros. --- cddl/contrib/opensolaris/cmd/zpool/zpool.8 | 1 - lib/libc/sys/intro.2 | 2 -- lib/libcuse/cuse.3 | 2 -- lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 | 1 - lib/libpmc/pmc.k8.3 | 1 - lib/libpmc/pmc.p4.3 | 1 - lib/libutil/fparseln.3 | 1 - lib/libutil/login_class.3 | 1 - libexec/rtld-elf/rtld.1 | 1 - sbin/ifconfig/ifconfig.8 | 1 - sbin/ipfw/ipfw.8 | 1 - sbin/mount_fusefs/mount_fusefs.8 | 1 - sbin/natd/natd.8 | 1 - sbin/pfctl/pfctl.8 | 1 - share/man/man4/est.4 | 1 - share/man/man4/mxge.4 | 1 - share/man/man4/ng_async.4 | 1 - share/man/man4/ng_ccatm.4 | 1 - share/man/man4/sysmouse.4 | 1 - share/man/man4/tty.4 | 1 - share/man/man4/vale.4 | 1 - share/man/man9/ifnet.9 | 1 - 22 files changed, 24 deletions(-) (limited to 'lib/libutil') diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 index 1061e452f034..26c37c8517bc 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 @@ -1041,7 +1041,6 @@ the following fields: See the .Qq Sx Properties section for more information on the available pool properties. -.Pp .It Fl H Scripted mode. Do not display headers, and separate fields by a single tab instead of arbitrary space. diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2 index bc10b1de59de..7ce57aaf2d7c 100644 --- a/lib/libc/sys/intro.2 +++ b/lib/libc/sys/intro.2 @@ -133,7 +133,6 @@ executable file. A file descriptor argument was out of range, referred to no open file, or a read (write) request was made to a file that was only open for writing (reading). -.Pp .It Er 10 ECHILD Em "\&No child processes" . A .Xr wait 2 @@ -302,7 +301,6 @@ addresses with Internet protocols. .It Er 48 EADDRINUSE Em "Address already in use" . Only one usage of each address is normally permitted. -.Pp .It Er 49 EADDRNOTAVAIL Em "Can't assign requested address" . Normally results from an attempt to create a socket with an address not on this machine. diff --git a/lib/libcuse/cuse.3 b/lib/libcuse/cuse.3 index 356c51869450..6d8d2a3cd860 100644 --- a/lib/libcuse/cuse.3 +++ b/lib/libcuse/cuse.3 @@ -262,7 +262,6 @@ is returned. .Ft "void" .Fn "cuse_poll_wakeup" "void" This function will wake up any file pollers. -.Pp .Sh LIBRARY LIMITATIONS Transfer lengths for .Fn read , @@ -374,7 +373,6 @@ values in case of failure and success. The events argument is also a mask of .Dv CUSE_POLL_XXX values. -.Pp .Bd -literal -offset indent struct cuse_methods { cuse_open_t *cm_open; diff --git a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 index 656d0e6d3341..abdd3907e972 100644 --- a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 +++ b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 @@ -123,7 +123,6 @@ password are not counted. In addition to being sufficiently long, passwords are required to contain enough different characters for the character classes and the minimum length they have been checked against. -.Pp .It Cm max Ns = Ns Ar N .Pq Cm max Ns = Ns 40 The maximum allowed password length. diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.k8.3 index 19d08aadbd98..45c70baa438c 100644 --- a/lib/libpmc/pmc.k8.3 +++ b/lib/libpmc/pmc.k8.3 @@ -672,7 +672,6 @@ Count memory controller high priority bypasses. .It Li memory-controller-lo-pri-bypass Count memory controller low priority bypasses. .El -.Pp .It Li k8-nb-memory-controller-dram-slots-missed .Pq Event E2H Count memory controller DRAM command slots missed (in MemClks). diff --git a/lib/libpmc/pmc.p4.3 b/lib/libpmc/pmc.p4.3 index c6d796e9dda0..e113b72001e1 100644 --- a/lib/libpmc/pmc.p4.3 +++ b/lib/libpmc/pmc.p4.3 @@ -541,7 +541,6 @@ can take the following value (which is also the default): .It Li running Count cycles when the processor is active. .El -.Pp .It Li p4-instr-retired Op Li ,mask= Ns Ar flags .Pq "TS event" Count instructions retired during a clock cycle. diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3 index cd78437e3eb4..245fba77ccff 100644 --- a/lib/libutil/fparseln.3 +++ b/lib/libutil/fparseln.3 @@ -122,7 +122,6 @@ Remove escape preceding any other character. .It Dv FPARSELN_UNESCALL All of the above. .El -.Pp .El .Sh RETURN VALUES Upon successful completion a pointer to the parsed line is returned; diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3 index 75f361481c81..c87faaeb8814 100644 --- a/lib/libutil/login_class.3 +++ b/lib/libutil/login_class.3 @@ -160,7 +160,6 @@ capability "setenv=var1 val1,var2 val2..,varN valN". .It LOGIN_SETMAC Set the MAC label for the current process to the label specified in system login class database. -.Pp .It LOGIN_SETCPUMASK Create a new .Xr cpuset 2 diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 28e70626b546..a8e9d680d25c 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -267,7 +267,6 @@ If set, .Nm will log events such as the loading and unloading of shared objects via .Xr utrace 2 . -.Pp .It Ev LD_LOADFLTR If set, .Nm diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 290f31606ca8..27bba90a84bb 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -2333,7 +2333,6 @@ src/dst address for IPv4 or IPv6. .It Cm l4 src/dst port for TCP/UDP/SCTP. .El -.Pp .El .Pp The following parameters are specific to IP tunnel interfaces, diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 2a7f5e3540eb..5b56b39c84e6 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1583,7 +1583,6 @@ followed by the number of significant bits. For example, an address with 33 significant bits could be specified as: .Pp .Dl "MAC 10:20:30:40:50:60/33 any" -.Pp .It An ampersand .Pq & diff --git a/sbin/mount_fusefs/mount_fusefs.8 b/sbin/mount_fusefs/mount_fusefs.8 index 7c8bb67a7771..3e11cf19bd8f 100644 --- a/sbin/mount_fusefs/mount_fusefs.8 +++ b/sbin/mount_fusefs/mount_fusefs.8 @@ -151,7 +151,6 @@ Do not refuse unmounting if there are secondary mounts .It Cm push_symlinks_in Prefix absolute symlinks with the mountpoint .El -.Pp .El .Pp Besides the above mount options, there is a set of pseudo-mount options which diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8 index eadb367b9ebb..7ccfbf7578bb 100644 --- a/sbin/natd/natd.8 +++ b/sbin/natd/natd.8 @@ -585,7 +585,6 @@ in the file or using the command .Pp .Dl "sysctl net.inet.ip.forwarding=1" -.Pp .It If you use the .Fl interface diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 5c0e7b37f4de..5908cf1a8e56 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -317,7 +317,6 @@ To kill a state with ID 4823e84500000018 created from a backup firewall with hostid 00000002 use: .Pp .Dl # pfctl -k id -k 4823e84500000018/2 -.Pp .It Fl m Merge in explicitly given options without resetting those which are omitted. diff --git a/share/man/man4/est.4 b/share/man/man4/est.4 index 9f60206edac5..4d230e0d6fb9 100644 --- a/share/man/man4/est.4 +++ b/share/man/man4/est.4 @@ -91,7 +91,6 @@ The valid frequencies that are allowed by this CPU and their step values. .It dev.est.0.freq_settings: 2201/45000 2200/45000 2000/39581 1900/37387 1800/34806 1700/32703 1600/30227 1500/28212 1400/25828 1300/23900 1200/21613 1100/19775 1000/17582 900/15437 800/13723 -.Pp .El .Sh DIAGNOSTICS .Bl -diag diff --git a/share/man/man4/mxge.4 b/share/man/man4/mxge.4 index 5a353fbf423a..cb5738c88405 100644 --- a/share/man/man4/mxge.4 +++ b/share/man/man4/mxge.4 @@ -131,7 +131,6 @@ both be capable of MSI-X. Older Myri10GE NICs can be field upgraded to add MSI-X using the "10G NIC Tool Kit" for FreeBSD which is available from .Pa http://www.myri.com/scs/download-10g-tools.html . -.Pp .It Va hw.mxge.rss_hashtype This value determines how incoming traffic is steered to different slices. diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4 index ffd9a385d461..324fa4129c00 100644 --- a/share/man/man4/ng_async.4 +++ b/share/man/man4/ng_async.4 @@ -143,7 +143,6 @@ This command returns a containing node statistics for packet, octet, and error counts. .It Dv NGM_ASYNC_CMD_CLR_STATS Pq Ic clrstats Clears the node statistics. -.Pp .El .Sh SHUTDOWN This node shuts down upon receipt of a diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index f643d726d55e..c3a0df477bb9 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -206,7 +206,6 @@ struct ngm_ccatm_port { uint32_t port; }; .Ed -.Pp .It Dv NGM_CCATM_START Pq Ic start Start processing on the port. The argument is a diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4 index a02ffaa7d133..f93fa8e0eb2a 100644 --- a/share/man/man4/sysmouse.4 +++ b/share/man/man4/sysmouse.4 @@ -441,7 +441,6 @@ The field holds the click count: the number of times the user has clicked the button successively. -.Pp .El .El .Sh FILES diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4 index 70e5da2fc85b..ec6d9f155aca 100644 --- a/share/man/man4/tty.4 +++ b/share/man/man4/tty.4 @@ -127,7 +127,6 @@ Before .Fx 8.0 , it would change to the new line discipline pointed to by .Fa ldisc . -.Pp .It Dv TIOCGETD Fa int *ldisc Return the current line discipline in the integer pointed to by .Fa ldisc . diff --git a/share/man/man4/vale.4 b/share/man/man4/vale.4 index a52b137b2766..4eeab1ae1cc2 100644 --- a/share/man/man4/vale.4 +++ b/share/man/man4/vale.4 @@ -90,7 +90,6 @@ The maximum number of packets processed internally in each iteration. Defaults to 1024, use lower values to trade latency with throughput. -.Pp .It dev.netmap.verbose Set to non-zero values to enable in-kernel diagnostics. .El diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index f1d3e471bc6a..29df470334fb 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -1370,7 +1370,6 @@ function is called to perform the operation; qq.v. .It Dv SIOCDIFADDR The socket's protocol control routine is called to implement the requested action. -.Pp .El .El .Pp -- cgit v1.3 From 1ab538186062fc0d2dcd2837581856d9753e0a35 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Wed, 23 Jul 2014 14:57:15 +0000 Subject: fparseln(3): Update from NetBSD sources. -fix a condition so that fparseln() doesn't report spurious empty lines eg after 2 comment lines, or on EOF after a single comment line -no escape character means no escaped characters modify the previous fix so that no pointless realloc()s are done in the case of multiple empty continuation lines, and comment the code to make the logics obvious fparseln is now part of libc in NetBSD so this changes the previous revision numbering. Obtained from: NetBSD (CVS Rev. 1.6-1.7) MFC after: 2 weeks --- lib/libutil/fparseln.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'lib/libutil') diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index 0624f0e4ea31..d03357eae95c 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,4 +1,4 @@ -/* $NetBSD: fparseln.c,v 1.9 1999/09/20 04:48:06 lukem Exp $ */ +/* $NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -59,7 +59,7 @@ isescaped(const char *sp, const char *p, int esc) /* No escape character */ if (esc == '\0') - return 1; + return 0; /* Count the number of escape characters that precede ours */ for (ne = 0, cp = p; --cp >= sp && *cp == esc; ne++) @@ -135,13 +135,19 @@ fparseln(FILE *fp, size_t *size, size_t *lineno, const char str[3], int flags) cp = &ptr[s - 1]; if (*cp == con && !isescaped(ptr, cp, esc)) { - s--; /* forget escape */ + s--; /* forget continuation char */ cnt = 1; } } - if (s == 0 && buf != NULL) - continue; + if (s == 0) { + /* + * nothing to add, skip realloc except in case + * we need a minimal buf to return an empty line + */ + if (cnt || buf != NULL) + continue; + } if ((cp = realloc(buf, len + s + 1)) == NULL) { free(buf); -- cgit v1.3