 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.19 2011/08/28 19:37:15 reinoud Exp $ */
+/* $NetBSD: thunk.h,v 1.20 2011/08/28 21:19:49 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -38,41 +38,54 @@
 #include <sys/aio.h>
 #include <sys/mman.h>
 struct thunk_timeval {
 	int64_t tv_sec;
 	int32_t tv_usec;
 };
 struct thunk_itimerval {
 	struct thunk_timeval it_interval;
 	struct thunk_timeval it_value;
 };
 struct thunk_termios {
 	uint32_t c_iflag;
 	uint32_t c_oflag;
 	uint32_t c_cflag;
 	uint32_t c_lflag;
 	uint8_t c_cc[20];
 	int32_t c_ispeed;
 	int32_t c_ospeed;
 };
 int	thunk_setitimer(int, const struct thunk_itimerval *, struct thunk_itimerval *);
 int	thunk_gettimeofday(struct thunk_timeval *, void *);
 unsigned int thunk_getcounter(void);
 long	thunk_clock_getres_monotonic(void);
 int	thunk_usleep(useconds_t);
 void	thunk_exit(int);
 void	thunk_abort(void);
 int	thunk_getcontext(ucontext_t *);
 int	thunk_setcontext(const ucontext_t *);
 void	thunk_makecontext(ucontext_t *, void (*)(void), int, void (*)(void *), void *);
 void	thunk_makecontext_trapframe2go(ucontext_t *, void *func, void *trapframe);
 int	thunk_swapcontext(ucontext_t *, ucontext_t *);
 int	thunk_tcgetattr(int, struct thunk_termios *);
 int	thunk_tcsetattr(int, int, const struct thunk_termios *);
 int	thunk_getchar(void);
 void	thunk_putchar(int);
 int	thunk_execv(const char *, char * const []);
 int	thunk_open(const char *, int, mode_t);
 int	thunk_fstat_getsize(int, ssize_t *, ssize_t *);
 ssize_t	thunk_pread(int, void *, size_t, off_t);
 ssize_t	thunk_pwrite(int, const void *, size_t, off_t);
 int	thunk_fsync(int);
 int	thunk_mkstemp(char *);
 int	thunk_unlink(const char *);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.21 2011/08/28 19:37:16 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.22 2011/08/28 21:19:49 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -17,39 +17,40 @@
  * ``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 FOUNDATION 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 <sys/cdefs.h>
-__RCSID("$NetBSD: thunk.c,v 1.21 2011/08/28 19:37:16 reinoud Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.22 2011/08/28 21:19:49 jmcneill Exp $");
 #include <sys/types.h>
 #include <sys/ansi.h>
 #include <aio.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <termios.h>
 #include <time.h>
 #include <ucontext.h>
 #include <unistd.h>
 #include "../include/thunk.h"
 static void
 thunk_to_timeval(const struct thunk_timeval *ttv, struct timeval *tv)
+{
 	tv->tv_sec = ttv->tv_sec;
 	tv->tv_usec = ttv->tv_usec;
+}
 @@ -64,26 +65,56 @@ static void
 thunk_to_itimerval(const struct thunk_itimerval *tit, struct itimerval *it)
+{
 	thunk_to_timeval(&tit->it_interval, &it->it_interval);
 	thunk_to_timeval(&tit->it_value, &it->it_value);
+}
 static void
 thunk_from_itimerval(const struct itimerval *it, struct thunk_itimerval *tit)
+{
 	thunk_from_timeval(&it->it_interval, &tit->it_interval);
 	thunk_from_timeval(&it->it_value, &tit->it_value);
+}
 static void
 thunk_to_termios(const struct thunk_termios *tt, struct termios *t)
+{
 	int i;
 	t->c_iflag = tt->c_iflag;
 	t->c_oflag = tt->c_oflag;
 	t->c_cflag = tt->c_cflag;
 	t->c_lflag = tt->c_lflag;
 	for (i = 0; i < __arraycount(t->c_cc); i++)
 		t->c_cc[i] = tt->c_cc[i];
 	t->c_ispeed = tt->c_ispeed;
 	t->c_ospeed= tt->c_ospeed;
+}
 static void
 thunk_from_termios(const struct termios *t, struct thunk_termios *tt)
+{
 	int i;
 	tt->c_iflag = t->c_iflag;
 	tt->c_oflag = t->c_oflag;
 	tt->c_cflag = t->c_cflag;
 	tt->c_lflag = t->c_lflag;
 	for (i = 0; i < __arraycount(tt->c_cc); i++)
 		tt->c_cc[i] = t->c_cc[i];
 	tt->c_ispeed = t->c_ispeed;
 	tt->c_ospeed= t->c_ospeed;
+}
 int
 thunk_setitimer(int which, const struct thunk_itimerval *value,
     struct thunk_itimerval *ovalue)
+{
 	struct itimerval it, oit;
 	int error;
 	thunk_to_itimerval(value, &it);
 	error = setitimer(which, &it, &oit);
 	if (error)
 		return error;
 	if (ovalue)
 		thunk_from_itimerval(&oit, ovalue);
 @@ -176,26 +207,48 @@ thunk_makecontext(ucontext_t *ucp, void
 void
 thunk_makecontext_trapframe2go(ucontext_t *ucp, void *func, void *trapframe)
+{
 	makecontext(ucp, func, 1, trapframe);
+}
 int
 thunk_swapcontext(ucontext_t *oucp, ucontext_t *ucp)
+{
 	return swapcontext(oucp, ucp);
+}
 int
 thunk_tcgetattr(int fd, struct thunk_termios *tt)
+{
 	struct termios t;
 	int error;
 	error = tcgetattr(fd, &t);
 	if (error)
 		return error;
 	thunk_from_termios(&t, tt);
 	return 0;
+}
 int
 thunk_tcsetattr(int fd, int action, const struct thunk_termios *tt)
+{
 	struct termios t;
 	thunk_to_termios(tt, &t);
 	return tcsetattr(fd, action, &t);
+}
 int
 thunk_getchar(void)
+{
 	return getchar();
+}
 void
 thunk_putchar(int c)
+{
 	char wc = (char) c;
 	write(1, &wc, 1);
+}
 int