Annotation of pkgsrc/sysutils/lsof/patches/patch-ae, revision 1.5
1.5 ! atatat 1: $NetBSD$
1.1 atatat 2:
1.5 ! atatat 3: Incorporate a patch from the author that widens the NETBSDV definition
! 4: to account for new current versioning system, properly handles the
! 5: sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs
! 6: support.
1.1 atatat 7:
1.5 ! atatat 8: --- dialects/n+obsd/dnode.c.orig 2004-07-06 15:20:23.000000000 -0400
! 9: +++ dialects/n+obsd/dnode.c
! 10: @@ -188,7 +188,7 @@ process_node(va)
! 11: struct mfsnode m;
! 12: struct nfsnode n;
! 13: enum nodetype {NONODE, CDFSNODE, DOSNODE, EXT2NODE, FDESCNODE, INODE,
! 14: - KERNFSNODE, MFSNODE, NFSNODE, PFSNODE} nty;
! 15: + KERNFSNODE, MFSNODE, NFSNODE, PFSNODE, PTYFSNODE} nty;
! 16: enum vtype type;
! 17: struct vnode *v, vb;
! 18: struct l_vfs *vfs;
! 19: @@ -262,6 +262,11 @@ process_node(va)
! 20: size_t sz;
! 21: #endif /* defined(HASPROCFS) */
1.3 atatat 22:
1.5 ! atatat 23: +#if defined(HASPTYFS)
! 24: + struct ptyfsnode pt;
! 25: + struct specinfo si;
! 26: +#endif /* defined(HASPTYFS) */
! 27: +
! 28: #if defined(HASNULLFS)
! 29:
! 30: process_overlaid_node:
! 31: @@ -523,6 +528,19 @@ process_overlaid_node:
! 32: break;
! 33: #endif /* defined(HASPROCFS) */
! 34:
! 35: +#if defined(HASPTYFS)
! 36: + case VT_PTYFS:
! 37: + if (!v->v_data
! 38: + || kread((KA_T)v->v_data, (char *)&pt, sizeof(pt))) {
! 39: + (void) snpf(Namech, Namechl, "can't read ptyfsnode at: %s",
! 40: + print_kptr((KA_T)v->v_data, (char *)NULL, 0));
! 41: + enter_nm(Namech);
! 42: + return;
! 43: + }
! 44: + nty = PTYFSNODE;
! 45: + break;
! 46: +#endif /* defined(HASPTYFS) */
! 47: +
! 48: #if defined(HASEXT2FS)
! 49: case VT_EXT2FS:
! 50: #endif /* defined(HASEXT2FS) */
! 51: @@ -769,6 +787,21 @@ process_overlaid_node:
! 52: case NFSNODE:
! 53: dev = NVATTR.va_fsid;
! 54: devs = 1;
! 55: +
! 56: +#if defined(HASPTYFS)
! 57: + case PTYFSNODE:
! 58: + if (v->v_un.vu_specinfo
! 59: + && !kread((KA_T)v->v_un.vu_specinfo, (char *)&si, sizeof(si))) {
! 60: + rdev = si.si_rdev;
! 61: + rdevs = 1;
! 62: + }
! 63: + if (vfs) {
! 64: + dev = (dev_t)vfs->fsid.__fsid_val[0];
! 65: + devs = 1;
! 66: + }
! 67: + break;
! 68: +#endif /* defined(HASPTYFS) */
! 69: +
! 70: }
! 71: /*
! 72: * Obtain the inode number.
! 73: @@ -836,6 +869,13 @@ process_overlaid_node:
! 74: break;
! 75: #endif /* defined(HASPROCFS) */
! 76:
! 77: +#if defined(HASPTYFS)
! 78: + case PTYFSNODE:
! 79: + Lf->inode = (unsigned long)pt.ptyfs_fileno;
! 80: + Lf->inp_ty = 1;
! 81: + break;
! 82: +#endif /* defined(HASPTYFS) */
! 83: +
! 84: }
! 85:
! 86: /*
! 87: @@ -1152,7 +1192,8 @@ process_overlaid_node:
! 88: * ioctl(fd, TIOCNOTTY) files;
! 89: * /kern files
! 90: * memory node files;
! 91: - * /proc files.
! 92: + * /proc files;
! 93: + * ptyfs files.
! 94: */
! 95:
! 96: if (type == VBAD)
! 97: @@ -1222,14 +1263,52 @@ process_overlaid_node:
! 98: (void) snpf(ep, sz, "/%d/notepg", p.pfs_pid);
! 99: ty = "PGID";
! 100: break;
! 101: + case Pfd:
! 102: + ep = endnm(&sz);
! 103: + (void) snpf(ep, sz, "/%d/fd", p.pfs_pid);
! 104: + ty = "PFD";
! 105: + break;
! 106: + case Pmap:
! 107: + ep = endnm(&sz);
! 108: + (void) snpf(ep, sz, "/%d/map", p.pfs_pid);
! 109: + ty = "PMAP";
! 110: + break;
! 111: + case Pmaps:
! 112: + ep = endnm(&sz);
! 113: + (void) snpf(ep, sz, "/%d/maps", p.pfs_pid);
! 114: + ty = "PMPS";
! 115: + break;
! 116: }
! 117: if (ty)
! 118: (void) snpf(Lf->type, sizeof(Lf->type), ty);
! 119: - if (Namech[0])
! 120: - enter_nm(Namech);
! 121: }
! 122: #endif /* defined(HASPROCFS) */
! 123:
! 124: +#if defined(HASPTYFS)
! 125: + else if (nty == PTYFSNODE) {
! 126: + (void) snpf(Namech, Namechl, "%s", Lf->fsdir);
! 127: + Lf->nlink = 1;
! 128: + Lf->nlink_def = 1;
! 129: + switch (pt.ptyfs_type) {
! 130: + case PTYFSpts:
! 131: + ep = endnm(&sz);
! 132: + (void) snpf(ep, sz, "/%lu", (unsigned long)pt.ptyfs_pty);
! 133: + break;
! 134: + case PTYFSptc:
! 135: + ep = endnm(&sz);
! 136: + (void) snpf(ep, sz, "/%lu (master)",
! 137: + (unsigned long)pt.ptyfs_pty);
! 138: + break;
! 139: + case PTYFSroot:
! 140: + Lf->sz = 512;
! 141: + Lf->sz_def = 1;
! 142: + break;
! 143: + }
! 144: + if (ty)
! 145: + (void) snpf(Lf->type, sizeof(Lf->type), ty);
! 146: + }
! 147: +#endif /* defined(HASPTYFS) */
! 148: +
! 149: #if defined(HASBLKDEV)
! 150: /*
! 151: * If this is a VBLK file and it's missing an inode number, try to
! 152: @@ -1283,7 +1362,9 @@ process_overlaid_node:
! 153: if (Sfile && is_file_named((char *)NULL,
! 154: ((type == VCHR) || (type == VBLK)) ? 1
! 155: : 0))
! 156: + {
! 157: Lf->sf |= SELNM;
! 158: + }
! 159: if (ns)
! 160: Namech[0] = '\0';
! 161: }
CVSweb <webmaster@jp.NetBSD.org>