head 1.30; access; symbols pkgsrc-2026Q1:1.30.0.32 pkgsrc-2026Q1-base:1.30 pkgsrc-2025Q4:1.30.0.30 pkgsrc-2025Q4-base:1.30 pkgsrc-2025Q3:1.30.0.28 pkgsrc-2025Q3-base:1.30 pkgsrc-2025Q2:1.30.0.26 pkgsrc-2025Q2-base:1.30 pkgsrc-2025Q1:1.30.0.24 pkgsrc-2025Q1-base:1.30 pkgsrc-2024Q4:1.30.0.22 pkgsrc-2024Q4-base:1.30 pkgsrc-2024Q3:1.30.0.20 pkgsrc-2024Q3-base:1.30 pkgsrc-2024Q2:1.30.0.18 pkgsrc-2024Q2-base:1.30 pkgsrc-2024Q1:1.30.0.16 pkgsrc-2024Q1-base:1.30 pkgsrc-2023Q4:1.30.0.14 pkgsrc-2023Q4-base:1.30 pkgsrc-2023Q3:1.30.0.12 pkgsrc-2023Q3-base:1.30 pkgsrc-2023Q2:1.30.0.10 pkgsrc-2023Q2-base:1.30 pkgsrc-2023Q1:1.30.0.8 pkgsrc-2023Q1-base:1.30 pkgsrc-2022Q4:1.30.0.6 pkgsrc-2022Q4-base:1.30 pkgsrc-2022Q3:1.30.0.4 pkgsrc-2022Q3-base:1.30 pkgsrc-2022Q2:1.30.0.2 pkgsrc-2022Q2-base:1.30 pkgsrc-2022Q1:1.29.0.116 pkgsrc-2022Q1-base:1.29 pkgsrc-2021Q4:1.29.0.114 pkgsrc-2021Q4-base:1.29 pkgsrc-2021Q3:1.29.0.112 pkgsrc-2021Q3-base:1.29 pkgsrc-2021Q2:1.29.0.110 pkgsrc-2021Q2-base:1.29 pkgsrc-2021Q1:1.29.0.108 pkgsrc-2021Q1-base:1.29 pkgsrc-2020Q4:1.29.0.106 pkgsrc-2020Q4-base:1.29 pkgsrc-2020Q3:1.29.0.104 pkgsrc-2020Q3-base:1.29 pkgsrc-2020Q2:1.29.0.100 pkgsrc-2020Q2-base:1.29 pkgsrc-2020Q1:1.29.0.80 pkgsrc-2020Q1-base:1.29 pkgsrc-2019Q4:1.29.0.102 pkgsrc-2019Q4-base:1.29 pkgsrc-2019Q3:1.29.0.98 pkgsrc-2019Q3-base:1.29 pkgsrc-2019Q2:1.29.0.96 pkgsrc-2019Q2-base:1.29 pkgsrc-2019Q1:1.29.0.94 pkgsrc-2019Q1-base:1.29 pkgsrc-2018Q4:1.29.0.92 pkgsrc-2018Q4-base:1.29 pkgsrc-2018Q3:1.29.0.90 pkgsrc-2018Q3-base:1.29 pkgsrc-2018Q2:1.29.0.88 pkgsrc-2018Q2-base:1.29 pkgsrc-2018Q1:1.29.0.86 pkgsrc-2018Q1-base:1.29 pkgsrc-2017Q4:1.29.0.84 pkgsrc-2017Q4-base:1.29 pkgsrc-2017Q3:1.29.0.82 pkgsrc-2017Q3-base:1.29 pkgsrc-2017Q2:1.29.0.78 pkgsrc-2017Q2-base:1.29 pkgsrc-2017Q1:1.29.0.76 pkgsrc-2017Q1-base:1.29 pkgsrc-2016Q4:1.29.0.74 pkgsrc-2016Q4-base:1.29 pkgsrc-2016Q3:1.29.0.72 pkgsrc-2016Q3-base:1.29 pkgsrc-2016Q2:1.29.0.70 pkgsrc-2016Q2-base:1.29 pkgsrc-2016Q1:1.29.0.68 pkgsrc-2016Q1-base:1.29 pkgsrc-2015Q4:1.29.0.66 pkgsrc-2015Q4-base:1.29 pkgsrc-2015Q3:1.29.0.64 pkgsrc-2015Q3-base:1.29 pkgsrc-2015Q2:1.29.0.62 pkgsrc-2015Q2-base:1.29 pkgsrc-2015Q1:1.29.0.60 pkgsrc-2015Q1-base:1.29 pkgsrc-2014Q4:1.29.0.58 pkgsrc-2014Q4-base:1.29 pkgsrc-2014Q3:1.29.0.56 pkgsrc-2014Q3-base:1.29 pkgsrc-2014Q2:1.29.0.54 pkgsrc-2014Q2-base:1.29 pkgsrc-2014Q1:1.29.0.52 pkgsrc-2014Q1-base:1.29 pkgsrc-2013Q4:1.29.0.50 pkgsrc-2013Q4-base:1.29 pkgsrc-2013Q3:1.29.0.48 pkgsrc-2013Q3-base:1.29 pkgsrc-2013Q2:1.29.0.46 pkgsrc-2013Q2-base:1.29 pkgsrc-2013Q1:1.29.0.44 pkgsrc-2013Q1-base:1.29 pkgsrc-2012Q4:1.29.0.42 pkgsrc-2012Q4-base:1.29 pkgsrc-2012Q3:1.29.0.40 pkgsrc-2012Q3-base:1.29 pkgsrc-2012Q2:1.29.0.38 pkgsrc-2012Q2-base:1.29 pkgsrc-2012Q1:1.29.0.36 pkgsrc-2012Q1-base:1.29 pkgsrc-2011Q4:1.29.0.34 pkgsrc-2011Q4-base:1.29 pkgsrc-2011Q3:1.29.0.32 pkgsrc-2011Q3-base:1.29 pkgsrc-2011Q2:1.29.0.30 pkgsrc-2011Q2-base:1.29 pkgsrc-2011Q1:1.29.0.28 pkgsrc-2011Q1-base:1.29 pkgsrc-2010Q4:1.29.0.26 pkgsrc-2010Q4-base:1.29 pkgsrc-2010Q3:1.29.0.24 pkgsrc-2010Q3-base:1.29 pkgsrc-2010Q2:1.29.0.22 pkgsrc-2010Q2-base:1.29 pkgsrc-2010Q1:1.29.0.20 pkgsrc-2010Q1-base:1.29 pkgsrc-2009Q4:1.29.0.18 pkgsrc-2009Q4-base:1.29 pkgsrc-2009Q3:1.29.0.16 pkgsrc-2009Q3-base:1.29 pkgsrc-2009Q2:1.29.0.14 pkgsrc-2009Q2-base:1.29 pkgsrc-2009Q1:1.29.0.12 pkgsrc-2009Q1-base:1.29 pkgsrc-2008Q4:1.29.0.10 pkgsrc-2008Q4-base:1.29 pkgsrc-2008Q3:1.29.0.8 pkgsrc-2008Q3-base:1.29 cube-native-xorg:1.29.0.6 cube-native-xorg-base:1.29 pkgsrc-2008Q2:1.29.0.4 pkgsrc-2008Q2-base:1.29 cwrapper:1.29.0.2 pkgsrc-2008Q1:1.28.0.10 pkgsrc-2008Q1-base:1.28 pkgsrc-2007Q4:1.28.0.8 pkgsrc-2007Q4-base:1.28 pkgsrc-2007Q3:1.28.0.6 pkgsrc-2007Q3-base:1.28 pkgsrc-2007Q2:1.28.0.4 pkgsrc-2007Q2-base:1.28 pkgsrc-2007Q1:1.28.0.2 pkgsrc-2007Q1-base:1.28 pkgsrc-2006Q4:1.27.0.10 pkgsrc-2006Q4-base:1.27 pkgsrc-2006Q3:1.27.0.8 pkgsrc-2006Q3-base:1.27 pkgsrc-2006Q2:1.27.0.6 pkgsrc-2006Q2-base:1.27 pkgsrc-2006Q1:1.27.0.4 pkgsrc-2006Q1-base:1.27 pkgsrc-2005Q4:1.27.0.2 pkgsrc-2005Q4-base:1.27 pkgsrc-2005Q3:1.26.0.2 pkgsrc-2005Q3-base:1.26 pkgsrc-2005Q2:1.25.0.2 pkgsrc-2005Q2-base:1.25 pkgsrc-2005Q1:1.22.0.2 pkgsrc-2005Q1-base:1.22 pkgsrc-2004Q4:1.21.0.2 pkgsrc-2004Q4-base:1.21 pkgsrc-2004Q3:1.17.0.2 pkgsrc-2004Q3-base:1.17 pkgsrc-2004Q2:1.16.0.2 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.15.0.2 pkgsrc-2004Q1-base:1.15 pkgsrc-2003Q4:1.13.0.2 pkgsrc-2003Q4-base:1.13 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 buildlink2-base:1.5 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4; locks; strict; comment @# @; 1.30 date 2022.05.25.09.33.37; author tnn; state Exp; branches; next 1.29; commitid JnTrWgbOon7C2qFD; 1.29 date 2008.05.17.23.53.29; author christos; state Exp; branches; next 1.28; 1.28 date 2007.03.14.11.36.25; author markd; state dead; branches; next 1.27; 1.27 date 2005.11.09.08.06.32; author tron; state Exp; branches; next 1.26; 1.26 date 2005.09.13.20.18.28; author christos; state dead; branches; next 1.25; 1.25 date 2005.05.24.20.40.56; author kristerw; state Exp; branches; next 1.24; 1.24 date 2005.05.17.04.45.08; author atatat; state dead; branches; next 1.23; 1.23 date 2005.03.26.20.36.01; author kristerw; state Exp; branches; next 1.22; 1.22 date 2005.01.17.14.54.01; author atatat; state dead; branches; next 1.21; 1.21 date 2004.11.30.02.02.13; author atatat; state Exp; branches; next 1.20; 1.20 date 2004.11.28.22.39.07; author atatat; state Exp; branches; next 1.19; 1.19 date 2004.11.12.05.41.36; author erh; state Exp; branches; next 1.18; 1.18 date 2004.11.07.18.16.27; author kim; state Exp; branches; next 1.17; 1.17 date 2004.07.13.13.42.41; author atatat; state dead; branches; next 1.16; 1.16 date 2004.04.29.04.19.22; author atatat; state Exp; branches; next 1.15; 1.15 date 2004.01.17.19.31.30; author atatat; state dead; branches; next 1.14; 1.14 date 2004.01.13.02.50.28; author atatat; state Exp; branches; next 1.13; 1.13 date 2003.11.22.23.19.47; author christos; state dead; branches; next 1.12; 1.12 date 2003.10.04.20.22.35; author atatat; state Exp; branches; next 1.11; 1.11 date 2003.09.26.03.13.04; author atatat; state Exp; branches; next 1.10; 1.10 date 2003.08.13.13.24.16; author atatat; state Exp; branches; next 1.9; 1.9 date 2003.06.19.03.09.38; author atatat; state dead; branches; next 1.8; 1.8 date 2003.05.03.16.55.29; author atatat; state Exp; branches; next 1.7; 1.7 date 2003.03.27.14.13.27; author atatat; state dead; branches; next 1.6; 1.6 date 2003.02.03.01.03.15; author atatat; state Exp; branches; next 1.5; 1.5 date 2000.02.19.03.58.27; author wiz; state dead; branches; next 1.4; 1.4 date 99.06.25.02.41.15; author hubertf; state Exp; branches; next 1.3; 1.3 date 99.06.02.16.14.53; author christos; state Exp; branches; next 1.2; 1.2 date 99.05.20.10.32.37; author kleink; state Exp; branches; next 1.1; 1.1 date 99.05.05.17.40.38; author bad; state Exp; branches; next ; desc @@ 1.30 log @lsof: support kmem grovelling of current-era NetBSD rbtree kernel namecache @ text @$NetBSD: patch-ac,v 1.29 2008/05/17 23:53:29 christos Exp $ --- dialects/n+obsd/dstore.c.orig 2004-12-30 18:42:32.000000000 +0000 +++ dialects/n+obsd/dstore.c @@@@ -48,7 +48,9 @@@@ struct file *Cfp; /* current file's fil */ struct drive_Nl Drive_Nl[] = { - +#if (defined(NETBSDV) && NETBSDV>=9099000) + { "rootvnode", "rootvnode", }, +#endif #if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) { X_NCACHE, "_nchashtbl", }, { X_NCSIZE, "_nchash" }, @@@@ -119,6 +121,8 @@@@ struct pff_tab Pof_tab[] = { # if defined(UF_EXCLOSE) { (long)UF_EXCLOSE, POF_CLOEXEC }, +# else + { (long)1, POF_CLOEXEC }, # endif /* defined(UF_EXCLOSE) */ # if defined(UF_MAPPED) @ 1.29 log @make this work again. @ text @d1 1 a1 1 $NetBSD$ d3 14 a16 3 --- dialects/n+obsd/dstore.c.orig 2004-12-30 13:42:32.000000000 -0500 +++ dialects/n+obsd/dstore.c 2008-05-17 19:35:34.000000000 -0400 @@@@ -119,6 +119,8 @@@@ @ 1.28 log @Update lsof to 4.77. Include official patch to fix build on Solaris 10 06/06 or newer. Fix HOMEPAGE. The April 10, 2006 revision (4.77): adds Solaris 10 and above -X option selection of the display of unlinked file cached paths; improved reporting of Solaris 10 cached path names of questionable accuracy; has FreeBSD 7.0-CURRENT update; fixes name addition spacing bug; has limited SAMFS support for Solaris 10; fixes an HP-UX 11 file "chunk" size problem; updates for FreeBSD 6.0; updates scripts/sort_res.perl5; corrects +|-M man page error; improves FreeBSD user device random seed generation; documents in 00FAQ bundled C and gcc compilation failures on HP-UX 11.23 dated May 2005 or later; corrects bugs and eliminates compiler warnings in PSTAT-based HP-UX lsof and in the lsof test suite; changed the method of reporting unknown file types; dropped the *claim* that lsof works on BSDI BSD/OS; enables compilation on Solaris 10 1/06; adjusts to FreeBSD 5.5-PRELELEASE and 6.1-PRERELEASE; fixes locating AIX ATI sockets by their associated TCP/IP addresses; adjusts to OpenBSD 3.[89]; ends 32 bit Solaris 8 testing (testing on 64 bit Solaris 8 continues.) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.27 2005/11/09 08:06:32 tron Exp $ d3 3 a5 5 --- dialects/n+obsd/dlsof.h.orig 2005-08-08 20:53:27.000000000 +0100 +++ dialects/n+obsd/dlsof.h 2005-11-09 08:04:05.000000000 +0000 @@@@ -69,7 +69,7 @@@@ # endif /* (defined(OPENBSDV) && OPENBSDV>=3030) || (defined(NETBSDV) && __NetBSD_Version__>=106060000) */ d7 5 a11 4 -# if defined(NETBSDV) +# if defined(NETBSDV) && __NetBSD_Version__<399001100 #include # endif /* defined(NETBSDV) */ d13 1 @ 1.27 log @Fix build problem under NetBSD 3.99.11 as suggested by Andrew Brown in private e-mail. @ text @d1 1 a1 1 $NetBSD$ @ 1.26 log @lsof 4.75 is gone; use 4.76 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.25 2005/05/24 20:40:56 kristerw Exp $ d3 10 a12 12 --- dialects/darwin/get-hdr-loc.sh.orig Sat Mar 26 21:23:20 2005 +++ dialects/darwin/get-hdr-loc.sh Sat Mar 26 21:24:29 2005 @@@@ -50,11 +50,9 @@@@ echo "" 1>&2 echo "(See 00FAQ for download instructions.)" 1>&2 echo "" 1>&2 - echo "Now you must specify the path to the place to which they were" 1>&2 - echo "downloaded." 1>&2 - echo "" 1>&2 echo "-------------------------------------------------------------" 1>&2 fi # } + exit 1 a13 2 END=0 while test $END = 0 # { @ 1.25 log @Do not ask the user about the path to the darwin XNU kernel header files in the case they are not found -- report an error instead (since going interactive breaks bulk building...) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.23 2005/03/26 20:36:01 kristerw Exp $ @ 1.24 log @Upgrade to lsof version 4.75, thereby getting rid of most of the accumulated patches. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.75 May 16, 2005 ... Improved the BSDI, FreeBSD, NetBSD, OpenBSD and Solaris kvm_open() and kvm_openfiles() error messages. Enabled support for NetBSD 2.99.12. Also, add the "uname -r" value to the lsof package version. This means that lintpkgsrc will report the lsof package as being out of date if you update your kernel without updating lsof. It's entirely likely that lsof will continue to work, but it might not (and it will warn you anyway), but it's nice to know that it might be good to rebuild it. @ text @@ 1.23 log @Do not ask the user about the path to the darwin XNU kernel header files in the case they are not found -- report an error instead (since asking the user breaks bulk builds). @ text @d1 1 a1 1 $NetBSD$ @ 1.22 log @Upgrade to lsof version 4.74, thereby getting rid of most of the accumulated patches. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.74 January 17, 2005 ... Updated lsof for NetBSD 2.99.10 and tested it on a system provided by Andrew Brown . ... Added BSDI, FreeBSD, NetBSD and OpenBSD support for the *effnlink member of the inode structure. This makes the lsof LTnlink test run faster on all modified dialects and correctly on OpenBSD. Added ptyfs support for NetBSD, using modifications provided by Andrew Brown. Changed the netbsd Configure stanza to look by default for system header files in both /usr/include and /usr/src. (The NETBSD_SYS environment variable can still be used to select an alternate for /usr/src.) ... @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.21 2004/11/30 02:02:13 atatat Exp $ d3 12 a14 821 Incorporate a patch from the author that widens the NETBSDV definition to account for new current versioning system, properly handles the sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs support. --- Configure.orig 2004-10-19 15:36:21.000000000 -0400 +++ Configure @@@@ -161,6 +161,7 @@@@ LSOF_TSTK64=0 LSOF_TSTKMEM=1 LSOF_TSTLFF="${LSOF_TSTSUBD}/config.ldflags" LSOF_TSTLFLG="" +LSOF_TSTVPATH=0 LSOF_TSTXO="" LSOF_TSTXOC="${LSOF_TSTSUBD}/config.xobj" if test "X$LSOF_VERS" = "X" # { @@@@ -2264,51 +2265,49 @@@@ return(0); } # Validate the NetBSD version. case $LSOF_VSTR in # { - 1.0*) - LSOF_VERS="1000" - ;; - 1.1*) - LSOF_VERS="1010" - ;; 1.2*) - LSOF_VERS="1020" + LSOF_VERS="1002000" ;; 1.3*) - LSOF_VERS="1030" + LSOF_VERS="1003000" ;; 1.4*) - LSOF_VERS="1040" + LSOF_VERS="1004000" ;; 1.5*) LSOF_TSTBIGF=" " - LSOF_VERS="1050" + LSOF_VERS="1005000" ;; 1.6*) LSOF_TSTBIGF=" " - LSOF_VERS="1060" + LSOF_VERS="1006000" ;; 1*) - LSOF_VERS=1060 + LSOF_VERS="1006000" echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" echo "!!!WARNING!!! Configuring for NetBSD 1.6" ;; 2.0*) LSOF_TSTBIGF=" " - LSOF_VERS="2000" + LSOF_VERS="2000000" ;; 2.99.9) LSOF_TSTBIGF=" " - LSOF_VERS="2999" + LSOF_VERS="2099009" + ;; + 2.99.10) + LSOF_TSTBIGF=" " + LSOF_VERS="2099010" ;; 2*) - LSOF_VERS=2000 + LSOF_VERS="2000000" echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" echo "!!!WARNING!!! Configuring for NetBSD 2.0" ;; *) echo "Unknown NetBSD release: $LSOF_VSTR" - echo Assuming NetBSD 1.0 - LSOF_VERS="1000" + echo Assuming NetBSD 1.6 + LSOF_VERS="1006000" ;; esac # } fi # } @@@@ -2316,7 +2315,7 @@@@ return(0); } # Test for legal NetBSD version. case $LSOF_VERS in # { - 1000|1010|1020|1030|1040|1050|1060|2000|2999) + 1002000|1003000|1004000|1005000|1006000|2000000|2099009|2099010) ;; *) echo "Unknown NetBSD version: $LSOF_VERS" @@@@ -2336,166 +2335,637 @@@@ return(0); } fi # } fi # } LSOF_CFGF="$LSOF_CFGF $LSOF_TMP1" - if test -r ${LSOF_INCLUDE}/nfs/nfsproto.h # { + if test -r ${LSOF_INCLUDE}/kvm.h # { + then + grep -q kvm_getproc2 ${LSOF_INCLUDE}/kvm.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASKVMGETPROC2" + fi # } + fi # } + + # Here begin the dual tests on header files that may be in $LSOF_INCLUDE + # or $NETBSD_SYS. + # + # Note that $LSOF_TMP1 holds an indicator of the need for -I$NETBSD_SYS. + # LSOF_TMP4 contains a temporary indicator of the use of $NETBSD_SYS. + + LSOF_TMP1=0 + if test "X$NETBSD_SYS" = "X" # { then - LSOF_CFGF="$LSOF_CFGF -DHASNFSPROTO" + if test -d /usr/src # { + then + NETBSD_SYS="/usr/src/sys" + else + NETBSD_SYS=$LSOF_INCLUDE + fi # } fi # } - if test -r ${LSOF_INCLUDE}/netinet/ip6.h # { + LSOF_TMP2="nfs/nfsproto.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHASNFSPROTO" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + LSOF_TMP2="netinet/ip6.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { then LSOF_CFGF="$LSOF_CFGF -DHASIPv6" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + else + LSOF_TMP2="netinet/in.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + grep -q IPV6_INRIA_VERSION $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASIPv6 -DHASINRIAIPv6" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + fi # } fi # } - LSOF_TMP1=0 - if test "X$NETBSD_SYS" = "X" # { + LSOF_TMP2="miscfs/fdesc/fdesc.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - NETBSD_SYS=$LSOF_INCLUDE + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } fi # } - if test -r ${NETBSD_SYS}/miscfs/fdesc/fdesc.h # { + if test "X$LSOF_TMP3" != "X" # { then - grep -q Fctty ${NETBSD_SYS}/miscfs/fdesc/fdesc.h + grep -q Fctty $LSOF_TMP3 if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -DHASFDESCFS=1" else LSOF_CFGF="$LSOF_CFGF -DHASFDESCFS=2" fi # } - grep -q fd_link ${NETBSD_SYS}/miscfs/fdesc/fdesc.h + grep -q fd_link $LSOF_TMP3 if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -DHASFDLINK" fi # } - LSOF_TMP1=1 + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } fi # } - if test -r ${LSOF_INCLUDE}/sys/vnode.h # { + LSOF_TMP2="miscfs/nullfs/null.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - grep -q VT_LFS ${LSOF_INCLUDE}/sys/vnode.h - if test $? -eq 0 # { + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHASLFS" + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" fi # } fi # } - if test -r ${LSOF_INCLUDE}/miscfs/nullfs/null.h # { + if test "X$LSOF_TMP3" != "X" # { then LSOF_CFGF="$LSOF_CFGF -DHASNULLFS" - else - if test -r ${NETBSD_SYS}/miscfs/nullfs/null.h # { + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { then - LSOF_CFGF="$LSOF_CFGF -DHASNULLFS" LSOF_TMP1=1 fi # } fi # } - if test -d ${NETBSD_SYS}/miscfs/procfs # { + LSOF_TMP2="miscfs/procfs" + if test -d ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -d ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { then LSOF_CFGF="$LSOF_CFGF -DHASPROCFS" - LSOF_TMP1=1 - grep -q PFSroot ${NETBSD_SYS}/miscfs/procfs/procfs.h - if test $? -eq 0 # { + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + if test -r ${LSOF_TMP3}/procfs.h # { + then + grep -q PFSroot ${LSOF_TMP3}/procfs.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASPROCFS_PFSROOT" + fi # } + fi # } + fi # } + LSOF_TMP2="sys/bufq.h" + LSOF_NBSD_BUFQH=0 + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASBUFQ_H" + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHASPROCFS_PFSROOT" - fi # } + if test $NETBSD_SYS != $LSOF_INCLUDE # { + then + LSOF_CFGF="$LSOF_CFGF -DHASBUFQ_H" + LSOF_NBSD_BUFQH=1 + fi # } + fi # } + fi # } + LSOF_TMP2="isofs/cd9660" + if test -d ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -d ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } fi # } - if test -d ${NETBSD_SYS}/isofs/cd9660 # { + if test "X$LSOF_TMP3" != "X" # { then LSOF_CFGF="$LSOF_CFGF -DHAS9660FS=1" - LSOF_TMP1=1 + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } else - if test -d ${NETBSD_SYS}/fs/cd9660 # { + LSOF_TMP2="fs/cd9660" + if test -d ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHAS9660FS=2" - LSOF_TMP1=1 + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -d ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHAS9660FS=1" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } fi # } fi # } - if test -d ${NETBSD_SYS}/msdosfs # { + LSOF_TMP2="msdosfs" + if test -d ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -d ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { then LSOF_CFGF="$LSOF_CFGF -DHASMSDOSFS=1" - LSOF_TMP1=1 + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } else - if test -d ${NETBSD_SYS}/fs/msdosfs # { + LSOF_TMP2="fs/msdosfs" + if test -d ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHASMSDOSFS=2" - LSOF_TMP1=1 + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -d ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHASMSDOSFS=2" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + fi # } + LSOF_TMP2="miscfs/kernfs/kernfs.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" fi # } fi # } - if test -r ${NETBSD_SYS}/miscfs/kernfs/kernfs.h # { + if test "X$LSOF_TMP3" != "X" # { then - grep -q "kt_name;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h + grep -q "kt_name;" $LSOF_TMP3 if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -DHASKERNFS" - LSOF_TMP1=1 - grep -q "*kfs_kt;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + grep -q "*kfs_kt;" $LSOF_TMP3 if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -DHASKERNFS_KFS_KT" fi # } fi # } fi # } - if test $LSOF_TMP1 -eq 1 -a "X$LSOF_INCLUDE" != "X$NETBSD_SYS" # { + LSOF_TMP2="sys/namei.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - LSOF_DINC="-I$LSOF_INCLUDE -I$NETBSD_SYS" + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } fi # } - if test -r ${LSOF_INCLUDE}/sys/namei.h + if test "X$LSOF_TMP3" != "X" # { then - grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h + grep -q nc_vpid $LSOF_TMP3 if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -DHASNCVPID" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } fi # } fi # } - grep -q i_ffs_size ${LSOF_INCLUDE}/ufs/ufs/inode.h - if test $? -eq 0 # { + LSOF_TMP2="ufs/ufs/inode.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHASI_FFS" + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 else - grep -q i_ffs1_size ${LSOF_INCLUDE}/ufs/ufs/inode.h - if test $? -eq 0 # { + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHASI_FFS1" - fi #} + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } fi # } - grep -q VT_EXT2FS ${LSOF_INCLUDE}/sys/vnode.h - if test $? -eq 0 # { + if test "X$LSOF_TMP3" != "X" # { then - LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS" - grep -q "*e2fs_din" ${LSOF_INCLUDE}/ufs/ufs/inode.h + grep -q i_ffs_size $LSOF_TMP3 if test $? -eq 0 # { then - LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR" + LSOF_CFGF="$LSOF_CFGF -DHASI_FFS" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + else + grep -q i_ffs1_size $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASI_FFS1" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + fi # } + grep -q i_ffs_effnlink $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASEFFNLINK=i_ffs_effnlink" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } fi # } fi # } - if test -r ${LSOF_INCLUDE}/nfs/nfsnode.h # { + LSOF_TMP2="sys/vnode.h" + LSOF_NBSD_PTYFS=0 + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { then - grep -q "*n_vattr" ${LSOF_INCLUDE}/nfs/nfsnode.h - if test $? -eq 0 # { + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { then - LSOF_CFGF="$LSOF_CFGF -DHASNFSVATTRP" + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" fi # } fi # } - if test "X$NETBSD_UVM" = "X" # { + if test "XLSOF_TMP3" != "X" # { then - if test -r /etc/mk.conf # { + grep -q VT_EXT2FS $LSOF_TMP3 + if test $? -eq 0 # { then - grep -q "^UVM[ ]*=" /etc/mk.conf - if test $? -eq 0 # { + LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + LSOF_TMP2="ufs/ufs/inode.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP5="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP6=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP5="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP6=1 + else + LSOF_TMP5="" + fi # } + fi # } + if test "X$LSOF_TMP5" != "X" # { then - NETBSD_UVM="Y" + grep -q "*e2fs_din" $LSOF_TMP5 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=$LSOF_TMP6 + fi # } + fi # } fi # } fi # } - if test "X$NETBSD_UVM" = "X" # { + grep -q VT_LFS $LSOF_TMP3 + if test $? -eq 0 # { then - if test -r ${LSOF_INCLUDE}/sys/vnode.h # { + LSOF_CFGF="$LSOF_CFGF -DHASLFS" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { then - grep -q UVM ${LSOF_INCLUDE}/sys/vnode.h - if test $? -ne 0 # { + LSOF_TMP1=1 + fi # } + fi # } + grep -q VT_PTYFS $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_TMP2="fs/ptyfs/ptyfs.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASPTYFS" + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { then - egrep -q "v_uvm;|v_uobj;" ${LSOF_INCLUDE}/sys/vnode.h - if test $? -eq 0 # { + if test $NETBSD_SYS != $LSOF_INCLUDE # { then - NETBSD_UVM="Y" + LSOF_CFGF="$LSOF_CFGF -DHASPTYFS" + LSOF_NBSD_PTYFS=1 fi # } fi # } fi # } fi # } + if test "X$NETBSD_UVM" = "X" # { + then + grep -q UVM $LSOF_TMP3 + if test $? -ne 0 # { + then + egrep -q "v_uvm;|v_uobj;" $LSOF_TMP3 + if test $? -eq 0 # { + then + NETBSD_UVM="Y" + fi # } + fi # } + fi # } + fi # } + LSOF_TMP2="nfs/nfsnode.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + grep -q "*n_vattr" $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASNFSVATTRP" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + fi # } + LSOF_TMP2="sys/lockf.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } fi # } + if test "X$LSOF_TMP3" != "X" # { + then + grep -q vop_advlock_args $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHAS_ADVLOCK_ARGS" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + grep -q lf_lwp $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHAS_LF_LWP" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + fi # } + LSOF_TMP2="sys/lwp.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHAS_LWP_H" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + LSOF_TMP2="sys/filedesc.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + grep -q "^struct cwdinfo {" $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASCWDINFO" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + fi # } + LSOF_TMP2="sys/pipe.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHAS_SYS_PIPEH" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + if test -r ${LSOF_INCLUDE}/sys/statvfs.h # { + then + grep -q '^struct statvfs {' ${LSOF_INCLUDE}/sys/statvfs.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASSTATVFS" + fi # } + fi # } + + # Here end the dual NetBSD tests for header files in $LSOF_INCLUDE or + # NETBSD_SYS. + # + # After this LSOF_TMP1 may be reused. + + if test $LSOF_TMP1 -eq 1 # { + then + LSOF_DINC="-I$LSOF_INCLUDE -I$NETBSD_SYS" + fi # } + + # Build special header files, as required. + rm -rf dialects/n+obsd/include if test "X$NETBSD_UVM" = "XY" -o "X$NETBSD_UVM" = "Xy" # { then @@@@ -2508,10 +2978,22 @@@@ return(0); } LSOF_CFGF="$LSOF_CFGF -DHAS_UVM_INCL" fi # } fi # } - if test -r ${LSOF_INCLUDE}/sys/mount.h # { + LSOF_TMP2="sys/mount.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { then - # Build the netexport.h header file for NetBSD. + # Build a local NetBSD netexport.h header file. d16 2 a17 104 LSOF_TMP1=${LSOF_TMPC}.edscr LSOF_TMP2=${LSOF_TMPC}.netcred @@@@ -2553,59 +3035,48 @@@@ return(0); } if test $? -ne 0 # { then LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" - fi + fi # } fi # } - if test -r ${LSOF_INCLUDE}/sys/lockf.h # { + if test $LSOF_NBSD_BUFQH -eq 1 # { then - grep vop_advlock_args ${LSOF_INCLUDE}/sys/lockf.h > /dev/null - if test $? -eq 0 # { + + # Make a local copy of $NETBSD_SYS/sys/bufq.h. + + if test ! -d dialects/n+obsd/include # { then - LSOF_CFGF="$LSOF_CFGF -DHAS_ADVLOCK_ARGS" + mkdir dialects/n+obsd/include fi # } - grep lf_lwp ${LSOF_INCLUDE}/sys/lockf.h > /dev/null - if test $? -eq 0 # { + if test ! -d dialects/n+obsd/include/sys # { then - LSOF_CFGF="$LSOF_CFGF -DHAS_LF_LWP" + mkdir dialects/n+obsd/include/sys fi # } - fi # } - if test -r ${LSOF_INCLUDE}/sys/lwp.h # { - then - LSOF_CFGF="$LSOF_CFGF -DHAS_LWP_H" - fi # } - if test -r ${LSOF_INCLUDE}/netinet/in.h # { - then - grep IPV6_INRIA_VERSION ${LSOF_INCLUDE}/netinet/in.h > /dev/null - if test $? -eq 0 # { + cp $NETBSD_SYS/sys/bufq.h dialects/n+obsd/include/sys + echo $LSOF_CFGF | grep /dialects/n+obsd/include > /dev/null 2>&1 + if test $? -ne 0 # { then - LSOF_CFGF="$LSOF_CFGF -DHASIPv6 -DHASINRIAIPv6" + LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" fi # } fi # } - if test -r ${LSOF_INCLUDE}/sys/filedesc.h # { + if test $LSOF_NBSD_PTYFS -eq 1 # { then - grep -q "^struct cwdinfo {" ${LSOF_INCLUDE}/sys/filedesc.h - if test $? -eq 0 # { + + # Make a local copy of $NETBSD_SYS/sys/fs/ptyfs/. + + if test ! -d dialects/n+obsd/include # { then - LSOF_CFGF="$LSOF_CFGF -DHASCWDINFO" + mkdir dialects/n+obsd/include fi # } - fi # } - if test -r ${LSOF_INCLUDE}/sys/pipe.h # { - then - LSOF_CFGF="$LSOF_CFGF -DHAS_SYS_PIPEH" - fi # } - if test -r ${LSOF_INCLUDE}/sys/statvfs.h # { - then - grep -q '^struct statvfs {' ${LSOF_INCLUDE}/sys/statvfs.h - if test $? -eq 0 # { + if test ! -d dialects/n+obsd/include/fs # { then - LSOF_CFGF="$LSOF_CFGF -DHASSTATVFS" + mkdir dialects/n+obsd/include/fs fi # } - fi # } - if test -r ${LSOF_INCLUDE}/kvm.h # { - then - grep -q kvm_getproc2 ${LSOF_INCLUDE}/kvm.h - if test $? -eq 0 # { + rm -rf dialects/n+obsd/include/fs/ptyfs + mkdir dialects/n+obsd/include/fs/ptyfs + cp $NETBSD_SYS/fs/ptyfs/*.h dialects/n+obsd/include/fs/ptyfs + echo $LSOF_CFGF | grep /dialects/n+obsd/include > /dev/null 2>&1 + if test $? -ne 0 # { then - LSOF_CFGF="$LSOF_CFGF -DHASKVMGETPROC2" + LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" fi # } fi # } LSOF_CFGL="$LSOF_CFGL -lkvm" @@@@ -2897,6 +3368,14 @@@@ return(0); } fi # } LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS=$LSOF_TMP1" fi # } + if test -r ${LSOF_INCLUDE}/ufs/ufs/inode.h # { + then + grep -q i_effnlink ${LSOF_INCLUDE}/ufs/ufs/inode.h + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASEFFNLINK=i_effnlink" + fi # } + fi # } if test -r ${LSOF_INCLUDE}/sys/namei.h then grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h @ 1.21 log @Redo three patches to address build failure on NetBSD <= 1.6ZC, to change the reported node number for the master side of ptyfs devices, and to deal more cleanly with some header files. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.20 2004/11/28 22:39:07 atatat Exp $ @ 1.20 log @Tweak the sys/bufq.h support (it disappeared again), enhance the procfs support a little, incorporate the author's patches to deal with netbsd-current version numbers getting longer, and add ptyfs support. These patches are adapted from an interim release the author made and will appear in the next full release. PKGREVISION bumped to 1 for the ptyfs support. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.19 2004/11/12 05:41:36 erh Exp $ d18 1 a18 1 @@@@ -2264,51 +2279,49 @@@@ return(0); } d85 1 a85 1 @@@@ -2316,7 +2329,7 @@@@ return(0); } d94 1 a94 1 @@@@ -2336,166 +2349,656 @@@@ return(0); } d100 1 a100 2 then - LSOF_CFGF="$LSOF_CFGF -DHASNFSPROTO" d106 1 a106 2 fi # } - if test -r ${LSOF_INCLUDE}/netinet/ip6.h # { d116 3 a118 2 + then + if test -d /usr/src/sys # { d124 2 a125 1 + fi # } d301 1 d304 1 a304 2 + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 d310 5 a314 27 + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } fi # } - if test -d ${NETBSD_SYS}/isofs/cd9660 # { + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHASBUFQ_H" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } + LSOF_TMP2="fs/ptyfs/ptyfs.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" a316 8 + if test "X$LSOF_TMP3" != "X" # { + then + LSOF_CFGF="$LSOF_CFGF -DHASPTYFS" + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } + fi # } d330 2 a331 1 + fi # } d365 3 a367 2 + fi # } + fi # } d380 2 a381 3 fi # } fi # } - if test -d ${NETBSD_SYS}/msdosfs # { d415 2 a416 3 fi # } fi # } - if test -r ${NETBSD_SYS}/miscfs/kernfs/kernfs.h # { d419 1 a419 2 then - grep -q "kt_name;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h d429 3 a431 2 + fi # } + fi # } d433 2 a434 1 + then d528 9 d541 1 d569 1 a569 2 then - NETBSD_UVM="Y" d587 2 a588 1 + then d598 3 a600 2 + fi # } + fi # } d603 2 a604 1 + then a606 9 + then + LSOF_TMP1=1 fi # } fi # } if test "X$NETBSD_UVM" = "X" # { then - if test -r ${LSOF_INCLUDE}/sys/vnode.h # { + grep -q UVM $LSOF_TMP3 + if test $? -ne 0 # { d610 12 a621 2 + egrep -q "v_uvm;|v_uobj;" $LSOF_TMP3 + if test $? -eq 0 # { d625 2 a626 1 - then d628 3 a630 2 - fi # } + NETBSD_UVM="Y" d634 13 a646 1 fi # } d686 1 a686 1 + fi # } d778 1 a778 15 + LSOF_TMP2="sys/statvfs.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" + LSOF_TMP4=0 + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2" + LSOF_TMP4=1 + else + LSOF_TMP3="" + fi # } + fi # } + if test "X$LSOF_TMP3" != "X" # { d780 1 a780 1 + grep -q '^struct statvfs {' $LSOF_TMP3 a783 4 + if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1 # { + then + LSOF_TMP1=1 + fi # } d802 1 a802 1 @@@@ -2508,7 +3011,21 @@@@ return(0); } a810 1 + LSOF_TMP4=0 a814 1 + LSOF_TMP4=1 d822 6 a827 2 # Build the netexport.h header file for NetBSD. @@@@ -2553,59 +3070,6 @@@@ return(0); } d832 2 a833 1 - fi # } d835 2 a836 1 - then d839 5 a843 1 - then d845 2 a846 1 - fi # } d849 2 a850 1 - then d852 2 a853 1 - fi # } d863 4 a866 1 - then d868 3 a870 2 - fi # } - fi # } d872 2 a873 1 - then d876 5 a880 1 - then d882 2 a883 1 - fi # } d893 2 a894 1 - then d896 2 a897 1 - fi # } d903 6 a908 1 - then d910 1 d914 1 a914 13 @@@@ -3594,6 +4058,15 @@@@ return(0); } # DEBUG -- End temporary hack for Solaris 10, build s10_44. fi # } + if test -r ${LSOF_INCLUDE}/sys/vnode.h # { + then + grep v_path ${LSOF_INCLUDE}/sys/vnode.h > /dev/null 2>&1 + if test $? -eq 0 # { + then + LSOF_CFGF="$LSOF_CFGF -DHAS_V_PATH" + LSOF_TSTVPATH=1 + fi # } + fi # } d916 13 a928 13 if test -r ${LSOF_INCLUDE}/sys/zone.h # { then @@@@ -4192,6 +4665,10 @@@@ then echo "-DLT_K64" >> $LSOF_TSTCFLG fi # } echo "-DLT_VERS=$LSOF_VERS" >> $LSOF_TSTCFLG +if test $LSOF_TSTVPATH -eq 1 # { +then + echo "-DLT_VPATH" >> $LSOF_TSTCFLG +fi # } echo "$LSOF_TSTCFLG created" # Create tests loader flags file. @ 1.19 log @Check for actual existance of sys/bufq.h instead of just relying on uname. @ text @d1 1 a1 1 $NetBSD$ d3 57 a59 3 --- Configure.orig 2004-10-19 19:36:21.000000000 +0000 +++ Configure 2004-11-12 05:35:16.000000000 +0000 @@@@ -2298,7 +2298,15 @@@@ d64 1 a64 1 + LSOF_VERS="2990" d66 1 a66 1 + 2.99.1[0-9]) d68 1 a68 5 + LSOF_VERS="2990" + if test -r ${LSOF_INCLUDE}/sys/bufq.h + then + LSOF_VERS="2991" + fi d71 15 a85 2 LSOF_VERS=2000 @@@@ -2316,7 +2324,7 @@@@ d90 1 a90 1 + 1000|1010|1020|1030|1040|1050|1060|2000|2990|2991) d94 838 @ 1.18 log @Needs on 2.99.10 @ text @d3 3 a5 3 --- Configure.orig 2004-10-19 15:36:21.000000000 -0400 +++ Configure 2004-11-07 13:13:33.000000000 -0500 @@@@ -2298,7 +2298,11 @@@@ d14 5 a18 1 + LSOF_VERS="2991" d22 1 a22 1 @@@@ -2316,7 +2320,7 @@@@ @ 1.17 log @Upgrade to lsof version 4.72. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.72 July 13, 2004 ... Added support for NetBSD 2.0 with patches supplied by Andrew Brown . Andrew also provided two test systems. ... @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.16 2004/04/29 04:19:22 atatat Exp $ d3 17 a19 15 Make lsof use statvfs on NetBSD where available. --- dialects/n+obsd/dmnt.c.orig 2002-06-16 21:44:17.000000000 -0400 +++ dialects/n+obsd/dmnt.c @@@@ -56,7 +56,6 @@@@ readmnt() { char *dn = (char *)NULL; char *ln; - struct statfs *mb = (struct statfs *)NULL; struct mounts *mtp; int n; struct stat sb; @@@@ -65,6 +64,12 @@@@ readmnt() unsigned char procfs = 0; #endif /* defined(HASPROCFS) */ d21 6 a26 37 +#if defined(HASSTATVFS) + struct statvfs *mb = (struct statvfs *)NULL; +#else /* !defined(HASSTATVFS) */ + struct statfs *mb = (struct statfs *)NULL; +#endif /* defined(HASSTATVFS) */ + if (Lmi || Lmist) return(Lmi); /* @@@@ -123,7 +128,13 @@@@ no_space_for_mount: " Output information may be incomplete.\n"); } (void) bzero((char *)&sb, sizeof(sb)); + +#if defined(HASSTATVFS) + sb.st_dev = (dev_t)mb->f_fsid; +#else /* !defined(HASSTATVFS) */ sb.st_dev = (dev_t)mb->f_fsid.val[0]; +#endif /* defined(HASSTATVFS) */ + sb.st_mode = S_IFDIR | 0777; if (!Fwarn) { (void) fprintf(stderr, @@@@ -222,7 +233,13 @@@@ readvfs(vm) Exit(1); } vp->addr = vm; + +#if defined(HASSTATVFS) + vp->fsid = m.m_stat.f_fsidx; +#else /* !defined(HASSTATVFS) */ vp->fsid = m.m_stat.f_fsid; +#endif /* defined(HASSTATVFS) */ + (void) snpf(vp->type, sizeof(vp->type), "%s", m.m_stat.f_fstypename); vp->next = Lvfs; Lvfs = vp; @ 1.16 log @Fix NetBSD 2.0 check in Configure, and check for and deal with the new statvfs() sysctl call which replaced statfs() around 2.0D. This pkg will now build on current again (addresses my PR pkg/25372). Bump PKGREVISION to 1. Changes adapted from changes adapted by lsof maintainer based on changes that made things work this morning. That means they'll all be in the next official lsof release. So there. @ text @d1 1 a1 1 $NetBSD$ @ 1.15 log @Upgrade to lsof version 4.70. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.70 January 16, 2004 ... Added bz2 compression. ... Improved handling of parameters after "-i@@". ... With help from Andrew Brown and John Heasley added log-structured file system (LFS) support for NetBSD and OpenBSD. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.14 2004/01/13 02:50:28 atatat Exp $ d3 1 a3 1 Support for LFS. d5 19 a23 9 --- dialects/n+obsd/dnode.c.orig 2003-10-15 07:34:21.000000000 -0400 +++ dialects/n+obsd/dnode.c @@@@ -528,6 +528,10 @@@@ process_overlaid_node: case VT_EXT2FS: #endif /* defined(HASEXT2FS) */ +#if defined(HASLFS) + case VT_LFS: +#endif /* defined(HASLFS) */ d25 5 a29 17 case VT_UFS: if (!v->v_data || kread((KA_T)v->v_data, (char *)&i, sizeof(i))) { @@@@ -546,7 +550,11 @@@@ process_overlaid_node: && !kread((KA_T)i.i_din.e2fs_din, (char *)&ed, sizeof(ed))) edp = &ed; # else /* !defined(HASI_E2FS_PTR) */ +# if HASEXT2FS<2 edp = &i.i_din.e2fs_din; +# else /* HASEXT2FS>=2 */ + edp = &i.i_e2din; +# endif /* HASEXT2FS>=2 */ # endif /* defined(HASI_E2FS_PTR) */ } else @@@@ -693,7 +701,11 @@@@ process_overlaid_node: rdevs = 1; d31 15 a45 24 # else /* !defined(HASI_E2FS_PTR) */ +# if HASEXT2FS<2 rdev = i.i_din.e2fs_din.e2di_rdev; +# else /* HASEXT2FS>=2 */ + rdev = i.i_e2din.e2di_rdev; +# endif /* HASEXT2FS>=2 */ rdevs = 1; # endif /* defined(HASI_E2FS_PTR) */ @@@@ -895,13 +907,17 @@@@ process_overlaid_node: case N_REGLR: if (type == VREG || type == VDIR) { - if (nty == INODE) { + switch (nty) { + case INODE: #if defined(HASI_FFS) + Lf->sz = (SZOFFTYPE)i.i_ffs_size; Lf->sz_def = 1; + break; #else /* !defined(HASI_FFS) */ # if defined(HASI_FFS1) d47 5 a51 16 if (ffs == 1) { if (u1s) { Lf->sz = (SZOFFTYPE)u1.di_size; @@@@ -913,28 +929,30 @@@@ process_overlaid_node: Lf->sz_def = 1; } } + break; # else /* !defined(HASI_FFS1) */ Lf->sz = (SZOFFTYPE)i.i_size; Lf->sz_def = 1; # endif /* defined(HASI_FFS1) */ #endif /* defined(HASI_FFS) */ - } + break; d53 3 a55 86 #if defined(HASMSDOSFS) - else if (nty == DOSNODE) { + case DOSNODE: Lf->sz = (SZOFFTYPE)d.de_FileSize; Lf->sz_def = 1; - } + break; #endif /* defined(HASMSDOSFS) */ - else if (nty == MFSNODE) { + case MFSNODE: Lf->sz = (SZOFFTYPE)m.mfs_size; Lf->sz_def = 1; - } + break; #if defined(HASEXT2FS) - else if (nty == EXT2NODE) { + case EXT2NODE: # if defined(HASI_E2FS_PTR) if (edp) { Lf->sz = (SZOFFTYPE)edp->e2di_size; @@@@ -944,11 +962,11 @@@@ process_overlaid_node: Lf->sz = (SZOFFTYPE)i.i_e2fs_size; Lf->sz_def = 1; # endif /* defined(HASI_E2FS_PTR) */ - } + break; #endif /* defined(HASEXT2FS) */ - } - else if ((type == VCHR || type == VBLK) && !Fsize) + } + } else if ((type == VCHR || type == VBLK) && !Fsize) Lf->off_def = 1; break; } @@@@ -984,7 +1002,8 @@@@ process_overlaid_node: } break; case N_REGLR: - if (nty == INODE) { + switch (nty) { + case INODE: # if defined(HASI_FFS) Lf->nlink = (long)i.i_ffs_nlink; @@@@ -1009,18 +1028,17 @@@@ process_overlaid_node: # endif /* defined(HASI_FFS) */ Lf->nlink_def = 1; - } + break; #if defined(HASMSDOSFS) - else if (nty == DOSNODE) { + case DOSNODE: Lf->nlink = (long)d.de_refcnt; Lf->nlink_def = 1; - } + break; #endif /* defined(HASMSDOSFS) */ - #if defined(HASEXT2FS) - else if (nty == EXT2NODE) { + case EXT2NODE: # if defined(HASI_E2FS_PTR) if (edp) { Lf->nlink = (long)edp->e2di_nlink; @@@@ -1030,9 +1048,12 @@@@ process_overlaid_node: Lf->nlink = (long)i.i_e2fs_nlink; Lf->nlink_def = 1; # endif /* defined(HASI_E2FS_PTR) */ - } -#endif /* defined(HASEXT2FS) */ + break; + +#endif /* defined(HASEXT2FS) */ + + } break; } if (Lf->nlink_def && Nlink && (Lf->nlink < Nlink)) @ 1.14 log @Add LFS support to lsof. Bump PKGREVISION to 1, making this 4.69nb1. This patch will be included in the next lsof release. @ text @d1 1 a1 1 $NetBSD$ @ 1.13 log @4.69 is out, 4.68 is gone. Approved by agc. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.12 2003/10/04 20:22:35 atatat Exp $ d3 1 a3 1 Patch for vnode/DNLC interface change courtesy of lsof maintainer. d5 1 a5 1 --- dialects/n+obsd/dnode.c.orig 2003-06-11 07:45:16.000000000 -0400 d7 67 a73 11 @@@@ -68,8 +68,14 @@@@ if (!p->P_VMSPACE || kread((KA_T)p->P_VMSPACE, (char *)&vm, sizeof(vm))) return; +# if defined(OPENBSDV) + Lf->sz = (SZOFFTYPE)((vm.vm_tsize + vm.vm_dsize + + vm.vm_ssize) * sysconf(_SC_PAGESIZE)); +# else /* !defined(OPENBSDV */ Lf->sz = (SZOFFTYPE)ctob(vm.vm_tsize + vm.vm_dsize + vm.vm_ssize); +# endif /* defined(OPENBSDV) */ d75 37 a111 2 Lf->sz_def = 1; return; d113 7 a119 1 @@@@ -301,9 +307,9 @@@@ d121 4 a124 8 #if defined(HASNCACHE) Lf->na = va; -# if defined(HASNCAPID) +# if defined(HASNCVPID) Lf->id = v->v_id; -# endif /* defined(HASNCAPID) */ +# endif /* defined(HASNCVPID) */ #endif /* defined(HASNCACHE) */ d126 35 a160 1 #if defined(HASFSTRUCT) @ 1.12 log @Refix build on -current now that procfs and kernfs have churned again. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2003/09/26 03:13:04 atatat Exp $ @ 1.11 log @Make lsof build under -current again @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2003/08/13 13:24:16 atatat Exp $ a33 20 @@@@ -394,6 +400,9 @@@@ enter_nm(Namech); return; } else +#if defined(NETBSDV) && defined(KERNFSTOV) +#define kf_kt kfs_kt +#endif kn.kf_kt = (struct kern_target *)NULL; } /* @@@@ -402,6 +411,9 @@@@ */ if (kn.kf_kt && kread((KA_T)kn.kf_kt, (char *)&kt, sizeof(kt)) == 0 +#if defined(NETBSDV) && defined(KERNFSTOV) +#undef kf_kt kfs_kt +#endif && (ktnl = (int)kt.kt_namlen) > 0 && kt.kt_name) { @ 1.10 log @A patch (courtesy of the lsof maintainer) to make lsof build again on NetBSD-current, where the structure of the vnode has been altered. This patch will, as usual, be obsoleted by the next lsof release. PKGREVISION bumped accordingly. Install the lsof.8 man page in man8 instead of installing the preformatted copy in man1 (doing so used to slide by, by new groff really doesn't like formatting preformatted man pages, and besides, it was in the wrong place). Since the only thing left untouched was the DESCR file, I also added mention of kqueues as something lsof might note, meaning that this patch touches every file in the pkg. @ text @d1 1 a1 1 $NetBSD$ d34 20 @ 1.9 log @Upgrade to lsof version 4.68. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.68 June 18, 2003 ... Upgraded EXT2FS and UFS support for NetBSD and OpenBSD to handle new inode information, and the fast UFS1 and UFS2 file systems. With the help of Andrew Brown determined the NetBSD snapshot (1.6F) at which could be included under _KERNEL, thus eliminating the lsof netexport.h hack. The same change applies to OpenBSD versions 3.3 and above. ... The former change obsoletes patches ab, ac, and ad. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2003/05/03 16:55:29 atatat Exp $ d3 29 a31 57 --- dialects/n+obsd/dlsof.h.orig 2003-03-23 14:51:12.000000000 -0500 +++ dialects/n+obsd/dlsof.h @@@@ -73,7 +73,17 @@@@ struct buf; /* dummy for function protot #define NFS #define m_stat mnt_stat + +# if defined(NETBSDV) && __NetBSD_Version__>=106060000 +#define _KERNEL +# endif /* defined(NETBSDV) && __NetBSD_Version__>=106060000 */ + #include + +# if defined(NETBSDV) && __NetBSD_Version__>=106060000 +#undef _KERNEL +# endif /* defined(NETBSDV) && __NetBSD_Version__>=106060000 */ + #include #include @@@@ -87,6 +97,7 @@@@ struct buf; /* dummy for function protot #include #include +# if defined(OPENBSDV) || (defined(NETBSDV) && __NetBSD_Version__<106060000) /* * As a terrible hack, the lsof Configure script extracts the netcred and * netexport structure definitions from and places them in @@@@ -100,9 +111,14 @@@@ struct buf; /* dummy for function protot * * THIS IS A TERRIBLE AND FRAGILE HACK!!! It might break if the netexport or * netcred definitions change radically in . + * + * It is no longer needed for NetBSD Versions 1.6F and above. */ #include "netexport.h" +# endif /* defined(OPENBSDV) + || (defined(NETBSDV) && __NetBSD_Version__<106060000) */ + #define _KERNEL struct nameidata; /* to satisfy a function prototype in msdosfsmount.h */ #include @@@@ -178,6 +194,12 @@@@ struct sockproto { #undef DIRBLKSIZ # endif /* defined(DIRBLKSIZ) */ +# if defined(HASI_FFS1) +#define _KERNEL +#include +#undef _KERNEL +# endif /* defined(HASI_FFS1) */ + #include # if defined(DIRENT_BLKSIZ) @@@@ -223,9 +245,10 @@@@ struct sockproto { d33 1 a33 11 # if defined(HASNULLFS) #define _KERNEL -# if defined(NETBSDV) && NETBSDV>=1050 +# if defined(NETBSDV) && NETBSDV>=1050 && __NetBSD_Version__<106060000 #include "netexport.h" -# endif /* defined(NETBSDV) && NETBSDV>=1050 */ +# endif /* defined(NETBSDV) && NETBSDV>=1050 + && __NetBSD_Version__<106060000 */ #include #undef _KERNEL # endif /* defined(HASNULLFS) */ @ 1.8 log @Re-patch lsof with patches from Vic Abell. Building should now work on all platforms, with ffs2 (and ext2fs) related bugs smoothed out. Bump to PKGREVISION 2. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Upgrade to lsof version 4.67. Changes related to or affecting NetBSD (or pkgsrc) from the 00DIST file: 4.67 March 27, 2003 Began the transition of the lsof ftp server host name from vic.cc.purdue.edu to lsof.itap.purdue.edu. That reflects Purdue organizational changes. This first step makes the new name an alias to the old one. The old name, vic.cc.purdue.edu, will remain usable for an extended period. ... At the request of Alek O. Komarnitsky added the "+c " option to enable optional changing of the COMMAND column output maximum width from the default to . The default maximum width remains CMDL, as defined in lsof.h. ... Added kernel event queue file support for FreeBSD, NetBSD and OpenBSD. Andrew Brown supplied the code. ... Augmented a lock ID test on NetBSD to check if the ID is an LWP pointer. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2003/02/03 01:03:15 atatat Exp $ d3 69 a71 19 kqueue support, part 2 of 4 --- dialects/n+obsd/dnode.c.orig 2002-10-08 16:22:13.000000000 -0400 +++ dialects/n+obsd/dnode.c @@@@ -1141,3 +1141,14 @@@@ process_pipe(pa) enter_nm(Namech); } #endif /* defined(HAS_SYS_PIPEH) */ + +#if defined(HASKQUEUE) +void +process_kqueue(ka) + KA_T ka; +{ + + (void) snpf(Lf->type, sizeof(Lf->type), "KQUEUE"); + enter_dev_ch(print_kptr(ka, (char *)NULL, 0)); +} +#endif /* defined(HASKQUEUE) */ @ 1.6 log @Add kqueue support to lsof. Bump PKGREVISION to 1, making this 4.66nb1. This patch will be included in the next lsof release. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Updated to lsof 4.49B pre-release. Changes since 4.46 are mainly bugfixes and better IPv6-support, as well as 1.4-current support. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 1999/06/25 02:41:15 hubertf Exp $ d3 19 a21 33 --- dialects/n+obsd/dproc.c.orig Tue Jun 22 23:04:06 1999 +++ dialects/n+obsd/dproc.c Fri Jun 25 04:13:10 1999 @@@@ -150,6 +150,9 @@@@ gather_proc_info() { struct filedesc fd; +#if __NetBSD_Version__ >= 104010000 + struct cwdinfo cwdi; +#endif int i, nf; MALLOC_S nb; static struct file **ofb = NULL; @@@@ -231,6 +234,20 @@@@ (UID_ARG)uid, p->P_COMM, (int)pss, (int)sf); Plf = (struct lfile *)NULL; Kpa = (KA_T)p->P_ADDR; +#if __NetBSD_Version__ >= 104010000 + /* + * Save current working directory framework information. + */ + (void)memset(&cwdi, 0, sizeof(cwdi)); + if (p->kp_proc.p_cwdi) { + if (kvm_read(Kd, (u_long)p->kp_proc.p_cwdi, &cwdi, sizeof(cwdi)) + != sizeof(cwdi)) { + fprintf(stderr, "%s: cannot read cwdinfo: %s\n", Pn, + kvm_geterr(Kd)); + Exit(1); + } + } +#endif /* * Save current working directory information. */ @ 1.4 log @Update to V4.44. Changes: Corrects SunOS 4.1.x HSFS and segmentation fault problems; improves handling of UNIX PCB addresses in the /proc-based Linux lsof; corrects PPID and PGRP output ordering conflict; enhanced some library modules so more dialect versions could use them; adds raw socket support for /proc-based Linux lsof; adds support for UnixWare 7.1; made NetBSD 1.4C updates; makes minor adjustment for latest Tru64 UNIX 5.0 Beta release. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 1999/06/02 16:14:53 christos Exp $ @ 1.3 log @Update to 4.43_W @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 1999/05/20 10:32:37 kleink Exp $ d3 2 a4 2 --- dialects/n+obsd/dproc.c.orig Sun May 9 15:56:13 1999 +++ dialects/n+obsd/dproc.c Mon May 3 12:03:10 1999 d15 1 a15 1 @@@@ -215,23 +218,53 @@@@ d20 12 a31 12 + /* + * Save current working directory framework information. + */ + (void)memset(&cwdi, 0, sizeof(cwdi)); + if (p->kp_proc.p_cwdi) { + if (kvm_read(Kd, (u_long)p->kp_proc.p_cwdi, &cwdi, sizeof(cwdi)) + != sizeof(cwdi)) { + fprintf(stderr, "%s: cannot read cwdinfo: %s\n", Pn, + kvm_geterr(Kd)); + Exit(1); + } + } a35 46 +#if __NetBSD_Version__ >= 104010000 + if (cwdi.cwdi_cdir) { +#else if (fd.fd_cdir) { +#endif alloc_lfile(CWD, -1); Cfp = (struct file *)NULL; +#if __NetBSD_Version__ >= 104010000 + process_node((KA_T)cwdi.cwdi_cdir); +#else process_node((KA_T)fd.fd_cdir); +#endif if (Lf->sf) link_lfile(); } /* * Save root directory information. */ +#if __NetBSD_Version__ >= 104010000 + if (cwdi.cwdi_rdir) { +#else if (fd.fd_rdir) { +#endif alloc_lfile(RTD, -1); Cfp = (struct file *)NULL; +#if __NetBSD_Version__ >= 104010000 + process_node((KA_T)cwdi.cwdi_rdir); +#else process_node((KA_T)fd.fd_rdir); +#endif if (Lf->sf) link_lfile(); } @@@@ -422,11 +455,11 @@@@ int i, j; KA_T ka; int n = 0; - struct pager_struct pg; struct vm_map_entry vmme, *e; struct vmspace vmsp; #if !defined(UVM) + struct pager_struct pg; struct vm_object vmo; #endif /* !defined(UVM) */ @ 1.2 log @Handle factored out cwdinfo. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 1999/05/05 17:40:38 bad Exp $ d3 2 a4 2 --- dialects/n+obsd/dproc.c.orig Tue Nov 24 02:11:24 1998 +++ dialects/n+obsd/dproc.c Thu May 20 10:45:27 1999 d13 1 a13 1 static int nofb = 0; d15 1 a15 1 @@@@ -208,23 +211,53 @@@@ d69 1 a69 1 @@@@ -394,11 +427,11 @@@@ @ 1.1 log @Update lsof to 4.42_W. Relevant changes in this version: improved file system search name reporting; updates Solaris 2.6 VxFS support; support for the latest NetBSD with default UVM support. @ text @d1 1 a1 1 $NetBSD$ d4 66 a69 2 +++ dialects/n+obsd/dproc.c Wed May 5 19:29:31 1999 @@@@ -394,11 +394,11 @@@@ @