merge in netbsd changes.

[unix-history] / usr / src / sys / miscfs / procfs / procfs_status.c

diff --git a/usr/src/sys/miscfs/procfs/procfs_status.c b/usr/src/sys/miscfs/procfs/procfs_status.c
index b3ff071..f204664 100644 (file)
--- a/usr/src/sys/miscfs/procfs/procfs_status.c
+++ b/usr/src/sys/miscfs/procfs/procfs_status.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)procfs_status.c     8.3 (Berkeley) %G%
+ *     @(#)procfs_status.c     8.4 (Berkeley) %G%

  *
  * From:
  *     $Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
  *
  * From:
  *     $Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $


@@ -101,7 +101,7 @@ procfs_dostatus(curp, p, pfs, uio)
 
        cr = p->p_ucred;
 
 
        cr = p->p_ucred;
 

-       ps += sprintf(ps, " %d", cr->cr_uid, cr->cr_gid);
+       ps += sprintf(ps, " %d", cr->cr_uid);

        for (i = 0; i < cr->cr_ngroups; i++)
                ps += sprintf(ps, ",%d", cr->cr_groups[i]);
        ps += sprintf(ps, "\n");
        for (i = 0; i < cr->cr_ngroups; i++)
                ps += sprintf(ps, ",%d", cr->cr_groups[i]);
        ps += sprintf(ps, "\n");


@@ -109,7 +109,7 @@ procfs_dostatus(curp, p, pfs, uio)
        xlen = ps - psbuf;
        xlen -= uio->uio_offset;
        ps = psbuf + uio->uio_offset;
        xlen = ps - psbuf;
        xlen -= uio->uio_offset;
        ps = psbuf + uio->uio_offset;

-       xlen = min(xlen, uio->uio_resid);
+       xlen = imin(xlen, uio->uio_resid);

        if (xlen <= 0)
                error = 0;
        else
        if (xlen <= 0)
                error = 0;
        else