--- sourceforge.net/trunk/rdesktop/rdesktop.c	2004/01/27 10:36:49	583
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2004/03/04 12:43:10	628
@@ -69,6 +69,7 @@
 BOOL g_console_session = False;
 BOOL g_numlock_sync = False;
 extern BOOL g_owncolmap;
+extern BOOL g_ownbackstore;
 
 #ifdef WITH_RDPSND
 BOOL g_rdpsnd = False;
@@ -107,6 +108,7 @@
 	fprintf(stderr, "   -g: desktop geometry (WxH)\n");
 	fprintf(stderr, "   -f: full-screen mode\n");
 	fprintf(stderr, "   -b: force bitmap updates\n");
+	fprintf(stderr, "   -B: use BackingStore of X-server (if available)\n");
 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
 	fprintf(stderr, "   -E: disable encryption from client to server\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
@@ -118,15 +120,20 @@
 	fprintf(stderr, "   -N: enable numlock syncronization\n");
 	fprintf(stderr, "   -a: connection colour depth\n");
 	fprintf(stderr, "   -r: enable specified device redirection (this flag can be repeated)\n");
-	fprintf(stderr,	"         '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
+	fprintf(stderr,
+		"         '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
 	fprintf(stderr, "             or      COM1=/dev/ttyS0,COM2=/dev/ttyS1\n");
-	fprintf(stderr,	"         '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
+	fprintf(stderr,
+		"         '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
 	fprintf(stderr, "             or   A=/mnt/floppy,D=/mnt/cdrom'\n");
-	fprintf(stderr,	"         '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
+	fprintf(stderr,
+		"         '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
 	fprintf(stderr, "             or      LPT1=/dev/lp0,LPT2=/dev/lp1\n");
 	fprintf(stderr, "         '-r printer:mydeskjet': enable printer redirection\n");
-	fprintf(stderr,	"             or       mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
-	fprintf(stderr, "         '-r sound': enable sound redirection\n");
+	fprintf(stderr,
+		"             or      mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
+	fprintf(stderr, "         '-r sound:[on|off|remote]': enable sound redirection\n");
+	fprintf(stderr, "                     remote would leave sound on server\n");
 	fprintf(stderr, "   -0: attach to console\n");
 	fprintf(stderr, "   -4: use RDP version 4\n");
 	fprintf(stderr, "   -5: use RDP version 5 (default)\n");
@@ -247,7 +254,7 @@
 #define VNCOPT
 #endif
 
-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1)
+	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:Na:r:045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -343,6 +350,10 @@
 				g_orders = False;
 				break;
 
+			case 'B':
+				g_ownbackstore = False;
+				break;
+
 			case 'e':
 				g_encryption = False;
 				break;
@@ -404,11 +415,28 @@
 
 				if (strncmp("sound", optarg, 5) == 0)
 				{
+					if (*(optarg + 6) == ':')
+					{
+
+						if (strncmp("remote", optarg + 7, 6) == 0)
+							flags |= RDP_LOGON_LEAVE_AUDIO;
+						else if (strncmp("on", optarg + 7, 2) == 0)
+						{
+#ifdef WITH_RDPSND
+							g_rdpsnd = True;
+#else
+							warning("Not compiled with sound support");
+#endif
+						}
+					}
+					else
+					{
 #ifdef WITH_RDPSND
-					g_rdpsnd = True;
+						g_rdpsnd = True;
 #else
-					warning("Not compiled with sound support");
+						warning("Not compiled with sound support");
 #endif
+					}
 				}
 				else if (strncmp("disk", optarg, 4) == 0)
 				{
@@ -453,7 +481,7 @@
 		}
 	}
 
-	if (argc - optind < 1)
+	if (argc - optind != 1)
 	{
 		usage(argv[0]);
 		return 1;
@@ -812,7 +840,7 @@
 #define LTOA_BUFSIZE (sizeof(long) * 8 + 1)
 
 char *
-ltoa(long N, int base)
+l_to_a(long N, int base)
 {
 	static char ret[LTOA_BUFSIZE];