differentiate between a failed read, returning -1, and encountering

end-of-file, returning 0, in order not to print an unrelated
strerror(errno) in the latter case

ok millert@

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index d10410b25a..5ef4404001 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/lib/libc/net/rcmd.c
@@ -70,6 +70,7 @@ rcmd_af(char **ahost, int porta, const char *locuser, const char *remuser,
         char c, *p;
         int refused;
         in_port_t rport = porta;
+        int numread;
 
         /* call rcmdsh() with specified remote shell if appropriate. */
         if (!issetugid() && (p = getenv("RSH")) && *p) {
@@ -264,9 +265,10 @@ again:
         (void)write(s, locuser, strlen(locuser)+1);
         (void)write(s, remuser, strlen(remuser)+1);
         (void)write(s, cmd, strlen(cmd)+1);
-        if (read(s, &c, 1) != 1) {
+        if ((numread = read(s, &c, 1)) != 1) {
                 (void)fprintf(stderr,
-                    "rcmd: %s: %s\n", *ahost, strerror(errno));
+                    "rcmd: %s: %s\n", *ahost,
+                    numread == -1 ? strerror(errno) : "Short read");
                 goto bad2;
         }
         if (c != 0) {