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

merge in changes from 1.1 release branch

This commit is contained in:
jtc 1995-11-28 19:43:04 +00:00
parent 35c8aad7b3
commit 21908ddbd5
16 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.57 1995/11/17 09:50:23 thorpej Exp $
# $NetBSD: Makefile,v 1.58 1995/11/28 19:43:04 jtc Exp $
# from: @(#)Makefile 5.6.1.2 (Berkeley) 5/8/91
# not yet done: catman
@ -21,8 +21,10 @@ SUBDIR+=amd
.if make(clean) || make(cleandir)
SUBDIR+=bad144 config.old dbsym eeprom grfinfo hilinfo iteconfig screenblank
.elif ${MACHINE} == "amiga" || ${MACHINE} == "atari"
.elif ${MACHINE} == "amiga"
SUBDIR+=grfconfig iteconfig videomode
.elif ${MACHINE} == "atari"
SUBDIR+=iteconfig
.elif ${MACHINE} == "hp300"
SUBDIR+=config.old grfinfo hilinfo
.elif ${MACHINE} == "i386"

4
usr.sbin/edquota/edquota.c
View File

@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
static char *rcsid = "$Id: edquota.c,v 1.9 1995/04/21 04:41:21 cgd Exp $";
static char *rcsid = "$Id: edquota.c,v 1.10 1995/11/28 19:43:12 jtc Exp $";
#endif /* not lint */
/*
@ -221,7 +221,7 @@ getprivs(id, quotatype)
quphead = (struct quotause *)0;
qcmd = QCMD(Q_GETQUOTA, quotatype);
while (fs = getfsent()) {
if (strcmp(fs->fs_vfstype, "ufs"))
if (strcmp(fs->fs_vfstype, "ffs"))
continue;
if (!hasquota(fs, quotatype, &qfpathname))
continue;

1
usr.sbin/gspa/gspahextoc/gspahextoc.l
View File

@ -113,6 +113,7 @@ main(argc, argv)
printf(" * Do not edit manually..\n");
printf(" */\n");
printf("#include <sys/types.h>\n");
printf("u_int16_t tmscode[] = {\n\t");
yylex();
if (bufptr>0)

3
usr.sbin/lpr/common_source/common.c
View File

