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/mktemp.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'openbsd-compat/mktemp.c')
-rw-r--r-- | openbsd-compat/mktemp.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c index 969f69580..88e04c520 100644 --- a/openbsd-compat/mktemp.c +++ b/openbsd-compat/mktemp.c | |||
@@ -1,8 +1,7 @@ | |||
1 | /* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */ | ||
2 | |||
3 | /* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */ | 1 | /* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */ |
4 | /* Changes: Removed mktemp */ | 2 | /* Changes: Removed mktemp */ |
5 | 3 | ||
4 | /* $OpenBSD: mktemp.c,v 1.19 2005/08/08 08:05:36 espie Exp $ */ | ||
6 | /* | 5 | /* |
7 | * Copyright (c) 1987, 1993 | 6 | * Copyright (c) 1987, 1993 |
8 | * The Regents of the University of California. All rights reserved. | 7 | * The Regents of the University of California. All rights reserved. |
@@ -32,20 +31,16 @@ | |||
32 | * SUCH DAMAGE. | 31 | * SUCH DAMAGE. |
33 | */ | 32 | */ |
34 | 33 | ||
34 | /* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */ | ||
35 | |||
35 | #include "includes.h" | 36 | #include "includes.h" |
36 | 37 | ||
37 | #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) | 38 | #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) |
38 | 39 | ||
39 | #if defined(LIBC_SCCS) && !defined(lint) | ||
40 | static char rcsid[] = "$OpenBSD: mktemp.c,v 1.17 2003/06/02 20:18:37 millert Exp $"; | ||
41 | #endif /* LIBC_SCCS and not lint */ | ||
42 | |||
43 | static int _gettemp(char *, int *, int, int); | 40 | static int _gettemp(char *, int *, int, int); |
44 | 41 | ||
45 | int | 42 | int |
46 | mkstemps(path, slen) | 43 | mkstemps(char *path, int slen) |
47 | char *path; | ||
48 | int slen; | ||
49 | { | 44 | { |
50 | int fd; | 45 | int fd; |
51 | 46 | ||
@@ -53,8 +48,7 @@ mkstemps(path, slen) | |||
53 | } | 48 | } |
54 | 49 | ||
55 | int | 50 | int |
56 | mkstemp(path) | 51 | mkstemp(char *path) |
57 | char *path; | ||
58 | { | 52 | { |
59 | int fd; | 53 | int fd; |
60 | 54 | ||
@@ -62,8 +56,7 @@ mkstemp(path) | |||
62 | } | 56 | } |
63 | 57 | ||
64 | char * | 58 | char * |
65 | mkdtemp(path) | 59 | mkdtemp(char *path) |
66 | char *path; | ||
67 | { | 60 | { |
68 | return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL); | 61 | return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL); |
69 | } | 62 | } |