aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/drivers')
-rw-r--r--arch/um/drivers/chan_user.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 249c877410d7..40271afa3ee2 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -23,43 +23,43 @@
23 23
24void generic_close(int fd, void *unused) 24void generic_close(int fd, void *unused)
25{ 25{
26 os_close_file(fd); 26 close(fd);
27} 27}
28 28
29int generic_read(int fd, char *c_out, void *unused) 29int generic_read(int fd, char *c_out, void *unused)
30{ 30{
31 int n; 31 int n;
32 32
33 n = os_read_file(fd, c_out, sizeof(*c_out)); 33 n = read(fd, c_out, sizeof(*c_out));
34 34 if (n > 0)
35 if(n == -EAGAIN) 35 return n;
36 else if (errno == EAGAIN)
36 return 0; 37 return 0;
37 else if(n == 0) 38 else if (n == 0)
38 return -EIO; 39 return -EIO;
39 return n; 40 return -errno;
40} 41}
41 42
42/* XXX Trivial wrapper around os_write_file */ 43/* XXX Trivial wrapper around write */
43 44
44int generic_write(int fd, const char *buf, int n, void *unused) 45int generic_write(int fd, const char *buf, int n, void *unused)
45{ 46{
46 return os_write_file(fd, buf, n); 47 return write(fd, buf, n);
47} 48}
48 49
49int generic_window_size(int fd, void *unused, unsigned short *rows_out, 50int generic_window_size(int fd, void *unused, unsigned short *rows_out,
50 unsigned short *cols_out) 51 unsigned short *cols_out)
51{ 52{
52 int rows, cols; 53 struct winsize size;
53 int ret; 54 int ret;
54 55
55 ret = os_window_size(fd, &rows, &cols); 56 if(ioctl(fd, TIOCGWINSZ, &size) < 0)
56 if(ret < 0) 57 return -errno;
57 return ret;
58 58
59 ret = ((*rows_out != rows) || (*cols_out != cols)); 59 ret = ((*rows_out != size.ws_row) || (*cols_out != size.ws_col));
60 60
61 *rows_out = rows; 61 *rows_out = size.ws_row;
62 *cols_out = cols; 62 *cols_out = size.ws_col;
63 63
64 return ret; 64 return ret;
65} 65}