summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2005-06-15 17:50:29 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2005-06-15 17:50:29 +0000
commit2e26f2497e331e85de88c7a2095c6c29bf4e3a22 (patch)
treefbc49f027a51ea6a5eebb737d11efc13ce3fd3ba /usr.bin
parent01646b9cdcdd4e2d13e93d563e39ffbed0385590 (diff)
bye bye whiteouts
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/stat/stat.16
-rw-r--r--usr.bin/stat/stat.c8
2 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index b8e7dcf2f04..3e6ca25d462 100644
--- a/usr.bin/stat/stat.1
+++ b/usr.bin/stat/stat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: stat.1,v 1.9 2005/04/07 12:18:35 otto Exp $
+.\" $OpenBSD: stat.1,v 1.10 2005/06/15 17:50:28 millert Exp $
.\" $NetBSD: stat.1,v 1.11 2003/05/08 13:07:10 wiz Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -73,8 +73,8 @@ As in
.Xr ls 1 ,
display a slash (/) immediately after each pathname that is a directory, an
asterisk (*) after each that is executable, an at sign (@) after each symbolic
-link, a percent sign (%) after each whiteout, an equal sign (=) after each
-socket, and a vertical bar (|) after each that is a FIFO.
+link, an equal sign (=) after each socket, and a vertical bar (|) after each
+that is a FIFO.
The use of
.Fl F
implies
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index 2869464ac49..89202e1b77e 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stat.c,v 1.10 2005/04/22 09:58:43 otto Exp $ */
+/* $OpenBSD: stat.c,v 1.11 2005/06/15 17:50:28 millert Exp $ */
/* $NetBSD: stat.c,v 1.19 2004/06/20 22:20:16 jmc Exp $ */
/*
@@ -39,7 +39,7 @@
#ifndef lint
static const char rccs_id[] =
- "$OpenBSD: stat.c,v 1.10 2005/04/22 09:58:43 otto Exp $";
+ "$OpenBSD: stat.c,v 1.11 2005/06/15 17:50:28 millert Exp $";
#endif
#include <sys/types.h>
@@ -739,9 +739,6 @@ format1(const struct stat *st,
case S_IFSOCK:
(void)strlcat(sdata, "=", sizeof(smode));
break;
- case S_IFWHT:
- (void)strlcat(sdata, "%", sizeof(smode));
- break;
}
hilo = 0;
} else if (hilo == HIGH_PIECE) {
@@ -753,7 +750,6 @@ format1(const struct stat *st,
case S_IFREG: sdata = "Regular File"; break;
case S_IFLNK: sdata = "Symbolic Link"; break;
case S_IFSOCK: sdata = "Socket"; break;
- case S_IFWHT: sdata = "Whiteout File"; break;
default: sdata = "???"; break;
}
hilo = 0;