Add the ability to do ssh by default: using -ssh command line option,

[u/mdw/putty] / window.c

diff --git a/window.c b/window.c
index 3eaa033..6b0f1db 100644 (file)
--- a/window.c
+++ b/window.c
@@ -100,12 +100,33 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     {
        char *p;
 
+       default_protocol = DEFAULT_PROTOCOL;
+       default_port = DEFAULT_PORT;
+
        do_defaults(NULL);
 
        p = cmdline;
        while (*p && isspace(*p)) p++;
 
        /*
+        * Process command line options first. Yes, this can be
+        * done better, and it will be as soon as I have the
+        * energy...
+        */
+       while (*p == '-') {
+           char *q = p + strcspn(p, " \t");
+           p++;
+           if (q == p + 3 &&
+               tolower(p[0]) == 's' &&
+               tolower(p[1]) == 's' &&
+               tolower(p[2]) == 'h') {
+               default_protocol = cfg.protocol = PROT_SSH;
+               default_port = cfg.port = 22;
+           }
+           p = q + strspn(q, " \t");
+       }
+
+       /*
         * An initial @ means to activate a saved session.
         */
        if (*p == '@') {
@@ -267,7 +288,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
            return 0;
        }
        window_name = icon_name = NULL;
-       sprintf(msg, "PuTTY: %s", realhost);
+       sprintf(msg, "%s - PuTTY", realhost);
        set_title (msg);
        set_icon (msg);
     }
@@ -1412,7 +1433,7 @@ void set_sbar (int total, int start, int page) {
         SetScrollInfo (hwnd, SB_VERT, &si, TRUE);
 }
 
-Context get_ctx() {
+Context get_ctx(void) {
     HDC hdc;
     if (hwnd) {
        hdc = GetDC (hwnd);
@@ -1540,11 +1561,10 @@ void get_clip (void **p, int *len) {
  */
 void optimised_move (int to, int from, int lines) {
     RECT r;
-    int min, max, d;
+    int min, max;
 
     min = (to < from ? to : from);
     max = to + from - min;
-    d = max - min;
 
     r.left = 0; r.right = cols * font_width;
     r.top = min * font_height; r.bottom = (max+lines) * font_height;