Re: Use a single, consistent isblank in vi
On Sat, Mar 28, 2015 at 12:22:10AM -0400, Brian Callahan wrote: > Hi tech@ -- > > Noticed this yesterday reviewing brynet@'s vi diff. > We have the "appropriate" isblank(3) in ctype.h but the header > wasn't being included in all the files that used it so vi was > falling back to a #define in common/key.h for one set of files and > using isblank(3) from ctype.h in other files. > > This diff removes the #define from common/key.h and adds the header > to the .c files that need it. > > OK? > > ~Brian > > -/* > - * Ex/vi commands are generally separated by whitespace characters. We > - * can't use the standard isspace(3) macro because it returns true for > - * characters like ^K in the ASCII character set. The 4.4BSD isblank(3) > - * macro does exactly what we want, but it's not portable yet. Well, isblank(3) is portable now.. so if anything, the comment is at least wrong. :-) ok brynet@
Use a single, consistent isblank in vi
Hi tech@ -- Noticed this yesterday reviewing brynet@'s vi diff. We have the "appropriate" isblank(3) in ctype.h but the header wasn't being included in all the files that used it so vi was falling back to a #define in common/key.h for one set of files and using isblank(3) from ctype.h in other files. This diff removes the #define from common/key.h and adds the header to the .c files that need it. OK? ~Brian Index: common/key.h === RCS file: /cvs/src/usr.bin/vi/common/key.h,v retrieving revision 1.4 diff -u -p -r1.4 key.h --- common/key.h8 Jan 2006 21:05:39 - 1.4 +++ common/key.h28 Mar 2015 04:10:46 - @@ -136,19 +136,6 @@ extern KEYLIST keylist[]; (KEYS_WAITING(sp) &&\ F_ISSET(&(sp)->gp->i_event[(sp)->gp->i_next].e_ch, CH_MAPPED)) -/* - * Ex/vi commands are generally separated by whitespace characters. We - * can't use the standard isspace(3) macro because it returns true for - * characters like ^K in the ASCII character set. The 4.4BSD isblank(3) - * macro does exactly what we want, but it's not portable yet. - * - * XXX - * Note side effect, ch is evaluated multiple times. - */ -#ifndef isblank -#defineisblank(ch) ((ch) == ' ' || (ch) == '\t') -#endif - /* The "standard" tab width, for displaying things to users. */ #defineSTANDARD_TAB6 Index: common/util.c === RCS file: /cvs/src/usr.bin/vi/common/util.c,v retrieving revision 1.10 diff -u -p -r1.10 util.c --- common/util.c 16 Jan 2015 06:40:14 - 1.10 +++ common/util.c 28 Mar 2015 04:10:46 - @@ -14,6 +14,7 @@ #include #include +#include #include #include #include Index: ex/ex_shell.c === RCS file: /cvs/src/usr.bin/vi/ex/ex_shell.c,v retrieving revision 1.14 diff -u -p -r1.14 ex_shell.c --- ex/ex_shell.c 16 Jan 2015 06:40:14 - 1.14 +++ ex/ex_shell.c 28 Mar 2015 04:10:46 - @@ -15,6 +15,7 @@ #include #include +#include #include #include #include Index: vi/v_match.c === RCS file: /cvs/src/usr.bin/vi/vi/v_match.c,v retrieving revision 1.7 diff -u -p -r1.7 v_match.c --- vi/v_match.c12 Nov 2014 04:28:41 - 1.7 +++ vi/v_match.c28 Mar 2015 04:10:46 - @@ -16,6 +16,7 @@ #include #include +#include #include #include #include
Re: ntpd:support adjusting initial time >= y2k36 on 32-bit time_t platforms
On Mon, Mar 23, 2015 at 10:42 AM, Alexey Suslikov wrote: > Brent Cook gmail.com> writes: > >> + T4 += (uint64_t)tv.tv_sec + JAN_1970 + 1.0e-6 * > tv.tv_usec; > > > >> + return ((uint64_t)tv.tv_sec + JAN_1970 + 1.0e-6 * tv.tv_usec); > > > > Can gettime_from_timeval be used over the code instead of repeating > same chunk? > > T4 += gettime_from_timeval(... > > return gettime_from_timeval(... Good point Alexy. That is the right way to go.
Re: ssh-add.1 / ssh-askpass clarification
On Fri, Mar 27, 2015 at 11:22:07PM +, Jason McIntyre wrote: > On Fri, Mar 27, 2015 at 07:07:04PM -0400, Jiri B wrote: > > Mentioning 'ssh-askpass' is used when SSH_ASKPASS > > is not set. > > > > j. > > > > Index: ssh-add.1 > > === > > RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v > > retrieving revision 1.61 > > diff -u -p -u -p -r1.61 ssh-add.1 > > --- ssh-add.1 21 Dec 2014 22:27:56 - 1.61 > > +++ ssh-add.1 27 Mar 2015 23:04:27 - > > @@ -152,11 +152,11 @@ If > > .Nm > > does not have a terminal associated with it but > > .Ev DISPLAY > > -and > > +is set, it will execute the program specified by > > .Ev SSH_ASKPASS > > -are set, it will execute the program specified by > > -.Ev SSH_ASKPASS > > -and open an X11 window to read the passphrase. > > +if not set, by default > > +.Pa ssh-askpass > > +, and open an X11 window to read the passphrase. > > This is particularly useful when calling > > .Nm > > from a > > > > maybe this is clearer: > > Index: ssh-add.1 > === > RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v > retrieving revision 1.61 > diff -u -r1.61 ssh-add.1 > --- ssh-add.1 21 Dec 2014 22:27:56 - 1.61 > +++ ssh-add.1 27 Mar 2015 23:21:34 - > @@ -88,12 +88,11 @@ > .It Fl c > Indicates that added identities should be subject to confirmation before > being used for authentication. > -Confirmation is performed by the > -.Ev SSH_ASKPASS > -program mentioned below. > -Successful confirmation is signaled by a zero exit status from the > -.Ev SSH_ASKPASS > -program, rather than text entered into the requester. > +Confirmation is performed by > +.Xr ssh-askpass 1 . > +Successful confirmation is signaled by a zero exit status from > +.Xr ssh-askpass 1 , > +rather than text entered into the requester. > .It Fl D > Deletes all identities from the agent. > .It Fl d > @@ -156,6 +155,8 @@ > .Ev SSH_ASKPASS > are set, it will execute the program specified by > .Ev SSH_ASKPASS > +(by default > +.Dq ssh-askpass ) > and open an X11 window to read the passphrase. > This is particularly useful when calling > .Nm > @@ -197,6 +198,7 @@ > .Sh SEE ALSO > .Xr ssh 1 , > .Xr ssh-agent 1 , > +.Xr ssh-askpass 1 , > .Xr ssh-keygen 1 , > .Xr sshd 8 > .Sh AUTHORS IIUC the point is SSH_ASKPASS does not need to be set, if not set it falls back to /usr/X11R6/bin/ssh-askpass. But I can be wrong. j.
Re: ssh-add.1 / ssh-askpass clarification
On Fri, Mar 27, 2015 at 07:07:04PM -0400, Jiri B wrote: > Mentioning 'ssh-askpass' is used when SSH_ASKPASS > is not set. > > j. > > Index: ssh-add.1 > === > RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v > retrieving revision 1.61 > diff -u -p -u -p -r1.61 ssh-add.1 > --- ssh-add.1 21 Dec 2014 22:27:56 - 1.61 > +++ ssh-add.1 27 Mar 2015 23:04:27 - > @@ -152,11 +152,11 @@ If > .Nm > does not have a terminal associated with it but > .Ev DISPLAY > -and > +is set, it will execute the program specified by > .Ev SSH_ASKPASS > -are set, it will execute the program specified by > -.Ev SSH_ASKPASS > -and open an X11 window to read the passphrase. > +if not set, by default > +.Pa ssh-askpass > +, and open an X11 window to read the passphrase. > This is particularly useful when calling > .Nm > from a > maybe this is clearer: Index: ssh-add.1 === RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v retrieving revision 1.61 diff -u -r1.61 ssh-add.1 --- ssh-add.1 21 Dec 2014 22:27:56 - 1.61 +++ ssh-add.1 27 Mar 2015 23:21:34 - @@ -88,12 +88,11 @@ .It Fl c Indicates that added identities should be subject to confirmation before being used for authentication. -Confirmation is performed by the -.Ev SSH_ASKPASS -program mentioned below. -Successful confirmation is signaled by a zero exit status from the -.Ev SSH_ASKPASS -program, rather than text entered into the requester. +Confirmation is performed by +.Xr ssh-askpass 1 . +Successful confirmation is signaled by a zero exit status from +.Xr ssh-askpass 1 , +rather than text entered into the requester. .It Fl D Deletes all identities from the agent. .It Fl d @@ -156,6 +155,8 @@ .Ev SSH_ASKPASS are set, it will execute the program specified by .Ev SSH_ASKPASS +(by default +.Dq ssh-askpass ) and open an X11 window to read the passphrase. This is particularly useful when calling .Nm @@ -197,6 +198,7 @@ .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-agent 1 , +.Xr ssh-askpass 1 , .Xr ssh-keygen 1 , .Xr sshd 8 .Sh AUTHORS
ssh-add.1 / ssh-askpass clarification
Mentioning 'ssh-askpass' is used when SSH_ASKPASS is not set. j. Index: ssh-add.1 === RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v retrieving revision 1.61 diff -u -p -u -p -r1.61 ssh-add.1 --- ssh-add.1 21 Dec 2014 22:27:56 - 1.61 +++ ssh-add.1 27 Mar 2015 23:04:27 - @@ -152,11 +152,11 @@ If .Nm does not have a terminal associated with it but .Ev DISPLAY -and +is set, it will execute the program specified by .Ev SSH_ASKPASS -are set, it will execute the program specified by -.Ev SSH_ASKPASS -and open an X11 window to read the passphrase. +if not set, by default +.Pa ssh-askpass +, and open an X11 window to read the passphrase. This is particularly useful when calling .Nm from a
Re: Small ifconfig output tweak for inet6?
>On Thu, Mar 26, 2015 at 05:46:12PM +0100, Henning Brauer wrote: >> * Mike Belopuhov [2015-03-26 14:36]: >> > On 26 March 2015 at 14:27, Stuart Henderson wrote: >> > > seems reasonable. (I'd quite like that for v4 too, though it wouldn't >> > > cope with non-contiguous netmask ;) >> > non-contiguous netmasks for IPv4 addresses configured on an interface? >> > is that possible? what's the use case? >> > perhaps you're confusing this with non-contiguous netmasks in the radix >> > tree that are entered by the ipsec flows containing port numbers? >> >> I don't think we need to worry about non-contiguous netmasks here. >> >> > however I agree that if we do this for ipv6 we should do it for ipv4 as >> > well >> > but then do we care about tons of stuff out there parsing ifconfig output? >> >> that's the prime question. I would love to move to CIDR notation - are >> we breaking people's scripts with that? The inet side has been the same >> for, what, decades? > >The v6_info() function in the installer would need a change, but that's >an easy fix. The way we have handled this in the past is: - all input paths must cope - before an output path is changed - to support cut & paste - to support scripted changes Normally, we need a full release cycle, to make sure noone gets screwed... Maybe there is a fast path? But.. maybe not.
Re: Small ifconfig output tweak for inet6?
On Thu, Mar 26, 2015 at 05:46:12PM +0100, Henning Brauer wrote: > * Mike Belopuhov [2015-03-26 14:36]: > > On 26 March 2015 at 14:27, Stuart Henderson wrote: > > > seems reasonable. (I'd quite like that for v4 too, though it wouldn't > > > cope with non-contiguous netmask ;) > > non-contiguous netmasks for IPv4 addresses configured on an interface? > > is that possible? what's the use case? > > perhaps you're confusing this with non-contiguous netmasks in the radix > > tree that are entered by the ipsec flows containing port numbers? > > I don't think we need to worry about non-contiguous netmasks here. > > > however I agree that if we do this for ipv6 we should do it for ipv4 as well > > but then do we care about tons of stuff out there parsing ifconfig output? > > that's the prime question. I would love to move to CIDR notation - are > we breaking people's scripts with that? The inet side has been the same > for, what, decades? The v6_info() function in the installer would need a change, but that's an easy fix. -- -=[rpe]=-
Re: Small ifconfig output tweak for inet6?
On 2015/03/27 12:23, Peter Hessler wrote: > On 2015 Mar 27 (Fri) at 11:54:16 +0100 (+0100), Henning Brauer wrote: > :* Florian Obser [2015-03-26 18:36]: > :> On Thu, Mar 26, 2015 at 05:46:12PM +0100, Henning Brauer wrote: > :> > * Mike Belopuhov [2015-03-26 14:36]: > :> > > however I agree that if we do this for ipv6 we should do it for ipv4 > as well > :> > > but then do we care about tons of stuff out there parsing ifconfig > output? > :> > that's the prime question. I would love to move to CIDR notation - are > :> > we breaking people's scripts with that? The inet side has been the same > :> > for, what, decades? > :> Of course this breaks stuff :) > : > :uh, now that you mention it, I didn't chose a very obvious way to ask > :the question - of course the ifconfig output change breaks scripts > :parsing ifconfig output, the real question being: how common are > :scripts doing that? > : > > I am happy to break scripts, when people aren't using CIDR ;) It'll need an accompanying change to Ansible's fact gatherer. Facter seems ok with it though.
Re: [PATCH] pcap manpages
Hi, Jan Stary wrote on Fri, Mar 27, 2015 at 11:17:36AM +0100: > On Mar 27 09:16:52, h...@stare.cz wrote: >> The diff below fixes what mandoc -Tlint complains about, >> anotates the authors' names with .An in pcap.3 >> and removes a bit of cruft. > Damn, that was written against a non-current source. > Some of the changes are already in. Here's a smaller one, > just fixing the -Tlint complaint. This fix is correct. So once it has been accepted upstream, it can go into OpenBSD, too. Yours, Ingo > Index: pcap-filter.3 > === > RCS file: /cvs/src/lib/libpcap/pcap-filter.3,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 pcap-filter.3 > --- pcap-filter.3 19 Feb 2014 04:51:32 - 1.2 > +++ pcap-filter.3 27 Mar 2015 10:16:36 - > @@ -342,7 +342,6 @@ it does for FDDI and 802.11; > \fBatalk\fP > the filter checks both for the AppleTalk etype in an Ethernet frame and > for a SNAP-format packet as it does for FDDI, Token Ring, and 802.11; > -.TP > .RE > .IP "\fBdecnet src \fIhost\fR" > True if the DECNET source address is >
Re: tail: -r mem leak with non-regular files
On Thu, Mar 26, 2015 at 11:41:23PM +0100, Tobias Stoeckmann wrote:
> The less obvious one is in an error path.
As tl->l is always of fixed size (BSZ), we can just change the struct
to have a BSZ sized array in it. This removes the need to do checks
in the error path completely.
While at it, there is no use to have a typedef in the code, so I just
removed it, too.
Index: reverse.c
===
RCS file: /cvs/src/usr.bin/tail/reverse.c,v
retrieving revision 1.19
diff -u -p -r1.19 reverse.c
--- reverse.c 27 Oct 2009 23:59:44 - 1.19
+++ reverse.c 27 Mar 2015 11:19:14 -
@@ -147,12 +147,13 @@ r_reg(FILE *fp, enum STYLE style, off_t
return (0);
}
-typedef struct bf {
+#defineBSZ (128 * 1024)
+struct bf {
struct bf *next;
struct bf *prev;
size_t len;
- char *l;
-} BF;
+ char l[BSZ];
+};
/*
* r_buf -- display a non-regular file in reverse order by line.
@@ -167,21 +168,19 @@ typedef struct bf {
static void
r_buf(FILE *fp)
{
- BF *mark, *tr, *tl = NULL;
+ struct bf *mark, *tr, *tl = NULL;
int ch;
size_t len, llen;
char *p;
off_t enomem;
-#defineBSZ (128 * 1024)
for (mark = NULL, enomem = 0;;) {
/*
* Allocate a new block and link it into place in a doubly
* linked list. If out of memory, toss the LRU block and
* keep going.
*/
- if (enomem || (tl = malloc(sizeof(BF))) == NULL ||
- (tl->l = malloc(BSZ)) == NULL) {
+ if (enomem || (tl = malloc(sizeof(*tl))) == NULL) {
if (!mark)
err(1, NULL);
tl = enomem ? tl->next : mark;
@@ -259,5 +258,12 @@ r_buf(FILE *fp)
while ((tl = tl->next)->len) {
WR(tl->l, tl->len);
tl->len = 0;
+ }
+
+ tl->prev->next = NULL;
+ while (tl != NULL) {
+ tr = tl->next;
+ free(tl);
+ tl = tr;
}
}
Re: Small ifconfig output tweak for inet6?
On 2015 Mar 27 (Fri) at 11:54:16 +0100 (+0100), Henning Brauer wrote: :* Florian Obser [2015-03-26 18:36]: :> On Thu, Mar 26, 2015 at 05:46:12PM +0100, Henning Brauer wrote: :> > * Mike Belopuhov [2015-03-26 14:36]: :> > > however I agree that if we do this for ipv6 we should do it for ipv4 as well :> > > but then do we care about tons of stuff out there parsing ifconfig output? :> > that's the prime question. I would love to move to CIDR notation - are :> > we breaking people's scripts with that? The inet side has been the same :> > for, what, decades? :> Of course this breaks stuff :) : :uh, now that you mention it, I didn't chose a very obvious way to ask :the question - of course the ifconfig output change breaks scripts :parsing ifconfig output, the real question being: how common are :scripts doing that? : I am happy to break scripts, when people aren't using CIDR ;) -- Due to lack of disk space, this fortune database has been discontinued.
add m_defrag to vio driver
Hi,
This diff refactors the vio driver to use m_defrag when mbuf chains get
fragmented, thoughts?
Index: if_vio.c
===
RCS file: /cvs/src/sys/dev/pci/if_vio.c,v
retrieving revision 1.25
diff -u -p -r1.25 if_vio.c
--- if_vio.c14 Mar 2015 03:38:48 - 1.25
+++ if_vio.c27 Mar 2015 09:36:37 -
@@ -1149,40 +1149,27 @@ vio_encap(struct vio_softc *sc, int slot
{
struct virtio_softc *vsc = sc->sc_virtio;
bus_dmamap_t dmap= sc->sc_tx_dmamaps[slot];
- struct mbuf *m0 = NULL;
int r;
r = bus_dmamap_load_mbuf(vsc->sc_dmat, dmap, m,
BUS_DMA_WRITE|BUS_DMA_NOWAIT);
- if (r == 0) {
- *mnew = m;
- return r;
- }
- if (r != EFBIG)
- return r;
- /* EFBIG: mbuf chain is too fragmented */
- MGETHDR(m0, M_DONTWAIT, MT_DATA);
- if (m0 == NULL)
- return ENOBUFS;
- if (m->m_pkthdr.len > MHLEN) {
- MCLGETI(m0, M_DONTWAIT, NULL, m->m_pkthdr.len);
- if (!(m0->m_flags & M_EXT)) {
- m_freem(m0);
- return ENOBUFS;
- }
- }
- m_copydata(m, 0, m->m_pkthdr.len, mtod(m0, caddr_t));
- m0->m_pkthdr.len = m0->m_len = m->m_pkthdr.len;
- r = bus_dmamap_load_mbuf(vsc->sc_dmat, dmap, m0,
- BUS_DMA_NOWAIT|BUS_DMA_WRITE);
- if (r != 0) {
- m_freem(m0);
+ switch (r) {
+ case 0:
+ break;
+ case EFBIG:
+ if ((r = m_defrag(m, M_DONTWAIT)) == 0 &&
+ (r = bus_dmamap_load_mbuf(vsc->sc_dmat, dmap, m,
+BUS_DMA_WRITE|BUS_DMA_NOWAIT)) == 0)
+ break;
+
+ /* FALLTHROUGH */
+ default:
printf("%s: tx dmamap load error %d\n", sc->sc_dev.dv_xname,
r);
return ENOBUFS;
}
- *mnew = m0;
- return 0;
+ *mnew = m;
+ return r;
}
/* free all the mbufs already put on vq; called from if_stop(disable) */
Re: Small ifconfig output tweak for inet6?
* Florian Obser [2015-03-26 18:36]: > On Thu, Mar 26, 2015 at 05:46:12PM +0100, Henning Brauer wrote: > > * Mike Belopuhov [2015-03-26 14:36]: > > > however I agree that if we do this for ipv6 we should do it for ipv4 as > > > well > > > but then do we care about tons of stuff out there parsing ifconfig output? > > that's the prime question. I would love to move to CIDR notation - are > > we breaking people's scripts with that? The inet side has been the same > > for, what, decades? > Of course this breaks stuff :) uh, now that you mention it, I didn't chose a very obvious way to ask the question - of course the ifconfig output change breaks scripts parsing ifconfig output, the real question being: how common are scripts doing that? -- Henning Brauer, h...@bsws.de, henn...@openbsd.org BS Web Services GmbH, http://bsws.de, Full-Service ISP Secure Hosting, Mail and DNS. Virtual & Dedicated Servers, Root to Fully Managed Henning Brauer Consulting, http://henningbrauer.com/
Re: [PATCH] pcap manpages
On Mar 27 09:16:52, h...@stare.cz wrote: > The diff below fixes what mandoc -Tlint complains about, > anotates the authors' names with .An in pcap.3 > and removes a bit of cruft. Damn, that was written against a non-current source. Some of the changes are already in. Here's a smaller one, just fixing the -Tlint complaint. Jan Index: pcap-filter.3 === RCS file: /cvs/src/lib/libpcap/pcap-filter.3,v retrieving revision 1.2 diff -u -p -u -p -r1.2 pcap-filter.3 --- pcap-filter.3 19 Feb 2014 04:51:32 - 1.2 +++ pcap-filter.3 27 Mar 2015 10:16:36 - @@ -342,7 +342,6 @@ it does for FDDI and 802.11; \fBatalk\fP the filter checks both for the AppleTalk etype in an Ethernet frame and for a SNAP-format packet as it does for FDDI, Token Ring, and 802.11; -.TP .RE .IP "\fBdecnet src \fIhost\fR" True if the DECNET source address is
Re: [PATCH] pcap manpages
On 03/27/15 09:34, Jason McIntyre wrote: > On Fri, Mar 27, 2015 at 09:25:40AM +0100, Giovanni Bechis wrote: >> On 03/27/15 09:16, Jan Stary wrote: >>> The diff below fixes what mandoc -Tlint complains about, >>> anotates the authors' names with .An in pcap.3 >>> and removes a bit of cruft. >>> >>> I have more diffs lined up for this, >>> in case someone was about to do that. >>> >>> Would it be beneficial to rewrite pcap-filter.3 in mdoc(7)? >>> >> if we do want to sync with upstream in the future a man page rewrite will >> complicate things. >> Cheers >> Giovanni >> > > i agree. > > is pcap-filter(3) directly imported from upstream, or somehow our page? > i mean, would jan be better directing his diffs upstream? > > jmc > I imported pcap-filter(3) at g2k12 from upstream, diffs should go there. Cheers Giovanni
Re: [PATCH] pcap manpages
On Fri, Mar 27, 2015 at 09:25:40AM +0100, Giovanni Bechis wrote: > On 03/27/15 09:16, Jan Stary wrote: > > The diff below fixes what mandoc -Tlint complains about, > > anotates the authors' names with .An in pcap.3 > > and removes a bit of cruft. > > > > I have more diffs lined up for this, > > in case someone was about to do that. > > > > Would it be beneficial to rewrite pcap-filter.3 in mdoc(7)? > > > if we do want to sync with upstream in the future a man page rewrite will > complicate things. > Cheers > Giovanni > i agree. is pcap-filter(3) directly imported from upstream, or somehow our page? i mean, would jan be better directing his diffs upstream? jmc
Re: [PATCH] pcap manpages
On 03/27/15 09:16, Jan Stary wrote: > The diff below fixes what mandoc -Tlint complains about, > anotates the authors' names with .An in pcap.3 > and removes a bit of cruft. > > I have more diffs lined up for this, > in case someone was about to do that. > > Would it be beneficial to rewrite pcap-filter.3 in mdoc(7)? > if we do want to sync with upstream in the future a man page rewrite will complicate things. Cheers Giovanni
[PATCH] pcap manpages
The diff below fixes what mandoc -Tlint complains about, anotates the authors' names with .An in pcap.3 and removes a bit of cruft. I have more diffs lined up for this, in case someone was about to do that. Would it be beneficial to rewrite pcap-filter.3 in mdoc(7)? Jan Index: pcap-filter.3 === RCS file: /cvs/src/lib/libpcap/pcap-filter.3,v retrieving revision 1.2 diff -u -p -r1.2 pcap-filter.3 --- pcap-filter.3 19 Feb 2014 04:51:32 - 1.2 +++ pcap-filter.3 27 Mar 2015 08:07:37 - @@ -342,7 +342,6 @@ it does for FDDI and 802.11; \fBatalk\fP the filter checks both for the AppleTalk etype in an Ethernet frame and for a SNAP-format packet as it does for FDDI, Token Ring, and 802.11; -.TP .RE .IP "\fBdecnet src \fIhost\fR" True if the DECNET source address is @@ -724,10 +723,9 @@ icmp[icmptype] != icmp-echo and icmp[icm .BR pcap ( 3 ), .BR tcpdump ( 8 ) .SH AUTHORS -The original authors are: -.LP Van Jacobson, -Craig Leres and -Steven McCanne, all of the -Lawrence Berkeley National Laboratory, University of California, Berkeley, CA. -.\" Fixes should be submitted to http://sourceforge.net/tracker/?group_id=53067 +Craig Leres +and +Steven McCanne, +all of the Lawrence Berkeley National Laboratory, +University of California, Berkeley, CA. Index: pcap.3 === RCS file: /cvs/src/lib/libpcap/pcap.3,v retrieving revision 1.35 diff -u -p -r1.35 pcap.3 --- pcap.3 25 Jun 2013 16:49:39 - 1.35 +++ pcap.3 27 Mar 2015 08:07:37 - @@ -46,9 +46,9 @@ .Ft void .Fn pcap_dump "u_char *user" "struct pcap_pkthdr *h" "u_char *sp" .Ft int -.Fn pcap_inject "pcap_t *p" "void *, size_t" +.Fn pcap_inject "pcap_t *p" "void * size_t" .Ft int -.Fn pcap_sendpacket "pcap_t *p" "void *, int" +.Fn pcap_sendpacket "pcap_t *p" "void * int" .Ft int .Fn pcap_compile "pcap_t *p" "struct bpf_program *fp" "char *str" "int optimize" "bpf_u_int32 netmask" .Ft int @@ -562,7 +562,9 @@ routine to an error string. .Xr tcpdump 8 .\" , tcpslice(1) .Sh AUTHORS -Van Jacobson, -Craig Leres and -Steven McCanne, all of the -Lawrence Berkeley National Laboratory, University of California, Berkeley, CA. +.An Van Jacobson , +.An Craig Leres +and +.An Steven McCanne , +all of the Lawrence Berkeley National Laboratory, +University of California, Berkeley, CA.
