changes for 4.4BSD-Lite requested by USL

[unix-history] / usr / src / sys / kern / kern_acct.c

diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c
index 62b282e..fec730c 100644 (file)
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -1,10 +1,10 @@
 /*-
 /*-

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

  *
  * %sccs.include.proprietary.c%
  *
  *
  * %sccs.include.proprietary.c%
  *

- *     @(#)kern_acct.c 8.1 (Berkeley) %G%
+ *     @(#)kern_acct.c 8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -46,13 +46,12 @@ struct      vnode *savacctp;
  * accounting has been suspended, and freespace rises above acctresume,
  * accounting is resumed.
  */
  * accounting has been suspended, and freespace rises above acctresume,
  * accounting is resumed.
  */

-/* ARGSUSED */
-struct sysacct_args {
+struct acct_args {

        char    *fname;
 };
        char    *fname;
 };

-sysacct(p, uap, retval)
+acct(p, uap, retval)

        struct proc *p;
        struct proc *p;

-       struct sysacct_args *uap;
+       struct acct_args *uap;

        int *retval;
 {
        register struct vnode *vp;
        int *retval;
 {
        register struct vnode *vp;


@@ -127,7 +126,7 @@ acctwatch(a)
  * This routine calculates an accounting record for a process and,
  * if accounting is enabled, writes it to the accounting file.
  */
  * This routine calculates an accounting record for a process and,
  * if accounting is enabled, writes it to the accounting file.
  */

-acct(p)
+acct_process(p)

        register struct proc *p;
 {
        register struct rusage *ru;
        register struct proc *p;
 {
        register struct rusage *ru;


@@ -159,7 +158,7 @@ acct(p)
        else
                ap->ac_mem = 0;
        ap->ac_io = compress(ru->ru_inblock + ru->ru_oublock, (long)0);
        else
                ap->ac_mem = 0;
        ap->ac_io = compress(ru->ru_inblock + ru->ru_oublock, (long)0);

-       if (p->p_flag&SCTTY && p->p_session->s_ttyp)
+       if (p->p_flag & P_CONTROLT && p->p_session->s_ttyp)

                ap->ac_tty = p->p_session->s_ttyp->t_dev;
        else
                ap->ac_tty = NODEV;
                ap->ac_tty = p->p_session->s_ttyp->t_dev;
        else
                ap->ac_tty = NODEV;