Add our own mkstemp(3) clone which allows the template to contain non-

placeholder characters after the placeholders.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2248 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/libvarnish.h b/varnish-cache/include/libvarnish.h
index cc618fe7ecdbbbf489dca93f99bc6a5f14648da0..70c30cc0613397011b5d0de61d0525f367a4030c 100644 (file)
--- a/varnish-cache/include/libvarnish.h
+++ b/varnish-cache/include/libvarnish.h
@@ -54,7 +54,8 @@ double TIM_real(void);
 /* from libvarnish/version.c */
 void varnish_version(const char *);
 
-/* from libvarnish/assert.c */
+/* from libvarnish/vtmpfile.c */
+int vtmpfile(char *);
 
 /*
  * assert(), AN() and AZ() are static checks that should not happen.

diff --git a/varnish-cache/lib/libvarnish/vtmpfile.c b/varnish-cache/lib/libvarnish/vtmpfile.c
new file mode 100644 (file)
index 0000000..9bbd129
--- /dev/null
+++ b/varnish-cache/lib/libvarnish/vtmpfile.c
@@ -0,0 +1,73 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2007 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Dag-Erling Smørgrav <des@linpro.no>
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $Id$
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "libvarnish.h"
+
+int
+vtmpfile(char *template)
+{
+       char *b, *e, *p;
+       int fd, ran;
+
+       for (b = template; *b != '#'; ++b)
+               /* nothing */ ;
+       if (*b == '\0') {
+               errno = EINVAL;
+               return (-1);
+       }
+       for (e = b; *e == '#'; ++e)
+               /* nothing */ ;
+
+       for (;;) {
+               for (p = b; p < e; ++p) {
+                       ran = random() % 63;
+                       if (ran < 10)
+                               *p = '0' + ran;
+                       else if (ran < 36)
+                               *p = 'A' + ran - 10;
+                       else if (ran < 62)
+                               *p = 'a' + ran - 36;
+                       else
+                               *p = '_';
+               }
+               fd = open(template, O_RDWR|O_CREAT|O_EXCL, 0600);
+               if (fd >= 0)
+                       return (fd);
+               if (errno != EEXIST)
+                       return (-1);
+       }
+       /* not reached */
+}