Deleted Added
full compact
consport.c (330449) consport.c (336161)
1/*-
2 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3 *
4 * Copyright (c) 2011 NetApp, Inc.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*-
2 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3 *
4 * Copyright (c) 2011 NetApp, Inc.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: stable/11/usr.sbin/bhyve/consport.c 330449 2018-03-05 07:26:05Z eadler $
28 * $FreeBSD: stable/11/usr.sbin/bhyve/consport.c 336161 2018-07-10 04:26:32Z araujo $
29 */
30
31#include <sys/cdefs.h>
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: stable/11/usr.sbin/bhyve/consport.c 330449 2018-03-05 07:26:05Z eadler $");
32__FBSDID("$FreeBSD: stable/11/usr.sbin/bhyve/consport.c 336161 2018-07-10 04:26:32Z araujo $");
33
34#include <sys/types.h>
35#ifndef WITHOUT_CAPSICUM
36#include <sys/capsicum.h>
37#endif
38#include <sys/select.h>
39
40#include <err.h>

--- 28 unchanged lines hidden (view full) ---

69 tcsetattr(STDIN_FILENO, TCSANOW, &tio_new);
70
71 atexit(ttyclose);
72}
73
74static bool
75tty_char_available(void)
76{
33
34#include <sys/types.h>
35#ifndef WITHOUT_CAPSICUM
36#include <sys/capsicum.h>
37#endif
38#include <sys/select.h>
39
40#include <err.h>

--- 28 unchanged lines hidden (view full) ---

69 tcsetattr(STDIN_FILENO, TCSANOW, &tio_new);
70
71 atexit(ttyclose);
72}
73
74static bool
75tty_char_available(void)
76{
77 fd_set rfds;
78 struct timeval tv;
77 fd_set rfds;
78 struct timeval tv;
79
79
80 FD_ZERO(&rfds);
81 FD_SET(STDIN_FILENO, &rfds);
82 tv.tv_sec = 0;
83 tv.tv_usec = 0;
84 if (select(STDIN_FILENO + 1, &rfds, NULL, NULL, &tv) > 0) {
80 FD_ZERO(&rfds);
81 FD_SET(STDIN_FILENO, &rfds);
82 tv.tv_sec = 0;
83 tv.tv_usec = 0;
84 if (select(STDIN_FILENO + 1, &rfds, NULL, NULL, &tv) > 0) {
85 return (true);
86 } else {
87 return (false);
88 }
89}
90
91static int
92ttyread(void)

--- 80 unchanged lines hidden ---
85 return (true);
86 } else {
87 return (false);
88 }
89}
90
91static int
92ttyread(void)

--- 80 unchanged lines hidden ---