Use pcapng as the name of the file format.

At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.

Make tcpdump reflect that.

While we're at it, uppdate to use "macOS" as the name of Apple's
UNIX-for-Macs, as appropriate (don't use it for versions that were still
called Mac OS X or OS X).

diff --git a/PLATFORMS b/PLATFORMS
index 4f11c5156416ae5d0ed4d61771e8cf00e836ed56..cba4bc5f2b7ea84a8ef50a109aa5a951a17725e1 100644 (file)
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -10,7 +10,7 @@ tcpdump compiles and works on at least the following platforms:
 * HP-UX 11i
 * Linux (any) with glibc (usually just works)
 * Linux (any) with musl libc (sometimes fails to compile, please report any bugs)
-* Mac OS X / macOS
+* {Mac} OS X / macOS
 * NetBSD
 * OpenWrt
 * Solaris

diff --git a/af.h b/af.h
index 6365b1262073b04988ac8fb664abc624e7804c01..b9fec8e635ad299e382a334edfa563af494d8009 100644 (file)
--- a/af.h
+++ b/af.h
@@ -52,4 +52,4 @@ extern const struct tok bsd_af_values[];
 #define BSD_AFNUM_IPX          23
 #define BSD_AFNUM_INET6_BSD    24      /* NetBSD, OpenBSD, BSD/OS, Npcap */
 #define BSD_AFNUM_INET6_FREEBSD        28      /* FreeBSD */
-#define BSD_AFNUM_INET6_DARWIN 30      /* OS X, iOS, other Darwin-based OSes */
+#define BSD_AFNUM_INET6_DARWIN 30      /* macOS, iOS, other Darwin-based OSes */

diff --git a/configure b/configure
index e6b6a43e7df649f1cc03c15d700d219f3f1687c9..72955936178b431215ad042e346b12ae5299bde3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1330,7 +1330,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-universal     don't build universal on OS X
+  --disable-universal     don't build universal on macOS
   --enable-smb            enable possibly-buggy SMB printer default=yes
   --disable-smb           disable possibly-buggy SMB printer
 
@@ -7654,7 +7654,7 @@ if test "$want_libcrypto" != "no"; then
        # El Capitan, probably because they don't want you writing
        # nasty portable code that could run on other UN*Xes, they
        # want you writing code that uses their Shiny New Crypto
-       # Library and that only runs on OS X.
+       # Library and that only runs on macOS.
        #
        ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
 if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :

