diff options
author | steve <steve@FreeBSD.org> | 1997-08-07 15:33:50 +0000 |
---|---|---|
committer | steve <steve@FreeBSD.org> | 1997-08-07 15:33:50 +0000 |
commit | 2eae399bf658d612cf34e257c1e75ac07483b906 (patch) | |
tree | 88a51bfc8ffc6d6aad839916e356b84aa27a871b /bin/ls | |
parent | 37eb5f3ab020d621a33309a011226112bfb224b5 (diff) | |
download | FreeBSD-src-2eae399bf658d612cf34e257c1e75ac07483b906.zip FreeBSD-src-2eae399bf658d612cf34e257c1e75ac07483b906.tar.gz |
Remove #if(n)def BSD_4_4_LITE cruft and sccsid -> rcsid.
Diffstat (limited to 'bin/ls')
-rw-r--r-- | bin/ls/cmp.c | 5 | ||||
-rw-r--r-- | bin/ls/extern.h | 4 | ||||
-rw-r--r-- | bin/ls/ls.c | 20 | ||||
-rw-r--r-- | bin/ls/ls.h | 10 | ||||
-rw-r--r-- | bin/ls/print.c | 7 | ||||
-rw-r--r-- | bin/ls/stat_flags.c | 5 | ||||
-rw-r--r-- | bin/ls/util.c | 5 |
7 files changed, 21 insertions, 35 deletions
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c index 2542012..42e3e80 100644 --- a/bin/ls/cmp.c +++ b/bin/ls/cmp.c @@ -33,11 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * from: @(#)cmp.c 8.1 (Berkeley) 5/31/93 */ #ifndef lint -static char const sccsid[] = "@(#)cmp.c 8.1 (Berkeley) 5/31/93"; +static const char rcsid[] = + "$Id: cmp.c,v 1.6 1997/02/22 14:03:53 peter Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/bin/ls/extern.h b/bin/ls/extern.h index 253d506..58a6173 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 + * $Id: extern.h,v 1.4 1997/02/22 14:03:54 peter Exp $ */ int acccmp __P((const FTSENT *, const FTSENT *)); diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 353914f..6816850 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -33,17 +33,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ls.c,v 1.13 1997/02/22 14:03:59 peter Exp $ + * from: @(#)ls.c 8.5 (Berkeley) 4/2/94 */ #ifndef lint -static char const copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char const sccsid[] = "@(#)ls.c 8.5 (Berkeley) 4/2/94"; +static const char rcsid[] = + "$Id: ls.c,v 1.14 1997/03/28 15:24:23 imp Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -94,9 +92,7 @@ int f_statustime; /* use time of last mode change */ int f_dirname; /* if precede with directory name */ int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ -#ifndef BSD4_4_LITE int f_whiteout; /* show whiteout entries */ -#endif int rval; @@ -134,11 +130,7 @@ main(argc, argv) f_listdot = 1; fts_options = FTS_PHYSICAL; -#ifdef BSD4_4_LITE - while ((ch = getopt(argc, argv, "1ACFLRTacdfgikloqrstu")) != -1) { -#else while ((ch = getopt(argc, argv, "1ACFLRTWacdfgikloqrstu")) != -1) { -#endif switch (ch) { /* * The -1, -C and -l options all override each other so shell @@ -215,11 +207,9 @@ main(argc, argv) case 't': f_timesort = 1; break; -#ifndef BSD4_4_LITE case 'W': f_whiteout = 1; break; -#endif default: case '?': usage(); @@ -242,7 +232,6 @@ main(argc, argv) if (!f_longform && !f_listdir && !f_type) fts_options |= FTS_COMFOLLOW; -#ifndef BSD4_4_LITE /* * If -W, show whiteout entries */ @@ -250,7 +239,6 @@ main(argc, argv) if (f_whiteout) fts_options |= FTS_WHITEOUT; #endif -#endif /* If -l or -s, figure out block size. */ if (f_longform || f_size) { diff --git a/bin/ls/ls.h b/bin/ls/ls.h index 6e704eb..0a9b16d 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -1,3 +1,4 @@ + /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -33,16 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $Id: ls.h,v 1.5 1997/02/22 14:04:00 peter Exp $ + * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 + * $Id: ls.h,v 1.6 1997/04/29 10:03:05 dfr Exp $ */ #define NO_PRINT 1 -/* - * XXX Until we get kernel support for the undelete(2) system call, - * this define *must* remain in place. - */ -/* #define BSD4_4_LITE */ extern long blocksize; /* block size units */ diff --git a/bin/ls/print.c b/bin/ls/print.c index e0fe3bb..c27a18a 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -33,11 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * from: @(#)print.c 8.4 (Berkeley) 4/17/94"; */ #ifndef lint -static char const sccsid[] = "@(#)print.c 8.4 (Berkeley) 4/17/94"; +static const char rcsid[] = + "$Id: print.c,v 1.12 1997/02/22 14:04:01 peter Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -272,11 +273,9 @@ printtype(mode) case S_IFSOCK: (void)putchar('='); return (1); -#ifndef BSD4_4_LITE case S_IFWHT: (void)putchar('%'); return (1); -#endif } if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) { (void)putchar('*'); diff --git a/bin/ls/stat_flags.c b/bin/ls/stat_flags.c index b1e7062..75becab 100644 --- a/bin/ls/stat_flags.c +++ b/bin/ls/stat_flags.c @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stat_flags.c,v 1.5 1997/02/22 14:04:02 peter Exp $ + * from: @(#)stat_flags.c 8.1 (Berkeley) 5/31/93 */ #ifndef lint -static char const sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93"; +static const char rcsid[] = + "$Id: stat_flags.c,v 1.6 1997/06/02 06:24:50 julian Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/bin/ls/util.c b/bin/ls/util.c index ac4e3de..6c03818 100644 --- a/bin/ls/util.c +++ b/bin/ls/util.c @@ -33,11 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: util.c,v 1.8 1997/02/22 14:04:03 peter Exp $ + * from: @(#)util.c 8.3 (Berkeley) 4/2/94 */ #ifndef lint -static char const sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94"; +static const char rcsid[] = + "$Id: util.c,v 1.9 1997/03/26 17:48:40 obrien Exp $"; #endif /* not lint */ #include <sys/types.h> |