--- libaitsched/src/aitsched.c	2014/01/27 16:52:56	1.23.2.1
+++ libaitsched/src/aitsched.c	2014/05/21 22:12:10	1.25.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.23.2.1 2014/01/27 16:52:56 misho Exp $
+* $Id: aitsched.c,v 1.25.2.4 2014/05/21 22:12:10 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ 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
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -82,6 +82,79 @@ sched_SetErr(int eno, char *estr, ...)
 	va_end(lst);
 }
 
+
+/* string support functions directly imported from OpenBSD */
+
+#ifndef HAVE_STRLCAT
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char * __restrict dst, const char * __restrict src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
+#endif
+#ifndef HAVE_STRLCPY
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+#endif
+
+
 /* Init and prepare scheduler functions */
 
 /*
@@ -101,16 +174,18 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 
 	root->root_hooks.hook_add.read = sched_hook_read;
 	root->root_hooks.hook_add.write = sched_hook_write;
-	root->root_hooks.hook_add.alarm = sched_hook_alarm;
-#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
+#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE)
 	root->root_hooks.hook_add.rtc = sched_hook_rtc;
 #endif
+#if SUP_ENABLE == KQ_ENABLE
+	root->root_hooks.hook_add.alarm = sched_hook_alarm;
 	root->root_hooks.hook_add.node = sched_hook_node;
 	root->root_hooks.hook_add.proc = sched_hook_proc;
 	root->root_hooks.hook_add.signal = sched_hook_signal;
 #ifdef EVFILT_USER
 	root->root_hooks.hook_add.user = sched_hook_user;
 #endif
+#endif	/* KQ_SUPPORT */
 #ifdef HAVE_LIBPTHREAD
 	root->root_hooks.hook_add.thread = sched_hook_thread;
 #endif
@@ -150,11 +225,7 @@ schedInit(void ** __restrict data, size_t datlen)
 		root->root_miss = MAX_TASK_MISS;
 
 		/* INFINIT polling period by default */
-#ifndef KQ_DISABLE
 		sched_timespecinf(&root->root_poll);
-#else
-		sched_timevalinf(&root->root_poll);
-#endif
 
 #ifdef HAVE_LIBPTHREAD
 		for (i = 0; i < taskMAX; i++)
@@ -339,6 +410,10 @@ schedFetch(sched_root_task_t * __restrict root)
 int
 schedTrigger(sched_task_t * __restrict task)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return -1;
+#else
 #ifndef EVFILT_USER
 	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
 	return -1;
@@ -361,6 +436,7 @@ schedTrigger(sched_task_t * __restrict task)
 
 	return 0;
 #endif
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -919,7 +995,6 @@ schedPolling(sched_root_task_t * __restrict root, stru
 	if (!root)
 		return -1;
 
-#ifndef KQ_DISABLE
 	if (tsold)
 		*tsold = root->root_poll;
 
@@ -927,15 +1002,6 @@ schedPolling(sched_root_task_t * __restrict root, stru
 		sched_timespecinf(&root->root_poll);
 	else
 		root->root_poll = *ts;
-#else
-	if (tsold)
-		sched_timeval2spec(&root->root_poll, tsold);
-
-	if (!ts)
-		sched_timevalinf(&root->root_poll);
-	else
-		sched_timespec2val(ts, &root->root_poll);
-#endif
 
 	return 0;
 }