From 0fe8d5df2c21ce62cea6cfb426965dab019af3c6 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 18 Apr 2001 20:13:13 +0000 Subject: Update temp file handling and use a single function to do all the heavy lifting (most of the heavy lifting stolen from glibc, but reduced a bit). --- libc/stdio/tmpnam.c | 83 +++++++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 50 deletions(-) (limited to 'libc/stdio/tmpnam.c') diff --git a/libc/stdio/tmpnam.c b/libc/stdio/tmpnam.c index 3a3ef67ca..296f67f27 100644 --- a/libc/stdio/tmpnam.c +++ b/libc/stdio/tmpnam.c @@ -1,68 +1,51 @@ -/* vi: set sw=4 ts=4: */ -/* - * tmpnam for uClibc - * - * Copyright (C) 2000 by David Whedon - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License - * for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Modified by Erik Andersen to be reentrant for - * the case when S != NULL... - */ +/* Copyright (C) 1991, 1993, 1996, 1997, 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include #include -#include -#include -#include +extern int __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, + int try_tmpdir); +extern int __gen_tempname (char *tmpl, int openit); static char tmpnam_buffer[L_tmpnam]; +/* Generate a unique filename in P_tmpdir. -/* Generate a unique filename in /tmp */ + This function is *not* thread safe when S == NULL! */ char * tmpnam (char *s) { - int num __attribute__ ((unused)); /* UNINITIALIZED, so we get whatever crap - happens to be in memory, producing (in theory) - pseudo-random tmpname results... */ - int n2; - char buf[L_tmpnam], *ptr; - struct stat statbuf; - unsigned char l, i; - - ptr=s ? s : buf; - - l = snprintf(ptr, L_tmpnam, "%s/tmp.", P_tmpdir); + /* By using two buffers we manage to be thread safe in the case + where S != NULL. */ + char tmpbuf[L_tmpnam]; -again: - n2 = num; - for (i = l ; i < l + 6; i++) { - ptr[i] = '0' + n2 % 10; - n2 /= 10; - } + /* In the following call we use the buffer pointed to by S if + non-NULL although we don't know the size. But we limit the size + to L_tmpnam characters in any case. */ + if (__path_search (s ? : tmpbuf, L_tmpnam, NULL, NULL, 0)) + return NULL; - if (stat (ptr, &statbuf) == 0){ - num++; - goto again; - } + if (__gen_tempname (s ? : tmpbuf, 0)) + return NULL; if (s == NULL) - return (char *) memcpy (tmpnam_buffer, ptr, L_tmpnam); + return (char *) memcpy (tmpnam_buffer, tmpbuf, L_tmpnam); - return ptr; + return s; } -- cgit v1.2.3