Patch from Alan Clucas (somewhat polished) providing command-line

[u/mdw/putty] / unix / uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 0c34a29..a9661b5 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -107,8 +107,8 @@ char *platform_default_s(const char *name)
 {
     if (!strcmp(name, "TermType"))
        return dupstr(getenv("TERM"));
-    if (!strcmp(name, "UserName"))
-       return get_username();
+     if (!strcmp(name, "UserName"))
+       return get_username();
     if (!strcmp(name, "SerialLine"))
        return dupstr("/dev/ttyS0");
     return NULL;
@@ -513,7 +513,8 @@ int signalpipe[2];
 
 void sigwinch(int signum)
 {
-    write(signalpipe[1], "x", 1);
+    if (write(signalpipe[1], "x", 1) <= 0)
+       /* not much we can do about it */;
 }
 
 /*
@@ -564,6 +565,8 @@ static void usage(void)
     printf("  -N        don't start a shell/command (SSH-2 only)\n");
     printf("  -nc host:port\n");
     printf("            open tunnel in place of session (SSH-2 only)\n");
+    printf("  -sercfg configuration-string (e.g. 19200,8,n,1,X)\n");
+    printf("            Specify the serial configuration (serial only)\n");
     exit(1);
 }
 
@@ -1030,7 +1033,9 @@ int main(int argc, char **argv)
        if (FD_ISSET(signalpipe[0], &rset)) {
            char c[1];
            struct winsize size;
-           read(signalpipe[0], c, 1); /* ignore its value; it'll be `x' */
+           if (read(signalpipe[0], c, 1) <= 0)
+               /* ignore error */;
+           /* ignore its value; it'll be `x' */
            if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
                back->size(backhandle, size.ws_col, size.ws_row);
        }