summaryrefslogtreecommitdiff
path: root/sysutils/lsof
diff options
context:
space:
mode:
authoratatat <atatat>2004-12-18 05:30:33 +0000
committeratatat <atatat>2004-12-18 05:30:33 +0000
commit577a2f22ce5bfc33b046d875ed306559976a1764 (patch)
treeed286b217d3e5046fe9f7ea9e6d813b35e29821f /sysutils/lsof
parent6827a47e38d7d01c57adcb569cd1dbf7920783be (diff)
downloadpkgsrc-577a2f22ce5bfc33b046d875ed306559976a1764.tar.gz
Fix lsof to deal with the new ptyfs fake inode number allocation
scheme. This code now does both.
Diffstat (limited to 'sysutils/lsof')
-rw-r--r--sysutils/lsof/distinfo4
-rw-r--r--sysutils/lsof/patches/patch-ae12
2 files changed, 10 insertions, 6 deletions
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 940d8b62f2c..75e707ec5a1 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2004/11/30 02:02:13 atatat Exp $
+$NetBSD: distinfo,v 1.48 2004/12/18 05:30:33 atatat Exp $
SHA1 (lsof_4.73.tar.bz2) = 3e8112f854fc83f5e5dfdc9271c8d27d31aefc6c
Size (lsof_4.73.tar.bz2) = 725530 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 4878381537330258e9270c9d198d49a426283fab
SHA1 (patch-ab) = 96c7ec1b1b710b10182da370c0c13e741d4687d8
SHA1 (patch-ac) = b844e10f4df066bb65bfc644bd387f0d13935726
SHA1 (patch-ad) = 49f3d0899e8055815c8b25d304281f83e7b1a98d
-SHA1 (patch-ae) = 1c0b0f11351f7e3ab449ac210332a08a16042def
+SHA1 (patch-ae) = ee3a1ec6e7ac95a92d8f5cc1c76569cc22cb167d
SHA1 (patch-af) = 0a5ca7b243be925cba841b1358427e86b65ccde1
SHA1 (patch-ag) = 06a5a07cf550136c8b58f82d4aa0f75d85378db0
SHA1 (patch-ah) = 35dc2b9ec90a1f418d3cd103b951db46df19bf3c
diff --git a/sysutils/lsof/patches/patch-ae b/sysutils/lsof/patches/patch-ae
index decdff58322..a66be8266b8 100644
--- a/sysutils/lsof/patches/patch-ae
+++ b/sysutils/lsof/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.6 2004/11/30 02:02:13 atatat Exp $
+$NetBSD: patch-ae,v 1.7 2004/12/18 05:30:33 atatat Exp $
Incorporate a patch from the author that widens the NETBSDV definition
to account for new current versioning system, properly handles the
@@ -70,14 +70,18 @@ support.
}
/*
* Obtain the inode number.
-@@ -836,6 +869,16 @@ process_overlaid_node:
+@@ -836,6 +869,20 @@ process_overlaid_node:
break;
#endif /* defined(HASPROCFS) */
+#if defined(HASPTYFS)
+ case PTYFSNODE:
-+ if (pt.ptyfs_type == PTYFSptc)
-+ Lf->inode = (unsigned long)(pt.ptyfs_fileno & 0x3fffffff);
++ if (pt.ptyfs_type == PTYFSptc) {
++ if (pt.ptyfs_fileno >= 0x3fffffff)
++ Lf->inode = (unsigned long)(pt.ptyfs_fileno & 0x3fffffff);
++ else
++ Lf->inode = (unsigned long)(pt.ptyfs_fileno - 1);
++ }
+ else
+ Lf->inode = (unsigned long)pt.ptyfs_fileno;
+ Lf->inp_ty = 1;