summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-04-18 20:13:13 +0000
committerEric Andersen <andersen@codepoet.org>2001-04-18 20:13:13 +0000
commit0fe8d5df2c21ce62cea6cfb426965dab019af3c6 (patch)
treeb302e7a7c3ff8d393183b64a4f44018e664de881 /libc
parent7b6a9548ee32cb45913384fd321f53f46fcd1d3d (diff)
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).
Diffstat (limited to 'libc')
-rw-r--r--libc/misc/internals/Makefile2
-rw-r--r--libc/misc/internals/tempname.c187
-rw-r--r--libc/stdio/Makefile2
-rw-r--r--libc/stdio/tmpfile.c51
-rw-r--r--libc/stdio/tmpnam.c83
-rw-r--r--libc/stdio/tmpnam_r.c67
-rw-r--r--libc/stdlib/mkstemp.c61
-rw-r--r--libc/stdlib/mktemp.c61
8 files changed, 355 insertions, 159 deletions
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index 2f0496d9a..b5d23f734 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -24,7 +24,7 @@ TOPDIR=../../
include $(TOPDIR)Rules.mak
LIBC=$(TOPDIR)libc.a
-CSRC=ultostr.c ltostr.c __uClibc_main.c
+CSRC=ultostr.c ltostr.c __uClibc_main.c tempname.c
ifeq ($(HAS_FLOATS),true)
CSRC += dtostr.c zoicheck.c
endif
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
new file mode 100644
index 000000000..3c43f9b85
--- /dev/null
+++ b/libc/misc/internals/tempname.c
@@ -0,0 +1,187 @@
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99 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 <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+/* Return nonzero if DIR is an existent directory. */
+static int direxists (const char *dir)
+{
+ struct stat buf;
+ return stat(dir, &buf) == 0 && S_ISDIR (buf.st_mode);
+}
+
+/* Path search algorithm, for tmpnam, tmpfile, etc. If DIR is
+ non-null and exists, uses it; otherwise uses the first of $TMPDIR,
+ P_tmpdir, /tmp that exists. Copies into TMPL a template suitable
+ for use with mk[s]temp. Will fail (-1) if DIR is non-null and
+ doesn't exist, none of the searched dirs exists, or there's not
+ enough space in TMPL. */
+int __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+ int try_tmpdir)
+{
+ //const char *d;
+ size_t dlen, plen;
+
+ if (!pfx || !pfx[0])
+ {
+ pfx = "file";
+ plen = 4;
+ }
+ else
+ {
+ plen = strlen (pfx);
+ if (plen > 5)
+ plen = 5;
+ }
+
+#if 0
+ if (try_tmpdir)
+ {
+ d = __secure_getenv ("TMPDIR");
+ if (d != NULL && direxists (d))
+ dir = d;
+ else if (dir != NULL && direxists (dir))
+ /* nothing */ ;
+ else
+ dir = NULL;
+ }
+#endif
+ if (dir == NULL)
+ {
+ if (direxists (P_tmpdir))
+ dir = P_tmpdir;
+ else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+ dir = "/tmp";
+ else
+ {
+ __set_errno (ENOENT);
+ return -1;
+ }
+ }
+
+ dlen = strlen (dir);
+ while (dlen > 1 && dir[dlen - 1] == '/')
+ dlen--; /* remove trailing slashes */
+
+ /* check we have room for "${dir}/${pfx}XXXXXX\0" */
+ if (tmpl_len < dlen + 1 + plen + 6 + 1)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+ return 0;
+}
+
+/* These are the characters used in temporary filenames. */
+static const char letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+/* Generate a temporary file name based on TMPL. TMPL must match the
+ rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed
+ does not exist at the time of the call to __gen_tempname. TMPL is
+ overwritten with the result. If OPENIT is nonzero, creates the
+ file and returns a read-write fd; the file is mode 0600 modulo
+ umask. If LARGEFILE is nonzero, uses open64() instead of open().
+
+ We use a clever algorithm to get hard-to-predict names. */
+int __gen_tempname (char *tmpl, int openit)
+{
+ int len;
+ char *XXXXXX;
+ static uint64_t value;
+ struct timeval tv;
+ int count, fd;
+ int save_errno = errno;
+
+ len = strlen (tmpl);
+ if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ /* This is where the Xs start. */
+ XXXXXX = &tmpl[len - 6];
+
+ /* Get some more or less random data. */
+ gettimeofday (&tv, NULL);
+ value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+
+ for (count = 0; count < TMP_MAX; value += 7777, ++count)
+ {
+ uint64_t v = value;
+
+ /* Fill in the random bits. */
+ XXXXXX[0] = letters[v % 62];
+ v /= 62;
+ XXXXXX[1] = letters[v % 62];
+ v /= 62;
+ XXXXXX[2] = letters[v % 62];
+ v /= 62;
+ XXXXXX[3] = letters[v % 62];
+ v /= 62;
+ XXXXXX[4] = letters[v % 62];
+ v /= 62;
+ XXXXXX[5] = letters[v % 62];
+
+ if (openit)
+ {
+ fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, 0600);
+ if (fd >= 0)
+ {
+ __set_errno (save_errno);
+ return fd;
+ }
+ else if (errno != EEXIST)
+ /* Any other error will apply also to other names we might
+ try, and there are 2^32 or so of them, so give up now. */
+ return -1;
+ }
+ else
+ {
+ struct stat st;
+ if (stat (tmpl, &st) < 0)
+ {
+ if (errno == ENOENT)
+ {
+ __set_errno (save_errno);
+ return 0;
+ }
+ else
+ /* Give up now. */
+ return -1;
+ }
+ }
+ }
+
+ /* We got out of the loop because we ran out of combinations to try. */
+ __set_errno (EEXIST);
+ return -1;
+}
diff --git a/libc/stdio/Makefile b/libc/stdio/Makefile
index 26ab9cfcc..3aec83dd1 100644
--- a/libc/stdio/Makefile
+++ b/libc/stdio/Makefile
@@ -41,7 +41,7 @@ MOBJ2=printf.o sprintf.o fprintf.o vprintf.o vsprintf.o vfprintf.o snprintf.o \
MSRC3=scanf.c
MOBJ3=scanf.o sscanf.o fscanf.o vscanf.o vsscanf.o vfscanf.o
-CSRC=popen.c perror.c remove.c getdelim.c getline.c tmpnam.c tmpnam_r.c
+CSRC=popen.c perror.c remove.c getdelim.c getline.c tmpfile.c tmpnam.c tmpnam_r.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS)
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
new file mode 100644
index 000000000..8c11d2ff7
--- /dev/null
+++ b/libc/stdio/tmpfile.c
@@ -0,0 +1,51 @@
+/* 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 <stdio.h>
+#include <unistd.h>
+
+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);
+
+/* This returns a new stream opened on a temporary file (generated
+ by tmpnam). The file is opened with mode "w+b" (binary read/write).
+ If we couldn't generate a unique filename or the file couldn't
+ be opened, NULL is returned. */
+FILE * tmpfile (void)
+{
+ char buf[FILENAME_MAX];
+ int fd;
+ FILE *f;
+
+ if (__path_search (buf, FILENAME_MAX, NULL, "tmpf", 0))
+ return NULL;
+ fd = __gen_tempname (buf, 1);
+ if (fd < 0)
+ return NULL;
+
+ /* Note that this relies on the Unix semantics that
+ a file is not really removed until it is closed. */
+ (void) remove (buf);
+
+ if ((f = fdopen (fd, "w+b")) == NULL)
+ close (fd);
+
+ return f;
+}
+
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 <dwhedon@gordian.com>
- *
- * 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 <anderse@debian.org> 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 <stdio.h>
#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+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;
}
diff --git a/libc/stdio/tmpnam_r.c b/libc/stdio/tmpnam_r.c
index 5533a399f..630d96eb3 100644
--- a/libc/stdio/tmpnam_r.c
+++ b/libc/stdio/tmpnam_r.c
@@ -1,43 +1,38 @@
-/* vi: set sw=4 ts=4: */
-/*
- * tmpnam for uClibc
- *
- * Copyright (C) 2000 by Lineo, inc. Written by Erik Andersen
- * <andersen@lineo.com>, <andersee@debian.org>
- *
- * 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 <anderse@debian.org> 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.
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+ 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 <stdio.h>
-/* Generate a unique filename in /tmp.
- * If s is NULL return NULL, making this function thread safe. */
+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);
+/* Generate a unique filename in P_tmpdir. If S is NULL return NULL.
+ This makes this function thread safe. */
char * tmpnam_r (char *s)
{
- if (s == NULL)
- return NULL;
- else
- return (tmpnam(s));
-}
+ if (s == NULL)
+ return NULL;
+
+ if (__path_search (s, L_tmpnam, NULL, NULL, 0))
+ return NULL;
+ if (__gen_tempname (s, 0))
+ return NULL;
+ return s;
+}
diff --git a/libc/stdlib/mkstemp.c b/libc/stdlib/mkstemp.c
index 241f8af8a..d0104c8f3 100644
--- a/libc/stdlib/mkstemp.c
+++ b/libc/stdlib/mkstemp.c
@@ -1,44 +1,31 @@
-#include <string.h>
-#include <features.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-int mkstemp(template)
-char *template;
-{
- int i;
- int num __attribute__ ((unused)); /* UNINITIALIZED */
- int n2;
- int l = strlen(template);
-
- if (l < 6) {
- __set_errno(EINVAL);
- return -1;
- }
+ 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.
- for (i = l - 6; i < l; i++)
- if (template[i] != 'X') {
- __set_errno(EINVAL);
- return -1;
- }
+ 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.
- again:
- n2 = num;
- for (i = l - 1; i >= l - 6; i--) {
- template[i] = '0' + n2 % 10;
- n2 /= 10;
- }
+ 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. */
- i = open(template, O_RDWR | O_EXCL | O_CREAT, 0666);
+#include <stdio.h>
+#include <stdlib.h>
- if (i == -1) {
- if (errno == EEXIST) {
- num++;
- goto again;
- } else
- return -1;
- }
+extern int __gen_tempname (char *tmpl, int openit);
- return i;
+/* Generate a unique temporary file name from TEMPLATE.
+ The last six characters of TEMPLATE must be "XXXXXX";
+ they are replaced with a string that makes the filename unique.
+ Then open the file and return a fd. */
+int mkstemp (char *template)
+{
+ return __gen_tempname (template, 1);
}
diff --git a/libc/stdlib/mktemp.c b/libc/stdlib/mktemp.c
index 9d65d0441..432d64f2a 100644
--- a/libc/stdlib/mktemp.c
+++ b/libc/stdlib/mktemp.c
@@ -1,41 +1,34 @@
-#include <string.h>
-#include <features.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-char *mktemp(template)
-char *template;
-{
- int i;
- int num __attribute__ ((unused)); /* UNINITIALIZED */
- int n2;
- int l = strlen(template);
- struct stat stbuf;
+ 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.
- if (l < 6) {
- __set_errno(EINVAL);
- return 0;
- }
+ 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. */
- for (i = l - 6; i < l; i++)
- if (template[i] != 'X') {
- __set_errno(EINVAL);
- return 0;
- }
+#include <stdio.h>
+#include <stdlib.h>
- again:
- n2 = num;
- for (i = l - 1; i >= l - 6; i--) {
- template[i] = '0' + n2 % 10;
- n2 /= 10;
- }
+extern int __gen_tempname (char *tmpl, int openit);
- if (stat(template, &stbuf) == 0) {
- num++;
- goto again;
- }
+/* Generate a unique temporary file name from TEMPLATE.
+ The last six characters of TEMPLATE must be "XXXXXX";
+ they are replaced with a string that makes the filename unique. */
+char * mktemp (char *template)
+{
+ if (__gen_tempname (template, 0) < 0)
+ /* We return the null string if we can't find a unique file name. */
+ template[0] = '\0';
- return template;
+ return template;
}