![]() |
|
Message-Id: <1359839705-25965-1-git-send-email-basile@opensource.dyc.edu> Date: Sat, 2 Feb 2013 16:15:05 -0500 From: "Anthony G. Basile" <basile@...nsource.dyc.edu> To: musl@...ts.openwall.com Cc: "Anthony G. Basile" <blueness@...too.org> Subject: [PATCH] Add support for mkostemp, mkstemps and mkostemps From: "Anthony G. Basile" <blueness@...too.org> Signed-off-by: Anthony G. Basile <blueness@...too.org> --- include/stdlib.h | 6 ++++++ src/temp/__open_tempfile.c | 27 +++++++++++++++++++++++++++ src/temp/__randname.c | 19 +++++++++++++++++++ src/temp/mkostemp.c | 11 +++++++++++ src/temp/mkostemps.c | 11 +++++++++++ src/temp/mkstemp.c | 21 ++------------------- src/temp/mkstemps.c | 12 ++++++++++++ src/temp/mktemp.c | 14 ++++---------- 8 files changed, 92 insertions(+), 29 deletions(-) create mode 100644 src/temp/__open_tempfile.c create mode 100644 src/temp/__randname.c create mode 100644 src/temp/mkostemp.c create mode 100644 src/temp/mkostemps.c create mode 100644 src/temp/mkstemps.c diff --git a/include/stdlib.h b/include/stdlib.h index 671d188..4210f40 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -95,6 +95,9 @@ int posix_memalign (void **, size_t, size_t); int setenv (const char *, const char *, int); int unsetenv (const char *); int mkstemp (char *); +int mkostemp (char *, int); +int mkstemps (char *, int); +int mkostemps (char *, int, int); char *mkdtemp (char *); int getsubopt (char **, char *const *, char **); int rand_r (unsigned *); @@ -150,6 +153,9 @@ char *gcvt(double, int, char *); #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) #define mkstemp64 mkstemp +#define mkostemp64 mkostemp +#define mkstemps64 mkstemps +#define mkostemps64 mkostemps #endif #ifdef __cplusplus diff --git a/src/temp/__open_tempfile.c b/src/temp/__open_tempfile.c new file mode 100644 index 0000000..797d3b3 --- /dev/null +++ b/src/temp/__open_tempfile.c @@ -0,0 +1,27 @@ +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <errno.h> + +char *__randname(char *); + +int __open_tempfile (char *template, int len, int flags) +{ + if (len < 0) return EINVAL; + + size_t l = strlen(template)-len; + if (l < 6 || strncmp(template+l-6, "XXXXXX", 6)) { + errno = EINVAL; + *template = 0; + return -1; + } + + int fd, retries = 100; + while (retries--) { + __randname(template+l-6); + if ((fd = open(template, flags | O_CREAT | O_EXCL, 0600))>=0) + return fd; + if (errno != EEXIST) return -1; + } + return -1; +} diff --git a/src/temp/__randname.c b/src/temp/__randname.c new file mode 100644 index 0000000..0dd5725 --- /dev/null +++ b/src/temp/__randname.c @@ -0,0 +1,19 @@ +#include <string.h> +#include <time.h> +#include <stdint.h> + +/* This assumes that a check for the + template size has alrady been made */ +char *__randname(char *template) +{ + int i; + struct timespec ts; + unsigned long r; + + clock_gettime(CLOCK_REALTIME, &ts); + r = ts.tv_nsec*65537 ^ (uintptr_t)&ts / 16 + (uintptr_t)template; + for (i=0; i<6; i++, r>>=5) + template[i] = 'A'+(r&15)+(r&16)*2; + + return template; +} diff --git a/src/temp/mkostemp.c b/src/temp/mkostemp.c new file mode 100644 index 0000000..92a7bc4 --- /dev/null +++ b/src/temp/mkostemp.c @@ -0,0 +1,11 @@ +#define _GNU_SOURCE +#include "libc.h" + +int __open_tempfile (char *, int, int); + +int __mkostemp(char *template, int flags) +{ + return __open_tempfile (template, 0, flags); +} + +weak_alias(__mkostemp, mkostemp); diff --git a/src/temp/mkostemps.c b/src/temp/mkostemps.c new file mode 100644 index 0000000..6c60323 --- /dev/null +++ b/src/temp/mkostemps.c @@ -0,0 +1,11 @@ +#define _GNU_SOURCE +#include "libc.h" + +int __open_tempfile (char *, int, int); + +int __mkostemps(char *template, int len, int flags) +{ + return __open_tempfile (template, len, flags); +} + +weak_alias(__mkostemps, mkostemps); diff --git a/src/temp/mkstemp.c b/src/temp/mkstemp.c index a390d42..72ab7d1 100644 --- a/src/temp/mkstemp.c +++ b/src/temp/mkstemp.c @@ -1,28 +1,11 @@ -#include <string.h> -#include <stdio.h> -#include <stdlib.h> #include <fcntl.h> -#include <unistd.h> -#include <limits.h> -#include <errno.h> #include "libc.h" -char *__mktemp(char *); +int __open_tempfile (char *, int, int); int mkstemp(char *template) { - int fd, retries = 100, t0 = *template; - while (retries--) { - if (!*__mktemp(template)) return -1; - if ((fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600))>=0) - return fd; - if (errno != EEXIST) return -1; - /* this is safe because mktemp verified - * that we have a valid template string */ - template[0] = t0; - strcpy(template+strlen(template)-6, "XXXXXX"); - } - return -1; + return __open_tempfile (template, 0, O_RDWR); } LFS64(mkstemp); diff --git a/src/temp/mkstemps.c b/src/temp/mkstemps.c new file mode 100644 index 0000000..fcfc010 --- /dev/null +++ b/src/temp/mkstemps.c @@ -0,0 +1,12 @@ +#define _GNU_SOURCE +#include <fcntl.h> +#include "libc.h" + +int __open_tempfile (char *, int, int); + +int __mkstemps(char *template, int len) +{ + return __open_tempfile (template, len, O_RDWR); +} + +weak_alias(__mkstemps, mkstemps); diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c index c0e06f5..ed2c103 100644 --- a/src/temp/mktemp.c +++ b/src/temp/mktemp.c @@ -1,17 +1,14 @@ #include <string.h> -#include <stdio.h> -#include <stdlib.h> #include <fcntl.h> #include <unistd.h> #include <errno.h> -#include <time.h> -#include <stdint.h> #include "libc.h" +char *__randname(char *); + char *__mktemp(char *template) { - struct timespec ts; - size_t i, l = strlen(template); + size_t l = strlen(template); int retries = 10000; unsigned long r; @@ -21,10 +18,7 @@ char *__mktemp(char *template) return template; } while (retries--) { - clock_gettime(CLOCK_REALTIME, &ts); - r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template; - for (i=1; i<=6; i++, r>>=4) - template[l-i] = 'A'+(r&15); + __randname(template+l-6); if (access(template, F_OK) < 0) return template; } *template = 0; -- 1.7.12.4
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.