Tue Dec 20 21:07:56 2011 UTC ()

thunk_pollchar: use read instead of getchar


(jmcneill)

diff -r1.48 -r1.49 src/sys/arch/usermode/usermode/thunk.c

--- src/sys/arch/usermode/usermode/thunk.c 2011/12/20 15:45:37	1.48
+++ src/sys/arch/usermode/usermode/thunk.c 2011/12/20 21:07:56	1.49

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.48 2011/12/20 15:45:37 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.49 2011/12/20 21:07:56 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.
 @@ -18,27 +18,27 @@
  * 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>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.48 2011/12/20 15:45:37 reinoud Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.49 2011/12/20 21:07:56 jmcneill Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/reboot.h>
 #include <sys/poll.h>
 #include <machine/vmparam.h>
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
 @@ -371,34 +371,37 @@ thunk_set_stdin_sigio(int onoff)
 	if (onoff)
 		flags |= O_ASYNC;
 	else
 		flags &= ~O_ASYNC;
 	return fcntl(STDIN_FILENO, F_SETFL, flags);
+}
 int
 thunk_pollchar(void)
+{
 	struct pollfd fds[1];
 	uint8_t c;
 	fds[0].fd = STDIN_FILENO;
 	fds[0].events = POLLIN;
 	fds[0].revents = 0;
 	if (poll(fds, __arraycount(fds), 0) > 0) {
 		if (fds[0].revents & POLLIN) {
-			return getchar();
+			if (read(STDIN_FILENO, &c, 1) != 1)
 				return EOF;
 			return c;
+		}
+	}
 	return EOF;
+}
 int
 thunk_getchar(void)
+{
 	return getchar();
+}
 void