diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /openbsd-compat/strmode.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'openbsd-compat/strmode.c')
-rw-r--r-- | openbsd-compat/strmode.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c index ea8d515e3..4a8161422 100644 --- a/openbsd-compat/strmode.c +++ b/openbsd-compat/strmode.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* OPENBSD ORIGINAL: lib/libc/string/strmode.c */ | 1 | /* $OpenBSD: strmode.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */ |
2 | |||
3 | /*- | 2 | /*- |
4 | * Copyright (c) 1990 The Regents of the University of California. | 3 | * Copyright (c) 1990 The Regents of the University of California. |
5 | * All rights reserved. | 4 | * All rights reserved. |
@@ -29,13 +28,11 @@ | |||
29 | * SUCH DAMAGE. | 28 | * SUCH DAMAGE. |
30 | */ | 29 | */ |
31 | 30 | ||
31 | /* OPENBSD ORIGINAL: lib/libc/string/strmode.c */ | ||
32 | |||
32 | #include "includes.h" | 33 | #include "includes.h" |
33 | #ifndef HAVE_STRMODE | 34 | #ifndef HAVE_STRMODE |
34 | 35 | ||
35 | #if defined(LIBC_SCCS) && !defined(lint) | ||
36 | static char *rcsid = "$OpenBSD: strmode.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $"; | ||
37 | #endif /* LIBC_SCCS and not lint */ | ||
38 | |||
39 | #include <sys/types.h> | 36 | #include <sys/types.h> |
40 | #include <sys/stat.h> | 37 | #include <sys/stat.h> |
41 | #include <string.h> | 38 | #include <string.h> |
@@ -72,11 +69,6 @@ strmode(int mode, char *p) | |||
72 | *p++ = 'p'; | 69 | *p++ = 'p'; |
73 | break; | 70 | break; |
74 | #endif | 71 | #endif |
75 | #ifdef S_IFWHT | ||
76 | case S_IFWHT: /* whiteout */ | ||
77 | *p++ = 'w'; | ||
78 | break; | ||
79 | #endif | ||
80 | default: /* unknown */ | 72 | default: /* unknown */ |
81 | *p++ = '?'; | 73 | *p++ = '?'; |
82 | break; | 74 | break; |