clean up RCS Id's and a couple of stype nits.

Also, fix bug 947 (reported by Luke Mewburn, extraneous vers.c)
This commit is contained in:
cgd 1995-04-11 02:44:45 +00:00
parent e41d4f5e96
commit 6a9917621c
9 changed files with 40 additions and 56 deletions

View File

@ -1,5 +1,5 @@
# from : @(#)Makefile 8.2 (Berkeley) 4/4/94
# $Id: Makefile,v 1.11 1994/12/22 10:27:01 cgd Exp $
# $NetBSD: Makefile,v 1.12 1995/04/11 02:44:45 cgd Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
PROG= ftpd
CFLAGS+=-DHASSETPROCTITLE -DSKEY

View File

@ -1,3 +1,5 @@
/* $NetBSD: extern.h,v 1.2 1995/04/11 02:44:49 cgd Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@ -30,8 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.2 (Berkeley) 4/4/94
* $Id: extern.h,v 1.1 1994/06/29 01:49:39 deraadt Exp $
* @(#)extern.h 8.2 (Berkeley) 4/4/94
*/
void blkfree __P((char **));

View File

@ -1,3 +1,5 @@
/* $NetBSD: ftpcmd.y,v 1.5 1995/04/11 02:44:51 cgd Exp $ */
/*
* Copyright (c) 1985, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
@ -41,8 +43,11 @@
%{
#ifndef lint
#if 0
static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
static char rcsid[] = "$Id: ftpcmd.y,v 1.4 1994/06/29 01:49:41 deraadt Exp $";
#else
static char rcsid[] = "$NetBSD: ftpcmd.y,v 1.5 1995/04/11 02:44:51 cgd Exp $";
#endif
#endif /* not lint */
#include <sys/param.h>

View File

@ -1,3 +1,5 @@
.\" $NetBSD: ftpd.8,v 1.7 1995/04/11 02:44:53 cgd Exp $
.\"
.\" Copyright (c) 1985, 1988, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@ -29,8 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ftpd.8 8.2 (Berkeley) 4/19/94
.\" $Id: ftpd.8,v 1.6 1995/02/17 09:19:45 jtc Exp $
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
.\"
.Dd April 19, 1994
.Dt FTPD 8

View File

@ -1,3 +1,5 @@
/* $NetBSD: ftpd.c,v 1.13 1995/04/11 02:44:55 cgd Exp $ */
/*
* Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@ -35,11 +37,14 @@
static char copyright[] =
"@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
static char rcsid[] = "$Id: ftpd.c,v 1.12 1995/03/22 16:55:35 mycroft Exp $";
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#else
static char rcsid[] = "$NetBSD: ftpd.c,v 1.13 1995/04/11 02:44:55 cgd Exp $":
#endif
#endif /* not lint */
/*
@ -87,7 +92,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#include <varargs.h>
#endif
static char version[] = "Version 6.01";
static char version[] = "Version 6.00";
extern off_t restart_point;
extern char cbuf[];
@ -125,12 +130,12 @@ int defumask = CMASK; /* default umask value */
char tmpline[7];
char hostname[MAXHOSTNAMELEN];
char remotehost[MAXHOSTNAMELEN];
static char ttyline[20];
char *tty = ttyline; /* for klogin */
static char ttyline[20];
char *tty = ttyline; /* for klogin */
#if defined(KERBEROS)
int notickets = 1;
char *krbtkfile_env = NULL;
int notickets = 1;
char *krbtkfile_env = NULL;
#endif
/*

View File

@ -1,3 +1,5 @@
/* $NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@ -33,8 +35,11 @@
*/
#ifndef lint
#if 0
static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "$Id: logwtmp.c,v 1.3 1994/06/29 01:49:47 deraadt Exp $";
#else
static char rcsid[] = "$NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $";
#endif
#endif /* not lint */
#include <sys/types.h>

View File

@ -1,3 +1,5 @@
/* $NetBSD: pathnames.h,v 1.5 1995/04/11 02:44:59 cgd Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@ -30,8 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90
* $Id: pathnames.h,v 1.4 1994/06/29 01:49:49 deraadt Exp $
* @(#)pathnames.h 8.1 (Berkeley) 6/4/93
*/
#include <paths.h>

View File

@ -1,3 +1,5 @@
/* $NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
@ -36,8 +38,11 @@
*/
#ifndef lint
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
static char rcsid[] = "$Id: popen.c,v 1.4 1995/03/21 21:47:19 mycroft Exp $";
#else
static char rcsid[] = "$NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $";
#endif
#endif /* not lint */
#include <sys/types.h>

View File

@ -1,39 +0,0 @@
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* 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.
*
* 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.
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)vers.c 5.1 (Berkeley) 6/24/90";*/
static char rcsid[] = "$Id: vers.c,v 1.2 1993/08/01 18:30:39 mycroft Exp $";
#endif /* not lint */
char version[] = "Version 5.60";