From ce7cf840b3644fdd8f2ac6c00c94f29cd1895fc8 Mon Sep 17 00:00:00 2001 From: hja Date: Tue, 17 Nov 2026 16:07:04 +0000 Subject: [PATCH] fix procfs file selection with multiple mounts --- lib/dialects/netbsd/dnode.c | 11 ++++++++--- lib/dialects/sun/dnode.c | 2 +- lib/dialects/uw/dnode.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/dialects/netbsd/dnode.c b/lib/dialects/netbsd/dnode.c index b4c2fcf9..f77ea0aa 100644 --- a/lib/dialects/netbsd/dnode.c +++ b/lib/dialects/netbsd/dnode.c @@ -764,6 +764,11 @@ void process_node(struct lsof_context *ctx, /* context */ #if defined(HASKERNFS) case KERNFSNODE: +#endif /* defined(HASKERNFS) */ +#if defined(HASPROCFS) + case PFSNODE: +#endif /* defined(HASPROCFS) */ +#if defined(HASKERNFS) || defined(HASPROCFS) if (vfs) { # if defined(HASSTATVFS) @@ -775,7 +780,7 @@ void process_node(struct lsof_context *ctx, /* context */ devs = 1; } break; -#endif /* defined(HASKERNFS) */ +#endif /* defined(HASKERNFS) || defined(HASPROCFS) */ #if defined(HAS9660FS) case CDFSNODE: @@ -1227,7 +1232,7 @@ void process_node(struct lsof_context *ctx, /* context */ #if defined(HASPROCFS) else if (nty == PFSNODE) { - Lf->dev_def = Lf->rdev_def = 0; + Lf->rdev_def = 0; (void)snpf(Namech, Namechl, "/%s", HASPROCFS); switch (p.pfs_type) { case Proot: @@ -1357,7 +1362,7 @@ void process_node(struct lsof_context *ctx, /* context */ */ #if defined(HASPROCFS) - if (Ntype == N_PROC) { + if (Ntype == N_PROC && (Procsrch || Procfsid)) { if (Procsrch) { Procfind = 1; Lf->sf |= SELNM; diff --git a/lib/dialects/sun/dnode.c b/lib/dialects/sun/dnode.c index 573f710d..7bb53e17 100644 --- a/lib/dialects/sun/dnode.c +++ b/lib/dialects/sun/dnode.c @@ -3719,7 +3719,7 @@ void process_node(struct lsof_context *ctx, /* context */ */ #if defined(HASPROCFS) - if (Ntype == N_PROC) { + if (Ntype == N_PROC && (Procsrch || Procfsid)) { if (Procsrch) { Procfind = 1; Lf->sf |= SELNM; diff --git a/lib/dialects/uw/dnode.c b/lib/dialects/uw/dnode.c index b3def519..5afb9030 100644 --- a/lib/dialects/uw/dnode.c +++ b/lib/dialects/uw/dnode.c @@ -1321,7 +1321,7 @@ void process_node(struct lsof_context *ctx, /* context */ */ #if defined(HASPROCFS) - if (Ntype == N_PROC) { + if (Ntype == N_PROC && (Procsrch || Procfsid)) { if (Procsrch) { Procfind = 1; Lf->sf |= SELNM;