diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-03 19:26:43 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-03 19:26:43 +0000 |
| commit | 0f2e2a2273b06fb3deb6e6dae007ebfff05774c4 (patch) | |
| tree | b1300492e688d87bbefdb08d898c0e51f687b21f /sysutils/and/files/patch-and-OpenBSD.c | |
| parent | chase mcrypt lib version (diff) | |
upgrade to 1.0.8
PR: 46433
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=72448
Diffstat (limited to 'sysutils/and/files/patch-and-OpenBSD.c')
| -rw-r--r-- | sysutils/and/files/patch-and-OpenBSD.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sysutils/and/files/patch-and-OpenBSD.c b/sysutils/and/files/patch-and-OpenBSD.c new file mode 100644 index 000000000000..5d94253e3724 --- /dev/null +++ b/sysutils/and/files/patch-and-OpenBSD.c @@ -0,0 +1,41 @@ +--- and-OpenBSD.c.orig Mon Jan 28 01:02:51 2002 ++++ and-OpenBSD.c Sat Dec 21 02:04:58 2002 +@@ -91,17 +91,38 @@ + abort(); + } + if (openbsd_next >= openbsd_nproc) return NULL; ++#if defined(__FreeBSD__) && __FreeBSD_version >= 50014 ++ strncpy(openbsd_proc.command,openbsd_pt[openbsd_next].ki_comm,1023); ++#else + strncpy(openbsd_proc.command,openbsd_pt[openbsd_next].kp_proc.p_comm,1023); ++#endif + openbsd_proc.command[1023] = 0; ++#if defined(__FreeBSD__) && __FreeBSD_version >= 50014 ++ openbsd_proc.pid = openbsd_pt[openbsd_next].ki_pid; ++ openbsd_proc.nice = openbsd_pt[openbsd_next].ki_nice-20; ++ openbsd_proc.uid = openbsd_pt[openbsd_next].ki_ruid; ++ openbsd_proc.gid = openbsd_pt[openbsd_next].ki_rgid; ++#else + openbsd_proc.pid = openbsd_pt[openbsd_next].kp_proc.p_pid; + openbsd_proc.nice = openbsd_pt[openbsd_next].kp_proc.p_nice-20; + openbsd_proc.uid = openbsd_pt[openbsd_next].kp_eproc.e_pcred.p_ruid; + openbsd_proc.gid = openbsd_pt[openbsd_next].kp_eproc.e_pcred.p_rgid; ++#endif + /* Adapted from top(1) port, as found in the misc@openbsd.org archive */ ++#if defined(__FreeBSD__) && __FreeBSD_version >= 50014 ++ /* XXX: Accessing ki_paddr causes sig10 ... ++ openbsd_proc.utime = (openbsd_pt[openbsd_next].ki_paddr->p_uticks + ++ openbsd_pt[openbsd_next].ki_paddr->p_sticks + ++ openbsd_pt[openbsd_next].ki_paddr->p_iticks) ++ / openbsd_hz; ++ */ ++ openbsd_proc.utime = 0; ++#else + openbsd_proc.utime = (openbsd_pt[openbsd_next].kp_proc.p_uticks + + openbsd_pt[openbsd_next].kp_proc.p_sticks + + openbsd_pt[openbsd_next].kp_proc.p_iticks) + / openbsd_hz; ++#endif + /* + printf("%-20s %5i %3i %i\n",openbsd_proc.command,openbsd_proc.pid, + openbsd_proc.nice,openbsd_proc.utime); |