- (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7.

   Removal of rcsid, "whiteout" inode type.

diff --git a/ChangeLog b/ChangeLog
index d9790fe8729bdf9530d261404f7fbf7ed6147252..df7e8620713981b54c6c977953a39640945fe513 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
    guarantees a conflict for each and every sync.
  - (dtucker) [openbsd-compat/strlcpy.c] Update from OpenBSD 1.8 -> 1.10.
  - (dtucker) [openbsd-compat/sigact.h] Add "OPENBSD ORIGINAL" marker.
+ - (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7.
+   Removal of rcsid, "whiteout" inode type.
 
 20051105
  - (djm) OpenBSD CVS Sync

diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c
index 0dbb23733a21fbf40a2f8bd8eeaa45b36c046e65..4a816142264a34d87a977a6d0c0c102973194e86 100644 (file)
--- a/openbsd-compat/strmode.c
+++ b/openbsd-compat/strmode.c
@@ -1,3 +1,4 @@
+/*     $OpenBSD: strmode.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,10 +33,6 @@
 #include "includes.h"
 #ifndef HAVE_STRMODE
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strmode.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
@@ -71,11 +68,6 @@ strmode(int mode, char *p)
        case S_IFIFO:                   /* fifo */
                *p++ = 'p';
                break;
-#endif
-#ifdef S_IFWHT
-       case S_IFWHT:                   /* whiteout */
-               *p++ = 'w';
-               break;
 #endif
        default:                        /* unknown */
                *p++ = '?';