summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2005-06-15 17:48:53 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2005-06-15 17:48:53 +0000
commit01646b9cdcdd4e2d13e93d563e39ffbed0385590 (patch)
tree5249fea22285a8094490c670095b248059265cee
parent8afef0dffd6fb6ecca266142e435725e578d4447 (diff)
bye bye whiteouts
-rw-r--r--lib/libc/string/strmode.34
-rw-r--r--lib/libc/string/strmode.c7
-rw-r--r--lib/libc/sys/stat.23
3 files changed, 3 insertions, 11 deletions
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 3a7a4bb3faf..99e6d44fd28 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strmode.3,v 1.12 2005/02/25 03:12:44 cloder Exp $
+.\" $OpenBSD: strmode.3,v 1.13 2005/06/15 17:48:52 millert Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -67,8 +67,6 @@ symbolic link
FIFO
.It s
socket
-.It w
-whiteout
.It \&?
unknown inode type
.El
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index bd78403cb21..eedd65aaf33 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -28,7 +28,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strmode.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strmode.c,v 1.6 2005/06/15 17:48:52 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -65,11 +65,6 @@ strmode(int mode, char *p)
*p++ = 'p';
break;
#endif
-#ifdef S_IFWHT
- case S_IFWHT: /* whiteout */
- *p++ = 'w';
- break;
-#endif
default: /* unknown */
*p++ = '?';
break;
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index bd8a4c6ed31..887109a4744 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: stat.2,v 1.18 2004/04/15 19:52:18 jmc Exp $
+.\" $OpenBSD: stat.2,v 1.19 2005/06/15 17:48:52 millert Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -167,7 +167,6 @@ has the following bits:
#define S_IFREG 0100000 /* regular */
#define S_IFLNK 0120000 /* symbolic link */
#define S_IFSOCK 0140000 /* socket */
-#define S_IFWHT 0160000 /* whiteout */
#define S_ISUID 0004000 /* set-user-ID on execution */
#define S_ISGID 0002000 /* set-group-ID on execution */
#define S_ISVTX 0001000 /* save swapped text even after use */