summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-18 16:32:33 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-18 16:32:33 -0500
commit3e9e30166f22f8fb0d5664500bb52a00d1a3c6a3 (patch)
tree2d755bf8c35efb02d87fad678f7089ffcf8028ea
parentd5ca067c7bb47081c169ff8b0213c73418f0525e (diff)
downloadmusl-3e9e30166f22f8fb0d5664500bb52a00d1a3c6a3.tar.gz
reformat mkstemp like mkdtemp
this is cleaner and makes it easy to impose a limit on the number of retries later if it seems desirable to do so.
-rw-r--r--src/temp/mkstemp.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/temp/mkstemp.c b/src/temp/mkstemp.c
index 5e8bb934..34642569 100644
--- a/src/temp/mkstemp.c
+++ b/src/temp/mkstemp.c
@@ -12,17 +12,15 @@ char *__mktemp(char *);
int mkstemp(char *template)
{
int fd;
-retry:
- if (!__mktemp(template)) return -1;
- fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600);
- if (fd >= 0) return fd;
- if (errno == EEXIST) {
+ for (;;) {
+ if (!__mktemp(template)) return 0;
+ 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 */
strcpy(template+strlen(template)-6, "XXXXXX");
- goto retry;
}
- return -1;
}
LFS64(mkstemp);