- (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19.

This commit is contained in:
Darren Tucker 2005-11-10 17:37:02 +11:00
parent 8f0d8f8ea2
commit ffcd0ecf6b
2 changed files with 6 additions and 12 deletions
ChangeLog
openbsd-compat

View File

@ -38,6 +38,7 @@
- (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6. - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.
- (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6. - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6.
- (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13. - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13.
- (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19.
20051105 20051105
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -3280,4 +3281,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3980 2005/11/10 06:33:00 dtucker Exp $ $Id: ChangeLog,v 1.3981 2005/11/10 06:37:02 dtucker Exp $

View File

@ -1,6 +1,7 @@
/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */ /* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
/* Changes: Removed mktemp */ /* Changes: Removed mktemp */
/* $OpenBSD: mktemp.c,v 1.19 2005/08/08 08:05:36 espie Exp $ */
/* /*
* Copyright (c) 1987, 1993 * Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -36,16 +37,10 @@
#if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
#if defined(LIBC_SCCS) && !defined(lint)
static char rcsid[] = "$OpenBSD: mktemp.c,v 1.17 2003/06/02 20:18:37 millert Exp $";
#endif /* LIBC_SCCS and not lint */
static int _gettemp(char *, int *, int, int); static int _gettemp(char *, int *, int, int);
int int
mkstemps(path, slen) mkstemps(char *path, int slen)
char *path;
int slen;
{ {
int fd; int fd;
@ -53,8 +48,7 @@ mkstemps(path, slen)
} }
int int
mkstemp(path) mkstemp(char *path)
char *path;
{ {
int fd; int fd;
@ -62,8 +56,7 @@ mkstemp(path)
} }
char * char *
mkdtemp(path) mkdtemp(char *path)
char *path;
{ {
return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL); return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL);
} }