From 559a468aae13aa79431fd99e4f039cabcaa507f4 Mon Sep 17 00:00:00 2001 From: dfr Date: Tue, 29 Apr 1997 10:03:10 +0000 Subject: [PATCH] Enable whiteout code since we now have the lite2 support for them. --- bin/ls/ls.1 | 4 ++-- bin/ls/ls.h | 4 ++-- bin/rm/rm.1 | 4 ++-- bin/rm/rm.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index c3c3b8610110..df4692dabbd1 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $Id: ls.1,v 1.12 1997/03/07 01:58:56 mpp Exp $ +.\" $Id: ls.1,v 1.13 1997/03/26 17:48:37 obrien Exp $ .\" .Dd July 29, 1994 .Dt LS 1 @@ -96,7 +96,7 @@ Recursively list subdirectories encountered. Display complete time information for the file, including month, day, hour, minute, second, and year. .It Fl W -Display whiteouts when scanning directories. (UNIMPLEMENTED) +Display whiteouts when scanning directories. .It Fl a Include directory entries whose names begin with a dot (.). diff --git a/bin/ls/ls.h b/bin/ls/ls.h index d6bbfdaa48f4..6e704ebf5224 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: ls.h,v 1.5 1997/02/22 14:04:00 peter Exp $ */ #define NO_PRINT 1 @@ -42,7 +42,7 @@ * XXX Until we get kernel support for the undelete(2) system call, * this define *must* remain in place. */ -#define BSD4_4_LITE +/* #define BSD4_4_LITE */ extern long blocksize; /* block size units */ diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 55f7851b20dd..9e46471d201a 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $Id: rm.1,v 1.8 1997/04/08 20:27:48 mpp Exp $ +.\" $Id: rm.1,v 1.9 1997/04/09 05:04:43 mpp Exp $ .\" .Dd December 5, 1994 .Dt RM 1 @@ -103,7 +103,7 @@ Equivalent to .It Fl W Attempts to undelete the named files. Currently, this option can only be used to recover -files covered by whiteouts. (UNIMPLEMENTED) +files covered by whiteouts. .El .Pp The diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 40a86dce1490..4a4bbfe0c43c 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rm.c,v 1.14 1997/02/22 14:05:27 peter Exp $ + * $Id: rm.c,v 1.15 1997/03/28 15:24:34 imp Exp $ */ #ifndef lint @@ -59,7 +59,7 @@ static char const sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94"; * XXX Until we get kernel support for the undelete(2) system call, * this define *must* remain in place. */ -#define BSD4_4_LITE +/* #define BSD4_4_LITE */ extern char *flags_to_string __P((u_long, char *));