- (djm) [openbsd-compat/mktemp.c] forklift upgrade to -current version.
The file was totally rewritten between what we had in tree and -current.
This commit is contained in:
Damien Miller
parent
3a359b3228
commit
4888671343
|
|
@ -4,6 +4,8 @@
|
|||
want this longhand version)
|
||||
- (djm) [openbsd-compat/getgrouplist.c] Remove OpenBSD rcsid marker: the
|
||||
upstream version is YPified and we don't want this
|
||||
- (djm) [openbsd-compat/mktemp.c] forklift upgrade to -current version.
|
||||
The file was totally rewritten between what we had in tree and -current.
|
||||
- OpenBSD CVS Sync
|
||||
- millert@cvs.openbsd.org 2006/05/05 15:27:38
|
||||
[openbsd-compat/strlcpy.c]
|
||||
|
|
|
|||
|
|
@ -1,34 +1,22 @@
|
|||
/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
|
||||
/* Changes: Removed mktemp */
|
||||
|
||||
/* $OpenBSD: mktemp.c,v 1.22 2008/08/21 16:54:44 millert Exp $ */
|
||||
/* $OpenBSD: mktemp.c,v 1.30 2010/03/21 23:09:30 schwarze Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1987, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1996-1998, 2008 Theo de Raadt
|
||||
* Copyright (c) 1997, 2008-2009 Todd C. Miller
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */
|
||||
|
|
@ -37,119 +25,117 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
|
||||
|
||||
static int _gettemp(char *, int *, int, int);
|
||||
#define MKTEMP_NAME 0
|
||||
#define MKTEMP_FILE 1
|
||||
#define MKTEMP_DIR 2
|
||||
|
||||
int
|
||||
mkstemps(char *path, int slen)
|
||||
#define TEMPCHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
|
||||
#define NUM_CHARS (sizeof(TEMPCHARS) - 1)
|
||||
|
||||
static int
|
||||
mktemp_internal(char *path, int slen, int mode)
|
||||
{
|
||||
char *start, *cp, *ep;
|
||||
const char *tempchars = TEMPCHARS;
|
||||
unsigned int r, tries;
|
||||
struct stat sb;
|
||||
size_t len;
|
||||
int fd;
|
||||
|
||||
return (_gettemp(path, &fd, 0, slen) ? fd : -1);
|
||||
len = strlen(path);
|
||||
if (len == 0 || slen >= len) {
|
||||
errno = EINVAL;
|
||||
return(-1);
|
||||
}
|
||||
ep = path + len - slen;
|
||||
|
||||
tries = 1;
|
||||
for (start = ep; start > path && start[-1] == 'X'; start--) {
|
||||
if (tries < INT_MAX / NUM_CHARS)
|
||||
tries *= NUM_CHARS;
|
||||
}
|
||||
tries *= 2;
|
||||
|
||||
do {
|
||||
for (cp = start; cp != ep; cp++) {
|
||||
r = arc4random_uniform(NUM_CHARS);
|
||||
*cp = tempchars[r];
|
||||
}
|
||||
|
||||
switch (mode) {
|
||||
case MKTEMP_NAME:
|
||||
if (lstat(path, &sb) != 0)
|
||||
return(errno == ENOENT ? 0 : -1);
|
||||
break;
|
||||
case MKTEMP_FILE:
|
||||
fd = open(path, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
|
||||
if (fd != -1 || errno != EEXIST)
|
||||
return(fd);
|
||||
break;
|
||||
case MKTEMP_DIR:
|
||||
if (mkdir(path, S_IRUSR|S_IWUSR|S_IXUSR) == 0)
|
||||
return(0);
|
||||
if (errno != EEXIST)
|
||||
return(-1);
|
||||
break;
|
||||
}
|
||||
} while (--tries);
|
||||
|
||||
errno = EEXIST;
|
||||
return(-1);
|
||||
}
|
||||
|
||||
#if 0
|
||||
char *_mktemp(char *);
|
||||
|
||||
char *
|
||||
_mktemp(char *path)
|
||||
{
|
||||
if (mktemp_internal(path, 0, MKTEMP_NAME) == -1)
|
||||
return(NULL);
|
||||
return(path);
|
||||
}
|
||||
|
||||
__warn_references(mktemp,
|
||||
"warning: mktemp() possibly used unsafely; consider using mkstemp()");
|
||||
|
||||
char *
|
||||
mktemp(char *path)
|
||||
{
|
||||
return(_mktemp(path));
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
mkstemp(char *path)
|
||||
{
|
||||
int fd;
|
||||
return(mktemp_internal(path, 0, MKTEMP_FILE));
|
||||
}
|
||||
|
||||
return (_gettemp(path, &fd, 0, 0) ? fd : -1);
|
||||
int
|
||||
mkstemps(char *path, int slen)
|
||||
{
|
||||
return(mktemp_internal(path, slen, MKTEMP_FILE));
|
||||
}
|
||||
|
||||
char *
|
||||
mkdtemp(char *path)
|
||||
{
|
||||
return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL);
|
||||
}
|
||||
int error;
|
||||
|
||||
static int
|
||||
_gettemp(path, doopen, domkdir, slen)
|
||||
char *path;
|
||||
register int *doopen;
|
||||
int domkdir;
|
||||
int slen;
|
||||
{
|
||||
register char *start, *trv, *suffp;
|
||||
struct stat sbuf;
|
||||
int rval;
|
||||
pid_t pid;
|
||||
|
||||
if (doopen && domkdir) {
|
||||
errno = EINVAL;
|
||||
return(0);
|
||||
}
|
||||
|
||||
for (trv = path; *trv; ++trv)
|
||||
;
|
||||
trv -= slen;
|
||||
suffp = trv;
|
||||
--trv;
|
||||
if (trv < path) {
|
||||
errno = EINVAL;
|
||||
return (0);
|
||||
}
|
||||
pid = getpid();
|
||||
while (trv >= path && *trv == 'X' && pid != 0) {
|
||||
*trv-- = (pid % 10) + '0';
|
||||
pid /= 10;
|
||||
}
|
||||
while (trv >= path && *trv == 'X') {
|
||||
char c;
|
||||
|
||||
pid = arc4random_uniform(26+26);
|
||||
if (pid < 26)
|
||||
c = pid + 'A';
|
||||
else
|
||||
c = (pid - 26) + 'a';
|
||||
*trv-- = c;
|
||||
}
|
||||
start = trv + 1;
|
||||
|
||||
for (;;) {
|
||||
if (doopen) {
|
||||
if ((*doopen =
|
||||
open(path, O_CREAT|O_EXCL|O_RDWR, 0600)) >= 0)
|
||||
return(1);
|
||||
if (errno != EEXIST)
|
||||
return(0);
|
||||
} else if (domkdir) {
|
||||
if (mkdir(path, 0700) == 0)
|
||||
return(1);
|
||||
if (errno != EEXIST)
|
||||
return(0);
|
||||
} else if (lstat(path, &sbuf))
|
||||
return(errno == ENOENT ? 1 : 0);
|
||||
|
||||
/* tricky little algorithm for backward compatibility */
|
||||
for (trv = start;;) {
|
||||
if (!*trv)
|
||||
return (0);
|
||||
if (*trv == 'Z') {
|
||||
if (trv == suffp)
|
||||
return (0);
|
||||
*trv++ = 'a';
|
||||
} else {
|
||||
if (isdigit(*trv))
|
||||
*trv = 'a';
|
||||
else if (*trv == 'z') /* inc from z to A */
|
||||
*trv = 'A';
|
||||
else {
|
||||
if (trv == suffp)
|
||||
return (0);
|
||||
++*trv;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
/*NOTREACHED*/
|
||||
error = mktemp_internal(path, 0, MKTEMP_DIR);
|
||||
return(error ? NULL : path);
|
||||
}
|
||||
|
||||
#endif /* !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) */
|
||||
|
|
|
|||
Loading…
Reference in New Issue