summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-07-06 09:57:48 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-07-06 09:57:48 +0200
commit1fe6fdecf115d8e797a58921b0b0b687b035fdad (patch)
treefe841e3c8a0869b742209396bdfe314eb919de25
parent1fcbfd644e079aa0716ab60b6e9ce7c5ff42708d (diff)
parent56184d7859d6f805f2504041e8b0656846512fb3 (diff)
downloadmicrocom-1fe6fdecf115d8e797a58921b0b0b687b035fdad.tar.gz
microcom-1fe6fdecf115d8e797a58921b0b0b687b035fdad.tar.xz
Merge branch 'ukl/master' of https://github.com/pengutronix/microcom
-rw-r--r--mux.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/mux.c b/mux.c
index bd36fc7..c393a43 100644
--- a/mux.c
+++ b/mux.c
@@ -162,13 +162,13 @@ static int handle_command(unsigned char *buf, int len)
dprintf("WILL ");
break;
case WONT:
- dprintf("WILL ");
+ dprintf("WONT ");
break;
case DO:
- dprintf("WILL ");
+ dprintf("DO ");
break;
case DONT:
- dprintf("WILL ");
+ dprintf("DONT ");
break;
default:
dprintf("%d ", buf[i]);
@@ -299,8 +299,10 @@ int mux_loop(struct ios_ops *ios)
len = read(ios->fd, buf, BUFSIZE);
if (len < 0)
return -errno;
- if (len == 0)
- return -EINVAL;
+ if (len == 0) {
+ fprintf(stderr, "Got EOF from port\n");
+ return 0;
+ }
handle_receive_buf(ios, buf, len);
}