--- embedtools/src/cfexec.c	2011/06/08 12:45:41	1.2
+++ embedtools/src/cfexec.c	2011/06/13 20:23:35	1.2.2.2
@@ -3,9 +3,46 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: cfexec.c,v 1.2 2011/06/08 12:45:41 misho Exp $
+ * $Id: cfexec.c,v 1.2.2.2 2011/06/13 20:23:35 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
+	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"
 
 
@@ -37,7 +74,11 @@ static int update(int flags)
 
 	memset(&mnt, 0, sizeof mnt);
 	mnt.fspec = szDev;
+#ifdef __NetBSD__
+	if (mount("ufs", szMount, flags, &mnt, sizeof mnt) == -1) {
+#else
 	if (mount("ufs", szMount, flags, &mnt) == -1) {
+#endif
 		printf("Error:: can`t update mount %s #%d - %s\n", szMount, errno, strerror(errno));
 		return -1;
 	}
@@ -88,7 +129,7 @@ static int mkevent(struct kevent *chg, struct kevent *
 		memset(chg, 0, sizeof(struct kevent));
 		memset(evt, 0, sizeof(struct kevent));
 
-		EV_SET(chg, f, EVFILT_VNODE, EV_ADD, NOTE_DELETE | NOTE_RENAME | NOTE_REVOKE, 0, NULL);
+		EV_SET(chg, f, EVFILT_VNODE, EV_ADD, NOTE_DELETE | NOTE_RENAME | NOTE_REVOKE, 0, (intptr_t) NULL);
 	}
 
 	return f;
@@ -99,7 +140,7 @@ static int mkevent(struct kevent *chg, struct kevent *
 int main(int argc, char **argv)
 {
 	char ch;
-	const char *err;
+	const char *err = NULL;
 	struct kevent chg, evt;
 	struct timespec ts;
 	pid_t pid;
@@ -110,7 +151,11 @@ int main(int argc, char **argv)
 	// Load variables from config if exists
 	if (!LoadConfig(szConfig, &cfg)) {
 		cfg_LoadAttribute(&cfg, CFG("cfexec"), CFG("timeout"), CFG(szUser), MAX_STR, DEFAULT_TIMEOUT);
+#ifndef HAVE_STRTONUM
+		Timeout = (int) strtol(szUser, NULL, 0);
+#else
 		Timeout = strtonum(szUser, 0, 3600, &err);
+#endif
 		if (!Timeout && err) {
 			printf("Error:: in seconds for timeout %s - %s\n", optarg, err);
 			UnloadConfig(&cfg);
@@ -149,7 +194,11 @@ int main(int argc, char **argv)
 				strlcpy(szMount, optarg, MAXPATHLEN);
 				break;
 			case 't':
+#ifndef HAVE_STRTONUM
+				Timeout = (int) strtol(szUser, NULL, 0);
+#else
 				Timeout = strtonum(optarg, 0, 3600, &err);
+#endif
 				if (!Timeout && err) {
 					printf("Error:: in seconds for timeout %s - %s\n",
 							optarg, err);