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

- Use __COPYRIGHT() and __RCSID() 

- Fix compiler warnings.
This commit is contained in:
thorpej 1997-07-20 05:13:36 +00:00
parent a24225a200
commit efc20a3095
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/cp/cp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cp.c,v 1.17 1997/05/21 09:48:33 kleink Exp $ */ /* $NetBSD: cp.c,v 1.18 1997/07/20 05:13:36 thorpej Exp $ */
/* /*
* Copyright (c) 1988, 1993, 1994 * Copyright (c) 1988, 1993, 1994
@ -36,17 +36,18 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/cdefs.h>
#ifndef lint #ifndef lint
static char copyright[] = __COPYRIGHT(
"@(#) Copyright (c) 1988, 1993, 1994\n\ "@(#) Copyright (c) 1988, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n"; The Regents of the University of California. All rights reserved.\n");
#endif /* not lint */ #endif /* not lint */
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95"; static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95";
#else #else
static char rcsid[] = "$NetBSD: cp.c,v 1.17 1997/05/21 09:48:33 kleink Exp $"; __RCSID("$NetBSD: cp.c,v 1.18 1997/07/20 05:13:36 thorpej Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -95,6 +96,7 @@ int myumask;
enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
int main __P((int, char *[]));
int copy __P((char *[], enum op, int)); int copy __P((char *[], enum op, int));
int mastercmp __P((const FTSENT **, const FTSENT **)); int mastercmp __P((const FTSENT **, const FTSENT **));
@ -259,8 +261,10 @@ copy(argv, type, fts_options)
int base, dne, nlen, rval; int base, dne, nlen, rval;
char *p, *tmp; char *p, *tmp;
base = 0; /* XXX gcc -Wuninitialized (see comment below) */
if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL) if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
err(1, NULL); err(1, argv[0]);
for (rval = 0; (curr = fts_read(ftsp)) != NULL;) { for (rval = 0; (curr = fts_read(ftsp)) != NULL;) {
switch (curr->fts_info) { switch (curr->fts_info) {
case FTS_NS: case FTS_NS:

5
bin/cp/utils.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: utils.c,v 1.7 1997/05/15 05:27:14 mikel Exp $ */ /* $NetBSD: utils.c,v 1.8 1997/07/20 05:13:37 thorpej Exp $ */
/*- /*-
* Copyright (c) 1991, 1993, 1994 * Copyright (c) 1991, 1993, 1994
@ -33,11 +33,12 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#else #else
static char rcsid[] = "$NetBSD: utils.c,v 1.7 1997/05/15 05:27:14 mikel Exp $"; __RCSID("$NetBSD: utils.c,v 1.8 1997/07/20 05:13:37 thorpej Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */