--- libaitsync/src/tool.c	2010/03/24 16:00:15	1.1
+++ libaitsync/src/tool.c	2013/05/30 09:23:51	1.4.4.1
@@ -3,22 +3,61 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tool.c,v 1.1 2010/03/24 16:00:15 misho Exp $
+* $Id: tool.c,v 1.4.4.1 2013/05/30 09:23:51 misho Exp $
 *
-*************************************************************************/
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+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.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET 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 THE REGENTS 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.
+*/
 #include "global.h"
 #include "tool.h"
 
 
 /*
- * sync_mksig() Make signature from chunk
+ * sync_mksig() - Make signature from chunk
+ *
  * @id = chunk id
  * @off = file offset
  * @buf = chunk buffer for calculate signature
  * @buflen = buffer length in bytes
  * @sc = Chunk structure for fill
 */
-inline void sync_mksig(int id, off_t off, u_char * __restrict buf, int buflen, sync_chunk_t * __restrict sc)
+void
+sync_mksig(int id, off_t off, u_char * __restrict buf, int buflen, sync_chunk_t * __restrict sc)
 {
 	MD5_CTX ctx;
 
@@ -33,20 +72,23 @@ inline void sync_mksig(int id, off_t off, u_char * __r
 	MD5_Final(sc->sc_cksum, &ctx);
 }
 
+#if 0
 /*
- * syncWriteNum() Write to handle converted number to bigendian
+ * sync_WriteNum() - Write to handle converted number to bigendian
+ *
  * @f = handle
  * @ulNum = number to convert
  * @nNumLen = length of number to bytes
  * return: -1 error, != -1 writed bytes to handle
 */
-inline int syncWriteNum(int f, u_long ulNum, int nNumLen)
+int
+sync_WriteNum(int f, u_long ulNum, int nNumLen)
 {
 	u_char buf[sizeof ulNum];
 	register int i;
 
 	if (nNumLen < 1 || nNumLen > ULONG_MAX) {
-		syncSetErr(-1, "Illegal number len %d\n", nNumLen);
+		sync_SetErr(-1, "Illegal number len %d\n", nNumLen);
 		return -1;
 	}
 
@@ -57,3 +99,47 @@ inline int syncWriteNum(int f, u_long ulNum, int nNumL
 
 	return write(f, buf, nNumLen);
 }
+#endif
+
+#ifndef HAVE_MKSTEMPS
+/* API function missing in NetBSD base source tree!!! */
+#define TEMPCHARS       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+#define NUM_CHARS       (sizeof(TEMPCHARS) - 1)
+
+int
+mkstemps(char *path, int slen)
+{
+	char *start, *cp, *ep;
+	const char *tempchars = TEMPCHARS;
+	unsigned int tries = 1;
+	size_t len;
+	int fd;
+
+	assert(path);
+	len = strlen(path);
+	if (len == 0 || slen >= len) {
+		errno = EINVAL;
+		goto end;
+	} else
+		ep = path + len - slen;
+
+	for (start = ep; start > path && start[-1] == 'X'; start--) {
+		if (tries < INT_MAX / NUM_CHARS)
+			tries *= NUM_CHARS;
+	}
+	tries *= 2;
+
+	do {
+		for (cp = start; cp != ep; cp++)
+			*cp = tempchars[arc4random_uniform(NUM_CHARS)];
+
+		fd = open(path, O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
+		if (fd != -1 || errno != EEXIST)
+			return fd;
+	} while (--tries);
+
+	errno = EEXIST;
+end:
+	return -1;
+}
+#endif