Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge local changes.

This commit is contained in:
mycroft 1994-06-13 22:04:11 +00:00
parent 10e2d61588
commit 8d5d38980e
9 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/fstat/Makefile
View File

@ -1,4 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $Id: Makefile,v 1.7 1994/06/13 22:12:07 mycroft Exp $
PROG= fstat
CFLAGS+=-I${DESTDIR}/sys

3
usr.bin/fstat/fstat.1
View File

@ -29,7 +29,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" @(#)fstat.1 8.3 (Berkeley) 2/25/94
.\" from: @(#)fstat.1 8.3 (Berkeley) 2/25/94
.\" $Id: fstat.1,v 1.6 1994/06/13 22:12:11 mycroft Exp $
.\"
.Dd February 25, 1994
.Dt FSTAT 1

18
usr.bin/fstat/fstat.c
View File

@ -38,7 +38,8 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
static char sccsid[] = "@(#)fstat.c 8.1 (Berkeley) 6/6/93";
/*static char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/
static char *rcsid = "$Id: fstat.c,v 1.11 1994/06/13 22:12:13 mycroft Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -464,7 +465,6 @@ ufs_filestat(vp, fsp)
struct vnode *vp;
struct filestat *fsp;
{
#ifdef notyet
struct inode inode;
if (!KVM_READ(VTOI(vp), &inode, sizeof (inode))) {
@ -477,16 +477,6 @@ ufs_filestat(vp, fsp)
fsp->mode = (mode_t)inode.i_mode;
fsp->size = (u_long)inode.i_size;
fsp->rdev = inode.i_rdev;
#else
struct inode *inode;
inode = VTOI(vp);
fsp->fsid = inode->i_dev & 0xffff;
fsp->fileid = (long)inode->i_number;
fsp->mode = (mode_t)inode->i_mode;
fsp->size = (u_long)inode->i_size;
fsp->rdev = inode->i_rdev;
#endif
return 1;
}
@ -496,7 +486,6 @@ nfs_filestat(vp, fsp)
struct vnode *vp;
struct filestat *fsp;
{
#ifdef notyet
struct nfsnode nfsnode;
register mode_t mode;
@ -536,9 +525,6 @@ nfs_filestat(vp, fsp)
fsp->mode = mode;
return 1;
#else
return 0;
#endif
}

4
usr.sbin/quotaon/Makefile
View File

@ -1,5 +1,5 @@
# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
# $Id: Makefile,v 1.2 1993/07/30 21:41:10 mycroft Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $Id: Makefile,v 1.3 1994/06/13 22:04:11 mycroft Exp $
PROG= quotaon
MAN8= quotaon.0

12
usr.sbin/quotaon/quotaon.8
View File

@ -1,5 +1,5 @@
.\" Copyright (c) 1983, 1990, 1991 Regents of the University of California.
.\" All rights reserved.
.\" Copyright (c) 1983, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" Robert Elz at The University of Melbourne.
@ -31,10 +31,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" from: @(#)quotaon.8 6.7 (Berkeley) 3/16/91
.\" $Id: quotaon.8,v 1.2 1993/08/01 07:23:57 mycroft Exp $
.\" from: @(#)quotaon.8 8.2 (Berkeley) 12/11/93
.\" $Id: quotaon.8,v 1.3 1994/06/13 22:04:13 mycroft Exp $
.\"
.Dd March 16, 1991
.Dd December 11, 1993
.Dt QUOTAON 8
.Os BSD 4.2
.Sh NAME
@ -89,7 +89,7 @@ Available options:
If the
.Fl a
flag is supplied in place of any filesystem names,
.Nm quotaon Ns / Ns quotaoff
.Nm quotaon Ns / Ns Nm quotaoff
will enable/disable all the filesystems indicated in
.Pa /etc/fstab
to be read-write with disk quotas.

14
usr.sbin/quotaon/quotaon.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 1980, 1990 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Robert Elz at The University of Melbourne.
@ -35,14 +35,14 @@
*/
#ifndef lint
char copyright[] =
"@(#) Copyright (c) 1980, 1990 Regents of the University of California.\n\
All rights reserved.\n";
static char copyright[] =
"@(#) Copyright (c) 1980, 1990, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
/*static char sccsid[] = "from: @(#)quotaon.c 5.12 (Berkeley) 9/27/90";*/
static char rcsid[] = "$Id: quotaon.c,v 1.3 1994/06/13 20:54:27 cgd Exp $";
/*static char sccsid[] = "from: @(#)quotaon.c 8.1 (Berkeley) 6/6/93";*/
static char *rcsid = "$Id: quotaon.c,v 1.4 1994/06/13 22:04:14 mycroft Exp $";
#endif /* not lint */
/*

4
usr.sbin/repquota/Makefile
View File

@ -1,5 +1,5 @@
# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
# $Id: Makefile,v 1.2 1993/07/30 21:41:04 mycroft Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $Id: Makefile,v 1.3 1994/06/13 22:07:21 mycroft Exp $
PROG= repquota
MAN8= repquota.0

10
usr.sbin/repquota/repquota.8
View File

@ -1,5 +1,5 @@
.\" Copyright (c) 1983, 1990, 1991 Regents of the University of California.
.\" All rights reserved.
.\" Copyright (c) 1983, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" Robert Elz at The University of Melbourne.
@ -32,10 +32,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" from: @(#)repquota.8 6.6 (Berkeley) 3/16/91
.\" $Id: repquota.8,v 1.2 1993/08/01 07:23:54 mycroft Exp $
.\" from: @(#)repquota.8 8.1 (Berkeley) 6/6/93
.\" $Id: repquota.8,v 1.3 1994/06/13 22:07:25 mycroft Exp $
.\"
.Dd March 16, 1991
.Dd June 6, 1993
.Dt REPQUOTA 8
.Os BSD 4.2
.Sh NAME

14
usr.sbin/repquota/repquota.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 1980, 1990 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Robert Elz at The University of Melbourne.
@ -35,14 +35,14 @@
*/
#ifndef lint
char copyright[] =
"@(#) Copyright (c) 1980, 1990 Regents of the University of California.\n\
All rights reserved.\n";
static char copyright[] =
"@(#) Copyright (c) 1980, 1990, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
/*static char sccsid[] = "from: @(#)repquota.c 5.11 (Berkeley) 9/27/90";*/
static char rcsid[] = "$Id: repquota.c,v 1.3 1994/06/13 20:52:39 cgd Exp $";
/*static char sccsid[] = "from: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/
static char *rcsid = "$Id: repquota.c,v 1.4 1994/06/13 22:07:26 mycroft Exp $";
#endif /* not lint */
/*