From: Denis Ovsienko Date: Sun, 28 Jan 2024 11:06:00 +0000 (+0000) Subject: Retire Tru64 UNIX support. X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/630f9bcaa844448d1033879bc0e2306efdcd31ab Retire Tru64 UNIX support. See also commit 6008cb8. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f6014f0..ce1d21e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1066,7 +1066,6 @@ set(NETDISSECT_SOURCE_LIST_C in_cksum.c ipproto.c l2vpn.c - machdep.c netdissect.c netdissect-alloc.c nlpid.c @@ -1308,15 +1307,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "IRIX" OR CMAKE_SYSTEM_NAME STREQUAL "IRIX64") # set(MAN_FILE_FORMATS 4) set(MAN_MISC_INFO 5) -elseif(CMAKE_SYSTEM_NAME STREQUAL "OSF1") - # - # DEC OSF/1, a/k/a Digital UNIX, a/k/a Tru64 UNIX. - # Use Tru64 UNIX conventions for man pages; they're the same as the - # System V conventions except that they use section 8 for - # administrative commands and daemons. - # - set(MAN_FILE_FORMATS 4) - set(MAN_MISC_INFO 5) elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*") # # SunOS 5.x. diff --git a/INSTALL.md b/INSTALL.md index 384ab81a..be0786c2 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -105,8 +105,6 @@ l2vpn.c - L2VPN encapsulation value-to-name table l2vpn.h - L2VPN encapsulation definitions lbl/os-*.h - OS-dependent defines and prototypes (currently none) llc.h - LLC definitions -machdep.c - machine dependent routines -machdep.h - machine dependent definitions makemib - mib to header script mib.h - mib definitions missing/* - replacements for missing library functions diff --git a/Makefile.in b/Makefile.in index c72945e8..5896da9d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,6 @@ LIBNETDISSECT_SRC=\ in_cksum.c \ ipproto.c \ l2vpn.c \ - machdep.c \ netdissect.c \ netdissect-alloc.c \ nlpid.c \ @@ -293,7 +292,6 @@ HDR = \ ipproto.h \ l2vpn.h \ llc.h \ - machdep.h \ mib.h \ mpls.h \ nameser.h \ diff --git a/aclocal.m4 b/aclocal.m4 index 2df9fef6..4c217211 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -148,28 +148,6 @@ AC_DEFUN(AC_LBL_C_INIT, $1="$$1 -xansi -signed -g3" ;; - osf*) - # - # Presumed to be DEC OSF/1, Digital UNIX, or - # Tru64 UNIX. - # - # The DEC C compiler, which is what we presume we're - # using, doesn't exit with a non-zero exit status if we - # hand it an invalid -W flag, can't be forced to do - # so, and doesn't handle GCC-style -W flags, so we - # don't want to try using GCC-style -W flags. - # - ac_lbl_cc_dont_try_gcc_dashW=yes - # - # -g is equivalent to -g2, which turns off - # optimization; we choose -g3, which generates - # debugging information but doesn't turn off - # optimization (even if the optimization would - # cause inaccuracies in debugging). - # - $1="$$1 -g3" - ;; - solaris*) # # Assumed to be Sun C, which requires -errwarn to force @@ -271,9 +249,9 @@ AC_DEFUN(AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT, # case "$host_os" in - irix*|osf*|darwin*) + irix*|darwin*) # - # MIPS C for IRIX, DEC C, and clang all use -M. + # MIPS C for IRIX and Clang use -M. # ac_lbl_dependency_flag="-M" ;; diff --git a/configure.ac b/configure.ac index 4e0dc2de..0f1c08b8 100644 --- a/configure.ac +++ b/configure.ac @@ -734,16 +734,6 @@ irix*) MAN_MISC_INFO=5 ;; -osf*) - V_GROUP=system - - # - # Use System V conventions for man pages. - # - MAN_FILE_FORMATS=4 - MAN_MISC_INFO=5 - ;; - solaris*) V_GROUP=sys diff --git a/machdep.c b/machdep.c deleted file mode 100644 index 2578b73c..00000000 --- a/machdep.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that: (1) source code distributions - * retain the above copyright notice and this paragraph in its entirety, (2) - * distributions including binary code include the above copyright notice and - * this paragraph in its entirety in the documentation or other materials - * provided with the distribution, and (3) all advertising materials mentioning - * features or use of this software display the following acknowledgement: - * ``This product includes software developed by the University of California, - * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of - * the University nor the names of its contributors may be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -#ifdef __osf__ -#include -#include -#include -#endif /* __osf__ */ - -#include "varattrs.h" -#include "machdep.h" - -/* - * On platforms where the CPU doesn't support unaligned loads, force - * unaligned accesses to abort with SIGBUS, rather than being fixed - * up (slowly) by the OS kernel; on those platforms, misaligned accesses - * are bugs, and we want tcpdump to crash so that the bugs are reported. - * - * The only OS on which this is necessary is DEC OSF/1^W^WDigital - * UNIX^W^WTru64 UNIX. - */ -int -abort_on_misalignment(char *ebuf _U_, size_t ebufsiz _U_) -{ -#ifdef __osf__ - static int buf[2] = { SSIN_UACPROC, UAC_SIGBUS }; - - if (setsysinfo(SSI_NVPAIRS, (caddr_t)buf, 1, 0, 0) < 0) { - (void)snprintf(ebuf, ebufsiz, "setsysinfo: errno %d", errno); - return (-1); - } -#endif - return (0); -} diff --git a/machdep.h b/machdep.h deleted file mode 100644 index ba8ed389..00000000 --- a/machdep.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 1996 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that: (1) source code distributions - * retain the above copyright notice and this paragraph in its entirety, (2) - * distributions including binary code include the above copyright notice and - * this paragraph in its entirety in the documentation or other materials - * provided with the distribution, and (3) all advertising materials mentioning - * features or use of this software display the following acknowledgement: - * ``This product includes software developed by the University of California, - * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of - * the University nor the names of its contributors may be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ -#ifndef netdissect_machdep_h -#define netdissect_machdep_h - -int abort_on_misalignment(char *, size_t); -#endif diff --git a/parsenfsfh.c b/parsenfsfh.c index 79f7614c..f73aa463 100644 --- a/parsenfsfh.c +++ b/parsenfsfh.c @@ -118,9 +118,6 @@ Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len, #if defined(SUNOS5) fhtype = FHT_SUNOS5; #endif -#if defined(__osf__) - fhtype = FHT_DECOSF; -#endif #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) \ || defined(__OpenBSD__) fhtype = FHT_BSD44; diff --git a/print-wb.c b/print-wb.c index 35b5a196..dd3e2129 100644 --- a/print-wb.c +++ b/print-wb.c @@ -73,10 +73,6 @@ struct pkt_hdr { #define PT_PREP 7 /* page vector reply */ #if 0 -#ifdef PF_USER -#undef PF_USER /* {Digital,Tru64} UNIX define this, alas */ -#endif - /* flags */ #define PF_USER 0x01 /* hint that packet has interactive data */ #define PF_VIS 0x02 /* only visible ops wanted */ diff --git a/tcpdump.1.in b/tcpdump.1.in index 536fe75f..c18ac3a9 100644 --- a/tcpdump.1.in +++ b/tcpdump.1.in @@ -222,7 +222,7 @@ 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 macOS) and Digital/Tru64 UNIX, it will report those counts +(including macOS), 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 macOS, the ``status'' character is not set by diff --git a/tcpdump.c b/tcpdump.c index d8c49432..5e232197 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -157,7 +157,6 @@ The Regents of the University of California. All rights reserved.\n"; #include "netdissect.h" #include "interface.h" #include "addrtoname.h" -#include "machdep.h" #include "pcap-missing.h" #include "ascii_strcasecmp.h" @@ -1567,16 +1566,6 @@ main(int argc, char **argv) error("Attempting to initialize Winsock failed"); #endif - /* - * On platforms where the CPU doesn't support unaligned loads, - * force unaligned accesses to abort with SIGBUS, rather than - * being fixed up (slowly) by the OS kernel; on those platforms, - * misaligned accesses are bugs, and we want tcpdump to crash so - * that the bugs are reported. - */ - if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0) - error("%s", ebuf); - /* * An explicit tzset() call is usually not needed as it happens * implicitly the first time we call localtime() or mktime(),