commit 0434c6788715ef1959ae5960d1f418165dc9d0c8
from: kn <kn@openbsd.org>
date: Fri May 16 05:47:30 2025 UTC

fix synopsis, pcap-filter(5) expressions can be spread across argv

quoting is not strictly needed per se, i.e. those are equivalent:
	# tcpdump -i iwx0  port 22 and port 80
	# tcpdump -i iwx0 'port 22 and port 80'

commit - 25f4f1fd68ba432a6afaa30fee90aec1271976ed
commit + 0434c6788715ef1959ae5960d1f418165dc9d0c8
blob - 01086b74eb781aca61353dd87ce7961fc07e1573
blob + f90f9ce513b14dc851c3905266feceb60fff9a7f
--- sbin/pflogd/pflogd.8
+++ sbin/pflogd/pflogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pflogd.8,v 1.51 2019/08/30 17:51:47 jmc Exp $
+.\"	$OpenBSD: pflogd.8,v 1.52 2025/05/16 05:47:30 kn Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 30 2019 $
+.Dd $Mdocdate: May 16 2025 $
 .Dt PFLOGD 8
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Op Fl f Ar filename
 .Op Fl i Ar interface
 .Op Fl s Ar snaplen
-.Op Ar expression
+.Op Ar expression ...
 .Ek
 .Sh DESCRIPTION
 .Nm
blob - ad4230c72ea9b71083a780fdce77a1d517a692df
blob + 3cd3f12cea240468fc1aafd3b2e24fdfea75329b
--- sbin/pflogd/pflogd.c
+++ sbin/pflogd/pflogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pflogd.c,v 1.66 2023/11/17 12:10:23 claudio Exp $	*/
+/*	$OpenBSD: pflogd.c,v 1.67 2025/05/16 05:47:30 kn Exp $	*/
 
 /*
  * Copyright (c) 2001 Theo de Raadt
@@ -153,7 +153,7 @@ usage(void)
 {
 	fprintf(stderr, "usage: pflogd [-Dx] [-d delay] [-f filename]");
 	fprintf(stderr, " [-i interface] [-s snaplen]\n");
-	fprintf(stderr, "              [expression]\n");
+	fprintf(stderr, "              [expression ...]\n");
 	exit(1);
 }
 
blob - 8c5c015f13d456ee0247d1dacac8a4f1807201d2
blob + ca9ef6fea25528f9331a207341f3fd8197c19989
--- usr.sbin/bpflogd/bpflogd.8
+++ usr.sbin/bpflogd/bpflogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bpflogd.8,v 1.6 2025/05/07 05:42:43 jsg Exp $
+.\"	$OpenBSD: bpflogd.8,v 1.7 2025/05/16 05:47:30 kn Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 7 2025 $
+.Dd $Mdocdate: May 16 2025 $
 .Dt BPFLOGD 8
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Op Fl y Ar datalinktype
 .Fl f Ar filename
 .Fl i Ar interface
-.Op Ar expression
+.Op Ar expression ...
 .Sh DESCRIPTION
 .Nm
 is a daemon which captures packets using
blob - bb64ac62691540733179f1f2f2294924716de721
blob + 02769d299448187a8384c7c2efb34cc92fbd2cb3
--- usr.sbin/bpflogd/bpflogd.c
+++ usr.sbin/bpflogd/bpflogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpflogd.c,v 1.5 2025/05/15 12:49:05 kn Exp $	*/
+/*	$OpenBSD: bpflogd.c,v 1.6 2025/05/16 05:47:30 kn Exp $	*/
 
 /*
  * Copyright (c) 2025 The University of Queensland
@@ -106,7 +106,7 @@ usage(void)
 
 	fprintf(stderr, "usage: %s [-dPp] [-F filterfile] [-s snaplen] "
 	    "[-u user] [-w waitms]\n"
-	    "\t" "[-y datalinktype] -f filename -i interface [expression]\n",
+	    "\t" "[-y datalinktype] -f filename -i interface [expression ...]\n",
 	    __progname);
 
 	exit(1);
blob - 925784a2d7f8cc0499e4c5162ce39a19b3e0faab
blob + 32981d40a88e916d2a3234ebcf352307cf0aac1a
--- usr.sbin/tcpdump/tcpdump.8
+++ usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.117 2025/05/07 03:11:14 dlg Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.118 2025/05/16 05:47:30 kn Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: May 7 2025 $
+.Dd $Mdocdate: May 16 2025 $
 .Dt TCPDUMP 8
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Op Fl T Ar type
 .Op Fl w Ar file
 .Op Fl y Ar datalinktype
-.Op Ar expression
+.Op Ar expression ...
 .Sh DESCRIPTION
 .Nm
 prints out the headers of packets on a network interface that match the boolean
blob - d68df1a7c3fd62cf8a873aa9e9333e08b9dba1fa
blob + 8e67dde080f023a1da30d150257ce340c45555d3
--- usr.sbin/tcpdump/tcpdump.c
+++ usr.sbin/tcpdump/tcpdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpdump.c,v 1.99 2023/03/03 13:03:29 claudio Exp $	*/
+/*	$OpenBSD: tcpdump.c,v 1.100 2025/05/16 05:47:30 kn Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -688,6 +688,6 @@ usage(void)
 	(void)fprintf(stderr,
 "\t       [-E [espalg:]espkey] [-F file] [-i interface] [-r file]\n");
 	(void)fprintf(stderr,
-"\t       [-s snaplen] [-T type] [-w file] [-y datalinktype] [expression]\n");
+"\t       [-s snaplen] [-T type] [-w file] [-y datalinktype] [expression ...]\n");
 	exit(1);
 }