Differences From Artifact [895582d0c7]:

• File x11fwd.c — part of check-in [dc76e6731e] at 2003-01-02 04:41:22 on branch trunk — Propagate the screen number from a local X display to the remote forwarded one. Fixes `x11-default-screen'. (user: simon size: 9313)

To Artifact [0c2ca69b7e]:

• File x11fwd.c — part of check-in [b7c53546d7] at 2003-01-02 04:45:56 on branch trunk — A couple of X forwarding fixes for Unix Plink. Firstly, under Unix the default X display should be whatever comes out of $DISPLAY, rather than Windows's hardwired `localhost:0'. Secondly, this may give rise to a display name without a hostname (`:0' or similar), which we now need to be able to deal with. Of course, we still don't _properly_ support X forwarding in Unix Plink, since we still can't authenticate with the local display. (user: simon size: 9473)

185
186
187
188
189
190
191

192
193









194
195
196
197
198
199
200

185
186
187
188
189
190
191
192


193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208

+
-
-
+
+
+
+
+
+
+
+
+

    n = strcspn(display, ":");
    if (display[n])
	displaynum = atoi(display + n + 1);
    else
	displaynum = 0;		       /* sensible default */
    if (n > sizeof(host) - 1)
	n = sizeof(host) - 1;
    if (n > 0) {
    strncpy(host, display, n);
    host[n] = '\0';
	strncpy(host, display, n);
	host[n] = '\0';
    } else {
	/*
	 * Local display numbers, particularly on Unix, often omit
	 * the display part completely.
	 */
	strcpy(host, "localhost");
    }

    /*
     * Try to find host.
     */
    addr = name_lookup(host, port, &dummy_realhost);
    if ((err = sk_addr_error(addr)))
	return err;