BSD 4_4_Lite1 release

[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 2db5664..d88aaab 100644 (file)
--- a/usr/src/sys/miscfs/procfs/procfs_status.c
+++ b/usr/src/sys/miscfs/procfs/procfs_status.c
@@ -1,14 +1,40 @@
 /*
 /*

- * Copyright (c) 1993 The Regents of the University of California.

  * Copyright (c) 1993 Jan-Simon Pendry
  * Copyright (c) 1993 Jan-Simon Pendry

- * All rights reserved.
+ * Copyright (c) 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)procfs_status.c     8.1 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)procfs_status.c     8.3 (Berkeley) 2/17/94

  *
  * 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 $


@@ -79,17 +105,17 @@ procfs_dostatus(curp, p, pfs, uio)
                ps += sprintf(ps, "noflags");
 
        if (p->p_flag & P_INMEM)
                ps += sprintf(ps, "noflags");
 
        if (p->p_flag & P_INMEM)

-               ps += sprintf(ps, " %d %d",
+               ps += sprintf(ps, " %d,%d",

                        p->p_stats->p_start.tv_sec,
                        p->p_stats->p_start.tv_usec);
        else
                        p->p_stats->p_start.tv_sec,
                        p->p_stats->p_start.tv_usec);
        else

-               ps += sprintf(ps, " -1 -1");
+               ps += sprintf(ps, " -1,-1");

        
        {
                struct timeval ut, st;
 
                calcru(p, &ut, &st, (void *) 0);
        
        {
                struct timeval ut, st;
 
                calcru(p, &ut, &st, (void *) 0);

-               ps += sprintf(ps, " %d %d %d %d",
+               ps += sprintf(ps, " %d,%d %d,%d",

                        ut.tv_sec,
                        ut.tv_usec,
                        st.tv_sec,
                        ut.tv_sec,
                        ut.tv_usec,
                        st.tv_sec,


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

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

        for (i = 0; i < cr->cr_ngroups; i++)
        for (i = 0; i < cr->cr_ngroups; i++)

-               ps += sprintf(ps, " %d", cr->cr_groups[i]);
+               ps += sprintf(ps, ",%d", cr->cr_groups[i]);

        ps += sprintf(ps, "\n");
 
        xlen = ps - psbuf;
        ps += sprintf(ps, "\n");
 
        xlen = ps - psbuf;