diff --git a/configure.ac b/configure.ac
index b39cc55e9d47efaa846a6b0e763b667cd595d265..485ac1f9c825944d9c766dce2962a7229f508f7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ case "$host_os" in
 
 darwin*)
        AC_ARG_ENABLE(universal,
-       AC_HELP_STRING([--disable-universal],[don't build universal on OS X]))
+       AC_HELP_STRING([--disable-universal],[don't build universal on macOS]))
        if test "$enable_universal" != "no"; then
                case "$host_os" in
 
@@ -644,9 +644,10 @@ fi
 #
 AC_CHECK_FUNCS(pcap_findalldevs)
 if test $ac_cv_func_pcap_findalldevs = "yes" ; then
-dnl Check for Mac OS X, which may ship pcap.h from 0.6 but libpcap may
-dnl be 0.8; this means that lib has pcap_findalldevs but header doesn't
-dnl have pcap_if_t.
+dnl Check for libpcap having pcap_findalldevs() but the pcap.h header
+dnl not having pcap_if_t; some versions of Mac OS X shipped with pcap.h
+dnl from 0.6 and libpcap 0.8, so that libpcap had pcap_findalldevs but
+dnl pcap.h didn't have pcap_if_t.
     savedcppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $V_INCLS"
     AC_CHECK_TYPES(pcap_if_t, , , [#include <pcap.h>])
@@ -891,7 +892,7 @@ if test "$want_libcrypto" != "no"; then
        # El Capitan, probably because they don't want you writing
        # nasty portable code that could run on other UN*Xes, they
        # want you writing code that uses their Shiny New Crypto
-       # Library and that only runs on OS X.
+       # Library and that only runs on macOS.
        #
        AC_CHECK_HEADER(openssl/crypto.h,
        [

diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index b214be5fba1a4f51e29aacab36d32330d7d5ccc7..c6e1c2c8df94e153a3524ee409da13b95e4d08ab 100644 (file)
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -335,8 +335,8 @@ typedef char* caddr_t;
  * an 80386, so, for example, it avoids the bswap instruction added in
  * the 80486.
  *
- * (We don't use them on OS X; Apple provides their own, which *doesn't*
- * avoid the bswap instruction, as OS X only supports machines that
+ * (We don't use them on macOS; Apple provides their own, which *doesn't*
+ * avoid the bswap instruction, as macOS only supports machines that
  * have it.)
  */
 #if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl)

diff --git a/print-802_11.c b/print-802_11.c
index daeb0c907d7f4ed91a561b75cc9918c9da4f1ad4..8722f854b9791f9a65f282fbb5938446e34f63a7 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -2589,7 +2589,7 @@ print_radiotap_field(netdissect_options *ndo,
                /*
                 * XXX On FreeBSD rate & 0x80 means we have an MCS. On
                 * Linux and AirPcap it does not.  (What about
-                * Mac OS X, NetBSD, OpenBSD, and DragonFly BSD?)
+                * macOS, NetBSD, OpenBSD, and DragonFly BSD?)
                 *
                 * This is an issue either for proprietary extensions
                 * to 11a or 11g, which do exist, or for 11n

diff --git a/tcpdump.1.in b/tcpdump.1.in
index a3ec35d6aa737296f2d7a536ceef165a467f48b4..eced6958afd694573a904addfe591e7d58959333 100644 (file)
--- a/tcpdump.1.in
+++ b/tcpdump.1.in
@@ -202,10 +202,10 @@ is running, if the OS reports that information to applications; if not,
 it will be reported as 0).
 .LP
 On platforms that support the SIGINFO signal, such as most BSDs
-(including Mac OS X) and Digital/Tru64 UNIX, it will report those counts
+(including macOS) and Digital/Tru64 UNIX, it will report those counts
 when it receives a SIGINFO signal (generated, for example, by typing
 your ``status'' character, typically control-T, although on some
-platforms, such as Mac OS X, the ``status'' character is not set by
+platforms, such as macOS, the ``status'' character is not set by
 default, so you must set it with
 .BR stty (1)
 in order to use it) and will continue capturing packets. On platforms that
@@ -600,7 +600,7 @@ lines are shorter.
 .BI \-r " file"
 Read packets from \fIfile\fR (which was created with the
 .B \-w
-option or by other tools that write pcap or pcap-ng files).
+option or by other tools that write pcap or pcapng files).
 Standard input is used if \fIfile\fR is ``-''.
 .TP
 .B \-S

diff --git a/tcpdump.c b/tcpdump.c
index 84f30f2d41c570694fc194551735f635fc4e57aa..447058d53f5282ece68632fcdb112e7e934f5138 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -503,22 +503,22 @@ show_remote_devices_and_exit(void)
  * only use them for the same purposes that the other versions of tcpdump
  * use them:
  *
- * OS X tcpdump uses -g to force non--v output for IP to be on one
+ * macOS tcpdump uses -g to force non--v output for IP to be on one
  * line, making it more "g"repable;
  *
- * OS X tcpdump uses -k to specify that packet comments in pcap-ng files
+ * macOS tcpdump uses -k to specify that packet comments in pcapng files
  * should be printed;
  *
  * OpenBSD tcpdump uses -o to indicate that OS fingerprinting should be done
  * for hosts sending TCP SYN packets;
  *
- * OS X tcpdump uses -P to indicate that -w should write pcap-ng rather
+ * macOS tcpdump uses -P to indicate that -w should write pcapng rather
  * than pcap files.
  *
- * OS X tcpdump also uses -Q to specify expressions that match packet
+ * macOS tcpdump also uses -Q to specify expressions that match packet
  * metadata, including but not limited to the packet direction.
  * The expression syntax is different from a simple "in|out|inout",
- * and those expressions aren't accepted by OS X tcpdump, but the
+ * and those expressions aren't accepted by macOS tcpdump, but the
  * equivalents would be "in" = "dir=in", "out" = "dir=out", and
  * "inout" = "dir=in or dir=out", and the parser could conceivably
  * special-case "in", "out", and "inout" as expressions for backwards

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 1e2a850815330e0f20797beeceae10fd7337564e..c65ce3968d11c05d7f8ca770eb533e7161f59f9c 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -7,7 +7,7 @@
 # "print-X.out" being different files - we might be running
 # this on a case-insensitive file system, e.g. a Windows
 # file system or a case-insensitive HFS+ file system on
-# Mac OS X.
+# macOS.
 #
 # Therefore, for "X" and "XX", we have "print-capX.out"
 # and "print-capXX.out".