Annotation of pkgsrc/sysutils/lsof/patches/patch-ae, revision 1.6
1.6 ! atatat 1: $NetBSD: patch-ae,v 1.5 2004/11/28 22:39:07 atatat Exp $
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.
1.6 ! atatat 73: @@ -836,6 +869,16 @@ process_overlaid_node:
1.5 atatat 74: break;
75: #endif /* defined(HASPROCFS) */
76:
77: +#if defined(HASPTYFS)
78: + case PTYFSNODE:
1.6 ! atatat 79: + if (pt.ptyfs_type == PTYFSptc)
! 80: + Lf->inode = (unsigned long)(pt.ptyfs_fileno & 0x3fffffff);
! 81: + else
! 82: + Lf->inode = (unsigned long)pt.ptyfs_fileno;
1.5 atatat 83: + Lf->inp_ty = 1;
84: + break;
85: +#endif /* defined(HASPTYFS) */
86: +
87: }
88:
89: /*
1.6 ! atatat 90: @@ -1009,27 +1052,26 @@ process_overlaid_node:
! 91: switch (nty) {
! 92: case INODE:
! 93:
! 94: +#if defined(HASEFFNLINK)
! 95: + Lf->nlink = (long)i.HASEFFNLINK;
! 96: +#else /* !defined(HASEFFNLINK) */
! 97: # if defined(HASI_FFS)
! 98: Lf->nlink = (long)i.i_ffs_nlink;
! 99: - Lf->nlink_def = 1;
! 100: # else /* !defined(HASI_FFS) */
! 101: # if defined(HASI_FFS1)
! 102: if (ffs == 1) {
! 103: - if (u1s) {
! 104: + if (u1s)
! 105: Lf->nlink = (long)u1.di_nlink;
! 106: - Lf->nlink_def = 1;
! 107: - }
! 108: } else if (ffs == 2) {
! 109: - if (u2s) {
! 110: + if (u2s)
! 111: Lf->nlink = (long)u2.di_nlink;
! 112: - Lf->nlink_def = 1;
! 113: - }
! 114: }
! 115: # else /* !defined(HASI_FFS1) */
! 116: +
! 117: Lf->nlink = (long)i.i_nlink;
! 118: - Lf->nlink_def = 1;
! 119: # endif /* defined(HASI_FFS1) */
! 120: # endif /* defined(HASI_FFS) */
! 121: +#endif /* defined(HASEFFNLINK) */
! 122:
! 123: Lf->nlink_def = 1;
! 124: break;
! 125: @@ -1152,7 +1194,8 @@ process_overlaid_node:
1.5 atatat 126: * ioctl(fd, TIOCNOTTY) files;
127: * /kern files
128: * memory node files;
129: - * /proc files.
130: + * /proc files;
131: + * ptyfs files.
132: */
133:
134: if (type == VBAD)
1.6 ! atatat 135: @@ -1222,14 +1265,62 @@ process_overlaid_node:
1.5 atatat 136: (void) snpf(ep, sz, "/%d/notepg", p.pfs_pid);
137: ty = "PGID";
138: break;
1.6 ! atatat 139: +
! 140: +# if defined(Pfd)
1.5 atatat 141: + case Pfd:
142: + ep = endnm(&sz);
143: + (void) snpf(ep, sz, "/%d/fd", p.pfs_pid);
144: + ty = "PFD";
145: + break;
1.6 ! atatat 146: +# endif /* defined(Pfd) */
! 147: +
! 148: +# if defined(Pmap)
1.5 atatat 149: + case Pmap:
150: + ep = endnm(&sz);
151: + (void) snpf(ep, sz, "/%d/map", p.pfs_pid);
152: + ty = "PMAP";
153: + break;
1.6 ! atatat 154: +# endif /* defined(Pmap) */
! 155: +
! 156: +# if defined(Pmaps)
1.5 atatat 157: + case Pmaps:
158: + ep = endnm(&sz);
159: + (void) snpf(ep, sz, "/%d/maps", p.pfs_pid);
160: + ty = "PMPS";
161: + break;
1.6 ! atatat 162: +# endif /* defined(Pmaps) */
! 163: +
1.5 atatat 164: }
165: if (ty)
166: (void) snpf(Lf->type, sizeof(Lf->type), ty);
167: - if (Namech[0])
168: - enter_nm(Namech);
169: }
170: #endif /* defined(HASPROCFS) */
171:
172: +#if defined(HASPTYFS)
173: + else if (nty == PTYFSNODE) {
174: + (void) snpf(Namech, Namechl, "%s", Lf->fsdir);
175: + Lf->nlink = 1;
176: + Lf->nlink_def = 1;
177: + switch (pt.ptyfs_type) {
178: + case PTYFSpts:
179: + ep = endnm(&sz);
180: + (void) snpf(ep, sz, "/%lu", (unsigned long)pt.ptyfs_pty);
181: + break;
182: + case PTYFSptc:
183: + ep = endnm(&sz);
184: + (void) snpf(ep, sz, "/%lu (master)",
185: + (unsigned long)pt.ptyfs_pty);
186: + break;
187: + case PTYFSroot:
188: + Lf->sz = 512;
189: + Lf->sz_def = 1;
190: + break;
191: + }
192: + if (ty)
193: + (void) snpf(Lf->type, sizeof(Lf->type), ty);
194: + }
195: +#endif /* defined(HASPTYFS) */
196: +
197: #if defined(HASBLKDEV)
198: /*
199: * If this is a VBLK file and it's missing an inode number, try to
1.6 ! atatat 200: @@ -1283,7 +1374,9 @@ process_overlaid_node:
1.5 atatat 201: if (Sfile && is_file_named((char *)NULL,
202: ((type == VCHR) || (type == VBLK)) ? 1
203: : 0))
204: + {
205: Lf->sf |= SELNM;
206: + }
207: if (ns)
208: Namech[0] = '\0';
209: }
CVSweb <webmaster@jp.NetBSD.org>