From 7f24a0e64774e6566242f44b0f06ab06607d0c97 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 16:18:56 +1100
Subject:  - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL"
 markers to    after the copyright notices.  Having them at the top next to
 the CVSIDs    guarantees a conflict for each and every sync.

---
 openbsd-compat/strmode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openbsd-compat/strmode.c')

diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c
index ea8d515e3..0dbb23733 100644
--- a/openbsd-compat/strmode.c
+++ b/openbsd-compat/strmode.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
-
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -29,6 +27,8 @@
  * SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
+
 #include "includes.h"
 #ifndef HAVE_STRMODE
 
-- 
cgit v1.2.3


From 09471d8a1f7e46116ba44f0f08c756196dbf6c70 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 10 Nov 2005 16:38:54 +1100
Subject:  - (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 ->
 1.7.    Removal of rcsid, "whiteout" inode type.

---
 ChangeLog                |  4 +++-
 openbsd-compat/strmode.c | 10 +---------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'openbsd-compat/strmode.c')

diff --git a/ChangeLog b/ChangeLog
index 59c06c0fb..5a1be997f 100644
--- 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
@@ -3261,4 +3263,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3964 2005/11/10 05:31:55 dtucker Exp $
+$Id: ChangeLog,v 1.3965 2005/11/10 05:38:54 dtucker Exp $
diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c
index 0dbb23733..4a8161422 100644
--- 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++ = '?';
-- 
cgit v1.2.3