diff --git a/docs/licenses/mpl.txt b/docs/licenses/mpl.txt
new file mode 100644
index 000000000..14e2f777f
--- /dev/null
+++ b/docs/licenses/mpl.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/src/tmpfileplus.c b/src/tmpfileplus.c
new file mode 100644
index 000000000..9af0260b3
--- /dev/null
+++ b/src/tmpfileplus.c
@@ -0,0 +1,337 @@
+/* $Id: tmpfileplus.c $ */
+/*
+ * $Date: 2016-06-01 03:31Z $
+ * $Revision: 2.0.0 $
+ * $Author: dai $
+ */
+
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2012-16 David Ireland, DI Management Services Pty Ltd
+ * .
+ */
+
+
+/*
+* NAME
+* tmpfileplus - create a unique temporary file
+*
+* SYNOPSIS
+* FILE *tmpfileplus(const char *dir, const char *prefix, char **pathname, int keep)
+*
+* DESCRIPTION
+* The tmpfileplus() function opens a unique temporary file in binary
+* read/write (w+b) mode. The file is opened with the O_EXCL flag,
+* guaranteeing that the caller is the only user. The filename will consist
+* of the string given by `prefix` followed by 10 random characters. If
+* `prefix` is NULL, then the string "tmp." will be used instead. The file
+* will be created in an appropriate directory chosen by the first
+* successful attempt in the following sequence:
+*
+* a) The directory given by the `dir` argument (so the caller can specify
+* a secure directory to take precedence).
+*
+* b) The directory name in the environment variables:
+*
+* (i) "TMP" [Windows only]
+* (ii) "TEMP" [Windows only]
+* (iii) "TMPDIR" [Unix only]
+*
+* c) `P_tmpdir` as defined in [Unix only] (in Windows, this is
+* usually "\", which is no good).
+*
+* d) The current working directory.
+*
+* If a file cannot be created in any of the above directories, then the
+* function fails and NULL is returned.
+*
+* If the argument `pathname` is not a null pointer, then it will point to
+* the full pathname of the file. The pathname is allocated using `malloc`
+* and therefore should be freed by `free`.
+*
+* If `keep` is nonzero and `pathname` is not a null pointer, then the file
+* will be kept after it is closed. Otherwise the file will be
+* automatically deleted when it is closed or the program terminates.
+*
+*
+* RETURN VALUE
+* The tmpfileplus() function returns a pointer to the open file stream,
+* or NULL if a unique file cannot be opened.
+*
+*
+* ERRORS
+* ENOMEM Not enough memory to allocate filename.
+*
+*/
+
+/* ADDED IN v2.0 */
+
+/*
+* NAME
+* tmpfileplus_f - create a unique temporary file with filename stored in a fixed-length buffer
+*
+* SYNOPSIS
+* FILE *tmpfileplus_f(const char *dir, const char *prefix, char *pathnamebuf, size_t pathsize, int keep);
+*
+* DESCRIPTION
+* Same as tmpfileplus() except receives filename in a fixed-length buffer. No allocated memory to free.
+
+* ERRORS
+* E2BIG Resulting filename is too big for the buffer `pathnamebuf`.
+
+*/
+
+#include "tmpfileplus.h"
+
+#include
+#include
+#include
+#include
+#include
+
+/* Non-ANSI include files that seem to work in both MSVC and Linux */
+#include
+#include
+#include
+
+#ifdef _WIN32
+#include
+#endif
+
+#ifdef _WIN32
+/* MSVC nags to enforce ISO C++ conformant function names with leading "_",
+ * so we define our own function names to avoid whingeing compilers...
+ */
+#define OPEN_ _open
+#define FDOPEN_ _fdopen
+#else
+#define OPEN_ open
+#define FDOPEN_ fdopen
+#endif
+
+
+/* DEBUGGING STUFF */
+#if defined(_DEBUG) && defined(SHOW_DPRINTF)
+#define DPRINTF1(s, a1) printf(s, a1)
+#else
+#define DPRINTF1(s, a1)
+#endif
+
+
+#ifdef _WIN32
+#define FILE_SEPARATOR "\\"
+#else
+#define FILE_SEPARATOR "/"
+#endif
+
+#define RANDCHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+#define NRANDCHARS (sizeof(RANDCHARS) - 1)
+
+/** Replace each byte in string s with a random character from TEMPCHARS */
+static char *set_randpart(char *s)
+{
+ size_t i;
+ unsigned int r;
+ static unsigned int seed; /* NB static */
+
+ if (seed == 0)
+ { /* First time set our seed using current time and clock */
+ seed = ((unsigned)time(NULL)<<8) ^ (unsigned)clock();
+ }
+ srand(seed++);
+ for (i = 0; i < strlen(s); i++)
+ {
+ r = rand() % NRANDCHARS;
+ s[i] = (RANDCHARS)[r];
+ }
+ return s;
+}
+
+/** Return 1 if path is a valid directory otherwise 0 */
+static int is_valid_dir(const char *path)
+{
+ struct stat st;
+ if ((stat(path, &st) == 0) && (st.st_mode & S_IFDIR))
+ return 1;
+
+ return 0;
+}
+
+/** Call getenv and save a copy in buf */
+static char *getenv_save(const char *varname, char *buf, size_t bufsize)
+{
+ char *ptr = getenv(varname);
+ buf[0] = '\0';
+ if (ptr)
+ {
+ strncpy(buf, ptr, bufsize);
+ buf[bufsize-1] = '\0';
+ return buf;
+ }
+ return NULL;
+}
+
+/**
+ * Try and create a randomly-named file in directory `tmpdir`.
+ * If successful, allocate memory and set `tmpname_ptr` to full filepath, and return file pointer;
+ * otherwise return NULL.
+ * If `keep` is zero then create the file as temporary and it should not exist once closed.
+ */
+static FILE *mktempfile_internal(const char *tmpdir, const char *pfx, char **tmpname_ptr, int keep)
+/* PRE:
+ * pfx is not NULL and points to a valid null-terminated string
+ * tmpname_ptr is not NULL.
+ */
+{
+ FILE *fp;
+ int fd;
+ char randpart[] = "1234567890";
+ size_t lentempname;
+ int i;
+ char *tmpname = NULL;
+ int oflag, pmode;
+
+/* In Windows, we use the _O_TEMPORARY flag with `open` to ensure the file is deleted when closed.
+ * In Unix, we use the unlink function after opening the file. (This does not work in Windows,
+ * which does not allow an open file to be unlinked.)
+ */
+#ifdef _WIN32
+ /* MSVC flags */
+ oflag = _O_BINARY|_O_CREAT|_O_EXCL|_O_RDWR;
+ if (!keep)
+ oflag |= _O_TEMPORARY;
+ pmode = _S_IREAD | _S_IWRITE;
+#else
+ /* Standard POSIX flags */
+ oflag = O_CREAT|O_EXCL|O_RDWR;
+ pmode = S_IRUSR|S_IWUSR;
+#endif
+
+ if (!tmpdir || !is_valid_dir(tmpdir)) {
+ errno = ENOENT;
+ return NULL;
+ }
+
+ lentempname = strlen(tmpdir) + strlen(FILE_SEPARATOR) + strlen(pfx) + strlen(randpart);
+ DPRINTF1("lentempname=%d\n", lentempname);
+ tmpname = malloc(lentempname + 1);
+ if (!tmpname)
+ {
+ errno = ENOMEM;
+ return NULL;
+ }
+ /* If we don't manage to create a file after 10 goes, there is something wrong... */
+ for (i = 0; i < 10; i++)
+ {
+ sprintf(tmpname, "%s%s%s%s", tmpdir, FILE_SEPARATOR, pfx, set_randpart(randpart));
+ DPRINTF1("[%s]\n", tmpname);
+ fd = OPEN_(tmpname, oflag, pmode);
+ if (fd != -1) break;
+ }
+ DPRINTF1("strlen(tmpname)=%d\n", strlen(tmpname));
+ if (fd != -1)
+ { /* Success, so return user a proper ANSI C file pointer */
+ fp = FDOPEN_(fd, "w+b");
+ errno = 0;
+
+#ifndef _WIN32
+ /* [Unix only] And make sure the file will be deleted once closed */
+ if (!keep) unlink(tmpname);
+#endif
+
+ }
+ else
+ { /* We failed */
+ fp = NULL;
+ }
+ if (!fp)
+ {
+ free(tmpname);
+ tmpname = NULL;
+ }
+
+ *tmpname_ptr = tmpname;
+ return fp;
+}
+
+/**********************/
+/* EXPORTED FUNCTIONS */
+/**********************/
+
+FILE *tmpfileplus(const char *dir, const char *prefix, char **pathname, int keep)
+{
+ FILE *fp = NULL;
+ char *tmpname = NULL;
+ char *tmpdir = NULL;
+ const char *pfx = (prefix ? prefix : "tmp.");
+ char *tempdirs[12] = { 0 };
+ char env1[FILENAME_MAX+1] = { 0 };
+ char env2[FILENAME_MAX+1] = { 0 };
+ char env3[FILENAME_MAX+1] = { 0 };
+ int ntempdirs = 0;
+ int i;
+
+ /* Set up a list of temp directories we will try in order */
+ i = 0;
+ tempdirs[i++] = (char *)dir;
+#ifdef _WIN32
+ tempdirs[i++] = getenv_save("TMP", env1, sizeof(env1));
+ tempdirs[i++] = getenv_save("TEMP", env2, sizeof(env2));
+#else
+ tempdirs[i++] = getenv_save("TMPDIR", env3, sizeof(env3));
+ tempdirs[i++] = P_tmpdir;
+#endif
+ tempdirs[i++] = ".";
+ ntempdirs = i;
+
+ errno = 0;
+
+ /* Work through list we set up before, and break once we are successful */
+ for (i = 0; i < ntempdirs; i++)
+ {
+ tmpdir = tempdirs[i];
+ DPRINTF1("Trying tmpdir=[%s]\n", tmpdir);
+ fp = mktempfile_internal(tmpdir, pfx, &tmpname, keep);
+ if (fp) break;
+ }
+ /* If we succeeded and the user passed a pointer, set it to the alloc'd pathname: the user must free this */
+ if (fp && pathname)
+ *pathname = tmpname;
+ else /* Otherwise, free the alloc'd memory */
+ free(tmpname);
+
+ return fp;
+}
+
+/* Same as tmpfileplus() but with fixed length buffer for output filename and no memory allocation */
+FILE *tmpfileplus_f(const char *dir, const char *prefix, char *pathnamebuf, size_t pathsize, int keep)
+{
+ char *tmpbuf = NULL;
+ FILE *fp;
+
+ /* If no buffer provided, do the normal way */
+ if (!pathnamebuf || (int)pathsize <= 0) {
+ return tmpfileplus(dir, prefix, NULL, keep);
+ }
+ /* Call with a temporary buffer */
+ fp = tmpfileplus(dir, prefix, &tmpbuf, keep);
+ if (fp && strlen(tmpbuf) > pathsize - 1) {
+ /* Succeeded but not enough room in output buffer, so clean up and return an error */
+ pathnamebuf[0] = 0;
+ fclose(fp);
+ if (keep) remove(tmpbuf);
+ free(tmpbuf);
+ errno = E2BIG;
+ return NULL;
+ }
+ /* Copy name into buffer */
+ strcpy(pathnamebuf, tmpbuf);
+ free(tmpbuf);
+
+ return fp;
+}
+
+
diff --git a/src/tmpfileplus.h b/src/tmpfileplus.h
new file mode 100644
index 000000000..6c6ac38a7
--- /dev/null
+++ b/src/tmpfileplus.h
@@ -0,0 +1,53 @@
+/* $Id: tmpfileplus.h $ */
+/*
+ * $Date: 2016-06-01 03:31Z $
+ * $Revision: 2.0.0 $
+ * $Author: dai $
+ */
+
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2012-16 David Ireland, DI Management Services Pty Ltd
+ * .
+ */
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef TMPFILEPLUS_H_
+#define TMPFILEPLUS_H_
+
+#include
+
+/** Create a unique temporary file.
+@param dir (optional) directory to create file. If NULL use default TMP directory.
+@param prefix (optional) prefix for file name. If NULL use "tmp.".
+@param pathname (optional) pointer to a buffer to receive the temp filename.
+ Allocated using `malloc()`; user to free. Ignored if NULL.
+@param keep If `keep` is nonzero and `pathname` is not NULL, then keep the file after closing.
+ Otherwise file is automatically deleted when closed.
+@return Pointer to stream opened in binary read/write (w+b) mode, or a null pointer on error.
+@exception ENOMEM Not enough memory to allocate filename.
+*/
+FILE *tmpfileplus(const char *dir, const char *prefix, char **pathname, int keep);
+
+
+/** Create a unique temporary file with filename stored in a fixed-length buffer.
+@param dir (optional) directory to create file. If NULL use default directory.
+@param prefix (optional) prefix for file name. If NULL use "tmp.".
+@param pathnamebuf (optional) buffer to receive full pathname of temporary file. Ignored if NULL.
+@param pathsize Size of buffer to receive filename and its terminating null character.
+@param keep If `keep` is nonzero and `pathname` is not NULL, then keep the file after closing.
+ Otherwise file is automatically deleted when closed.
+@return Pointer to stream opened in binary read/write (w+b) mode, or a null pointer on error.
+@exception E2BIG Resulting filename is too big for the buffer `pathnamebuf`.
+*/
+FILE *tmpfileplus_f(const char *dir, const char *prefix, char *pathnamebuf, size_t pathsize, int keep);
+
+#define TMPFILE_KEEP 1
+
+#endif /* end TMPFILEPLUS_H_ */