I'm sick of all those #ifdefs in settings.c, and in any case plink

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

diff --git a/unix/uxplink.c b/unix/uxplink.c
index ba7b78f..a005ce6 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -9,6 +9,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <termios.h>
+#include <pwd.h>
+#include <sys/ioctl.h>
 
 /* More helpful version of the FD_SET macro, to also handle maxfd. */
 #define FD_SET_MAX(fd, max, set) do { \
@@ -69,6 +71,68 @@ struct termios orig_termios;
 static Backend *back;
 static void *backhandle;
 
+/*
+ * Default settings that are specific to pterm.
+ */
+char *platform_default_s(char *name)
+{
+    if (!strcmp(name, "X11Display"))
+       return getenv("DISPLAY");
+    if (!strcmp(name, "TermType"))
+       return getenv("TERM");
+    if (!strcmp(name, "UserName")) {
+       /*
+        * Remote login username will default to the local username.
+        */
+       struct passwd *p;
+       uid_t uid = getuid();
+       char *user, *ret = NULL;
+
+       /*
+        * First, find who we think we are using getlogin. If this
+        * agrees with our uid, we'll go along with it. This should
+        * allow sharing of uids between several login names whilst
+        * coping correctly with people who have su'ed.
+        */
+       user = getlogin();
+       setpwent();
+       if (user)
+           p = getpwnam(user);
+       else
+           p = NULL;
+       if (p && p->pw_uid == uid) {
+           /*
+            * The result of getlogin() really does correspond to
+            * our uid. Fine.
+            */
+           ret = user;
+       } else {
+           /*
+            * If that didn't work, for whatever reason, we'll do
+            * the simpler version: look up our uid in the password
+            * file and map it straight to a name.
+            */
+           p = getpwuid(uid);
+           ret = p->pw_name;
+       }
+       endpwent();
+
+       return ret;
+    }
+    return NULL;
+}
+
+int platform_default_i(char *name, int def)
+{
+    if (!strcmp(name, "TermWidth") ||
+       !strcmp(name, "TermHeight")) {
+       struct winsize size;
+       if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
+           return (!strcmp(name, "TermWidth") ? size.ws_col : size.ws_row);
+    }
+    return def;
+}
+
 char *x_get_default(char *key)
 {
     return NULL;                      /* this is a stub */
@@ -186,7 +250,7 @@ int main(int argc, char **argv)
     int i, skcount, sksize, socketstate;
     int connopen;
     int exitcode;
-    void *logctx;
+    int errors;
     void *ldisc;
 
     ssh_get_line = console_get_line;
@@ -207,6 +271,7 @@ int main(int argc, char **argv)
     do_defaults(NULL, &cfg);
     default_protocol = cfg.protocol;
     default_port = cfg.port;
+    errors = 0;
     {
        /*
         * Override the default protocol if PLINK_PROTOCOL is set.
@@ -231,16 +296,32 @@ int main(int argc, char **argv)
            if (ret == -2) {
                fprintf(stderr,
                        "plink: option \"%s\" requires an argument\n", p);
+               errors = 1;
            } else if (ret == 2) {
                --argc, ++argv;
            } else if (ret == 1) {
                continue;
            } else if (!strcmp(p, "-batch")) {
                console_batch_mode = 1;
+           } else if (!strcmp(p, "-o")) {
+                if (argc <= 1) {
+                    fprintf(stderr,
+                            "plink: option \"-o\" requires an argument\n");
+                   errors = 1;
+               } else {
+                    --argc;
+                   provide_xrm_string(*++argv);
+               }
+           } else {
+               fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+               errors = 1;
            }
        } else if (*p) {
            if (!*cfg.host) {
                char *q = p;
+
+                do_defaults(NULL, &cfg);
+
                /*
                 * If the hostname starts with "telnet:", set the
                 * protocol to Telnet and process the string as a
@@ -358,6 +439,9 @@ int main(int argc, char **argv)
        }
     }
 
+    if (errors)
+       return 1;
+
     if (!*cfg.host) {
        usage();
     }
@@ -441,6 +525,7 @@ int main(int argc, char **argv)
     /*
      * Start up the connection.
      */
+    logctx = log_init(NULL);
     {
        char *error;
        char *realhost;
@@ -453,9 +538,8 @@ int main(int argc, char **argv)
            fprintf(stderr, "Unable to open connection:\n%s\n", error);
            return 1;
        }
-       logctx = log_init(NULL);
        back->provide_logctx(backhandle, logctx);
-       ldisc = ldisc_create(NULL, back, backhandle, NULL);
+       ldisc = ldisc_create(&cfg, NULL, back, backhandle, NULL);
        sfree(realhost);
     }
     connopen = 1;