Date: Tue, 12 Dec 2000 23:35:55 +0600 (NOVT) From: Nickolay Dudorov <nnd@mail.nsk.ru> To: cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/bin/ps extern.h keyword.c print.c ps.c ps.h src/lib/libkvm kvm.h kvm_proc.c src/sys/kern imgact_aout.c kern_proc.c sys_process.c src/sys/sys user.h src/usr.bin/fstat fstat.c src/usr.bin/gcore gcore.c src/usr.bin/systat pigs.c ... Message-ID: <200012121735.eBCHZt371752@wint.itfs.nsk.su> In-Reply-To: <200012120725.eBC7Pwx62645@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In article <200012120725.eBC7Pwx62645@freefall.freebsd.org> you wrote:
> mckusick 2000/12/11 23:25:58 PST
>
> Modified files:
> bin/ps extern.h keyword.c print.c ps.c ps.h
> lib/libkvm kvm.h kvm_proc.c
> sys/kern imgact_aout.c kern_proc.c sys_process.c
> sys/sys user.h
> usr.bin/fstat fstat.c
> usr.bin/gcore gcore.c
> usr.bin/systat pigs.c
> usr.bin/top machine.c
> usr.bin/w extern.h proc_compare.c w.c
> Log:
.......
The following patches make it possible for me
to 'make buildworld' after this commit.
N.Dudorov
Index: src/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c
===================================================================
RCS file: /scratch/CVS/src/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c,v
retrieving revision 1.23
diff -b -u -r1.23 freebsd-nat.c
--- src/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c 2000/08/17 16:27:26 1.23
+++ src/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c 2000/12/12 11:56:18
@@ -109,7 +109,7 @@
* First get virtual address of user structure. Then calculate offset.
*/
memcpy(&tmp_uaddr,
- &((struct user *) core_reg_sect)->u_kproc.kp_proc.p_addr,
+ &((struct user *) core_reg_sect)->u_kproc.ki_addr,
sizeof(tmp_uaddr));
offset = -reg_addr - (int) tmp_uaddr;
Index: src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
===================================================================
RCS file: /scratch/CVS/src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c,v
retrieving revision 1.18
diff -b -u -r1.18 kvm-fbsd.c
--- src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c 2000/12/09 09:35:31 1.18
+++ src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c 2000/12/12 12:45:26
@@ -471,7 +471,7 @@
kp = kvm_getprocs(core_kd, KERN_PROC_PID, paddr, &cnt);
if (!cnt)
error("invalid pid");
- if (set_proc_context((CORE_ADDR)kp->kp_eproc.e_paddr))
+ if (set_proc_context((CORE_ADDR)kp->ki_paddr))
error("invalid proc address");
}
}
@@ -707,7 +707,7 @@
return (0);
if (lp.p_pid != pid)
continue;
- kp.kp_eproc.e_paddr = p;
+ kp.ki_paddr = p;
*cnt = 1;
return (1);
}
Index: src/usr.bin/killall/killall.c
===================================================================
RCS file: /scratch/CVS/src/usr.bin/killall/killall.c,v
retrieving revision 1.6
diff -b -u -r1.6 killall.c
--- src/usr.bin/killall/killall.c 2000/11/12 07:43:50 1.6
+++ src/usr.bin/killall/killall.c 2000/12/12 13:55:36
@@ -283,11 +283,11 @@
printf("nprocs %d\n", nprocs);
for (i = 0; i < nprocs; i++) {
- thispid = procs[i].kp_proc.p_pid;
- strncpy(thiscmd, procs[i].kp_proc.p_comm, MAXCOMLEN);
+ thispid = procs[i].ki_pid;
+ strncpy(thiscmd, procs[i].ki_comm, MAXCOMLEN);
thiscmd[MAXCOMLEN] = '\0';
- thistdev = procs[i].kp_eproc.e_tdev;
- thisuid = procs[i].kp_eproc.e_pcred.p_ruid; /* real uid */
+ thistdev = procs[i].ki_tdev;
+ thisuid = procs[i].ki_ruid; /* real uid */
matched = 1;
if (user) {
Index: src/contrib/ipfilter/ipsend/sock.c
===================================================================
RCS file: /scratch/CVS/src/contrib/ipfilter/ipsend/sock.c,v
retrieving revision 1.3
diff -b -u -r1.3 sock.c
--- src/contrib/ipfilter/ipsend/sock.c 2000/02/10 03:17:46 1.3
+++ src/contrib/ipfilter/ipsend/sock.c 2000/12/12 16:09:11
@@ -283,10 +283,10 @@
return NULL;
fd = (struct filedesc *)malloc(sizeof(*fd));
- if (KMCPY(fd, p->kp_proc.p_fd, sizeof(*fd)) == -1)
+ if (KMCPY(fd, p->ki_fd, sizeof(*fd)) == -1)
{
fprintf(stderr, "read(%#lx,%#lx) failed\n",
- (u_long)p, (u_long)p->kp_proc.p_fd);
+ (u_long)p, (u_long)p->ki_fd);
return NULL;
}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200012121735.eBCHZt371752>