summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/mktemp.c15
2 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eaa822df..35a5cdc92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
38 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6. 38 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.
39 - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6. 39 - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6.
40 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13. 40 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13.
41 - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19.
41 42
4220051105 4320051105
43 - (djm) OpenBSD CVS Sync 44 - (djm) OpenBSD CVS Sync
@@ -3280,4 +3281,4 @@
3280 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3281 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3281 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3282 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3282 3283
3283$Id: ChangeLog,v 1.3980 2005/11/10 06:33:00 dtucker Exp $ 3284$Id: ChangeLog,v 1.3981 2005/11/10 06:37:02 dtucker Exp $
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 8071aa184..88e04c520 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -1,6 +1,7 @@
1/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */ 1/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
2/* Changes: Removed mktemp */ 2/* Changes: Removed mktemp */
3 3
4/* $OpenBSD: mktemp.c,v 1.19 2005/08/08 08:05:36 espie Exp $ */
4/* 5/*
5 * Copyright (c) 1987, 1993 6 * Copyright (c) 1987, 1993
6 * The Regents of the University of California. All rights reserved. 7 * The Regents of the University of California. All rights reserved.
@@ -36,16 +37,10 @@
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)
40static char rcsid[] = "$OpenBSD: mktemp.c,v 1.17 2003/06/02 20:18:37 millert Exp $";
41#endif /* LIBC_SCCS and not lint */
42
43static int _gettemp(char *, int *, int, int); 40static int _gettemp(char *, int *, int, int);
44 41
45int 42int
46mkstemps(path, slen) 43mkstemps(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
55int 50int
56mkstemp(path) 51mkstemp(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
64char * 58char *
65mkdtemp(path) 59mkdtemp(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}