@ -1,4 +1,5 @@
/* $NetBSD: common.c,v 1.7 1995/11/15 22:23:06 pk Exp $ */
/* $NetBSD: common.c,v 1.8 1995/11/28 19:43:19 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/displayq.c
View File

@ -1,4 +1,5 @@
/* $NetBSD: displayq.c,v 1.6 1995/11/15 22:20:37 pk Exp $ */
/* $NetBSD: displayq.c,v 1.7 1995/11/28 19:43:21 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/lp.h
View File

@ -1,4 +1,5 @@
/* $NetBSD: lp.h,v 1.7 1995/11/15 22:23:10 pk Exp $ */
/* $NetBSD: lp.h,v 1.8 1995/11/28 19:43:24 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/lp.local.h
View File

@ -1,4 +1,5 @@
/* $NetBSD: lp.local.h,v 1.6 1995/11/15 22:23:12 pk Exp $ */
/* $NetBSD: lp.local.h,v 1.7 1995/11/28 19:43:26 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/pathnames.h
View File

@ -1,4 +1,5 @@
/* $NetBSD: pathnames.h,v 1.4 1995/11/15 22:23:15 pk Exp $ */
/* $NetBSD: pathnames.h,v 1.5 1995/11/28 19:43:27 jtc Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/printcap.c
View File

@ -1,4 +1,5 @@
/* $NetBSD: printcap.c,v 1.6 1995/11/15 22:23:18 pk Exp $ */
/* $NetBSD: printcap.c,v 1.7 1995/11/28 19:43:29 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/rmjob.c
View File

@ -1,4 +1,5 @@
/* $NetBSD: rmjob.c,v 1.6 1995/11/15 22:20:33 pk Exp $ */
/* $NetBSD: rmjob.c,v 1.7 1995/11/28 19:43:31 jtc Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

3
usr.sbin/lpr/common_source/startdaemon.c
View File

@ -1,4 +1,5 @@
/* $NetBSD: startdaemon.c,v 1.6 1995/11/15 22:23:20 pk Exp $ */
/* $NetBSD: startdaemon.c,v 1.7 1995/11/28 19:43:32 jtc Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.

6
usr.sbin/pstat/pstat.c
View File

@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; */
static char *rcsid = "$Id: pstat.c,v 1.14 1995/08/24 19:58:07 ragge Exp $";
static char *rcsid = "$Id: pstat.c,v 1.15 1995/11/28 19:43:40 jtc Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -328,7 +328,7 @@ vnodemode()
maddr = vp->v_mount;
mount_print(mp);
vnode_header();
if (!strncmp(ST.f_fstypename, MOUNT_UFS, MFSNAMELEN) ||
if (!strncmp(ST.f_fstypename, MOUNT_FFS, MFSNAMELEN) ||
!strncmp(ST.f_fstypename, MOUNT_MFS, MFSNAMELEN)) {
ufs_header();
} else if (!strncmp(ST.f_fstypename, MOUNT_NFS,
@ -338,7 +338,7 @@ vnodemode()
(void)printf("\n");
}
vnode_print(evp->avnode, vp);
if (!strncmp(ST.f_fstypename, MOUNT_UFS, MFSNAMELEN) ||
if (!strncmp(ST.f_fstypename, MOUNT_FFS, MFSNAMELEN) ||
!strncmp(ST.f_fstypename, MOUNT_MFS, MFSNAMELEN)) {
ufs_print(vp);
} else if (!strncmp(ST.f_fstypename, MOUNT_NFS, MFSNAMELEN)) {

4
usr.sbin/quot/quot.c
View File

@ -30,7 +30,7 @@
*/
#ifndef lint
static char rcsid[] = "$Id: quot.c,v 1.6 1994/06/13 20:56:47 cgd Exp $";
static char rcsid[] = "$Id: quot.c,v 1.7 1995/11/28 19:43:42 jtc Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -567,7 +567,7 @@ int main(argc,argv)
if (all) {
cnt = getmntinfo(&mp,MNT_NOWAIT);
for (; --cnt >= 0; mp++) {
if (!strncmp(mp->f_fstypename, MOUNT_UFS, MFSNAMELEN)) {
if (!strncmp(mp->f_fstypename, MOUNT_FFS, MFSNAMELEN)) {
if (nm = strrchr(mp->f_mntfromname,'/')) {
sprintf(dev,"/dev/r%s",nm + 1);
nm = dev;

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

@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)quotaon.c 8.1 (Berkeley) 6/6/93";*/
static char *rcsid = "$Id: quotaon.c,v 1.5 1994/12/23 16:39:33 cgd Exp $";
static char *rcsid = "$Id: quotaon.c,v 1.6 1995/11/28 19:43:45 jtc Exp $";
#endif /* not lint */
/*
@ -113,7 +113,7 @@ main(argc, argv)
}
setfsent();
while ((fs = getfsent()) != NULL) {
if (strcmp(fs->fs_vfstype, "ufs") ||
if (strcmp(fs->fs_vfstype, "ffs") ||
strcmp(fs->fs_type, FSTAB_RW))
continue;
if (aflag) {

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

@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/
static char *rcsid = "$Id: repquota.c,v 1.7 1995/01/03 02:06:31 cgd Exp $";
static char *rcsid = "$Id: repquota.c,v 1.8 1995/11/28 19:43:47 jtc Exp $";
#endif /* not lint */
/*
@ -131,7 +131,7 @@ main(argc, argv)
}
setfsent();
while ((fs = getfsent()) != NULL) {
if (strcmp(fs->fs_vfstype, "ufs"))
if (strcmp(fs->fs_vfstype, "ffs"))
continue;
if (aflag) {
if (gflag && hasquota(fs, GRPQUOTA, &qfnp))

2
usr.sbin/sendmail/src/sendmail.8
View File

@ -471,12 +471,12 @@ temp files
The process id of the daemon
.El
.Sh SEE ALSO
.Xr binmail 1 ,
.Xr mail 1 ,
.Xr rmail 1 ,
.Xr syslog 3 ,
.Xr aliases 5 ,
.Xr mailaddr 7 ,
.Xr mail.local 8 ,
.Xr rc 8 ;
.Pp
DARPA