diff options
Diffstat (limited to '')
| -rw-r--r-- | st.c | 7 |
1 files changed, 3 insertions, 4 deletions
| @@ -823,15 +823,14 @@ ttyread(void) | |||
| 823 | { | 823 | { |
| 824 | static char buf[BUFSIZ]; | 824 | static char buf[BUFSIZ]; |
| 825 | static int buflen = 0; | 825 | static int buflen = 0; |
| 826 | int written; | 826 | int ret, written; |
| 827 | int ret; | ||
| 828 | 827 | ||
| 829 | /* append read bytes to unprocessed bytes */ | 828 | /* append read bytes to unprocessed bytes */ |
| 830 | ret = read(cmdfd, buf+buflen, LEN(buf)-buflen); | 829 | ret = read(cmdfd, buf+buflen, LEN(buf)-buflen); |
| 831 | 830 | ||
| 832 | switch (ret) { | 831 | switch (ret) { |
| 833 | case 0: | 832 | case 0: |
| 834 | fputs("Found EOF in input\n", stderr); | 833 | fputs("found EOF in input\n", stderr); |
| 835 | exit(0); | 834 | exit(0); |
| 836 | case -1: | 835 | case -1: |
| 837 | die("couldn't read from shell: %s\n", strerror(errno)); | 836 | die("couldn't read from shell: %s\n", strerror(errno)); |
| @@ -839,7 +838,7 @@ ttyread(void) | |||
| 839 | buflen += ret; | 838 | buflen += ret; |
| 840 | written = twrite(buf, buflen, 0); | 839 | written = twrite(buf, buflen, 0); |
| 841 | buflen -= written; | 840 | buflen -= written; |
| 842 | /* keep any uncomplete utf8 char for the next call */ | 841 | /* keep any incomplete UTF-8 byte sequence for the next call */ |
| 843 | if (buflen > 0) | 842 | if (buflen > 0) |
| 844 | memmove(buf, buf + written, buflen); | 843 | memmove(buf, buf + written, buflen); |
| 845 | return ret; | 844 | return ret; |
