--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/10/11 04:00:32	222
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2002/11/18 15:30:12	259
@@ -71,14 +71,14 @@
 	fprintf(stderr, "   -c: working directory\n");
 	fprintf(stderr, "   -p: password (- to prompt)\n");
 	fprintf(stderr, "   -n: client hostname\n");
-	fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr etc.)\n");
+	fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr,etc.)\n");
 	fprintf(stderr, "   -g: desktop geometry (WxH)\n");
 	fprintf(stderr, "   -f: full-screen mode\n");
 	fprintf(stderr, "   -b: force bitmap updates\n");
 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
 	fprintf(stderr, "   -K: keep window manager key bindings\n");
-	fprintf(stderr, "   -w: window title\n");
+	fprintf(stderr, "   -T: window title\n");
 }
 
 static BOOL
@@ -125,7 +125,7 @@
 	char fullhostname[64];
 	char domain[16];
 	char password[16];
-	char shell[32];
+	char shell[128];
 	char directory[32];
 	BOOL prompt_password;
 	struct passwd *pw;
@@ -136,9 +136,9 @@
 	flags = RDP_LOGON_NORMAL;
 	prompt_password = False;
 	domain[0] = password[0] = shell[0] = directory[0] = 0;
-	strcpy(keymapname, "us");
+	strcpy(keymapname, "en-us");
 
-	while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKw:h?")) != -1)
+	while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKT:h?")) != -1)
 	{
 		switch (c)
 		{
@@ -214,7 +214,7 @@
 				grab_keyboard = False;
 				break;
 
-			case 'w':
+			case 'T':
 				STRNCPY(title, optarg, sizeof(title));
 				break;
 
@@ -312,16 +312,16 @@
 
 	addr.sun_family = AF_UNIX;
 	memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET));
-	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1)
+	if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
 		goto err;
 
 	/* PRNGD and EGD use a simple communications protocol */
-	buf[0] = 1;  /* Non-blocking (similar to /dev/urandom) */
-	buf[1] = 32; /* Number of requested random bytes */
+	buf[0] = 1;		/* Non-blocking (similar to /dev/urandom) */
+	buf[1] = 32;		/* Number of requested random bytes */
 	if (write(fd, buf, 2) != 2)
 		goto err;
 
-	if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */
+	if ((read(fd, buf, 1) != 1) || (buf[0] == 0))	/* Available? */
 		goto err;
 
 	if (read(fd, buf, 32) != 32)
@@ -329,7 +329,7 @@
 
 	ret = True;
 
-err:
+      err:
 	close(fd);
 	return ret;
 }
@@ -362,7 +362,7 @@
 #endif
 
 	/* Otherwise use whatever entropy we can gather - ideas welcome. */
-	r = (uint32 *)random;
+	r = (uint32 *) random;
 	r[0] = (getpid()) | (getppid() << 16);
 	r[1] = (getuid()) | (getgid() << 16);
 	r[2] = times(&tmsbuf);	/* system uptime (clocks) */
@@ -374,10 +374,10 @@
 
 	/* Hash both halves with MD5 to obscure possible patterns */
 	MD5_Init(&md5);
-	MD5_Update(&md5, random, 16); 
+	MD5_Update(&md5, random, 16);
 	MD5_Final(random, &md5);
-	MD5_Update(&md5, random+16, 16);
-	MD5_Final(random+16, &md5);
+	MD5_Update(&md5, random + 16, 16);
+	MD5_Final(random + 16, &md5);
 }
 
 /* malloc; exit if out of memory */