--- sourceforge.net/trunk/rdesktop/rdesktop.c 2003/10/28 05:07:00 520 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/02/15 21:19:28 608 @@ -26,6 +26,7 @@ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include /* toupper */ #include #include "rdesktop.h" @@ -66,12 +67,16 @@ BOOL g_hide_decorations = False; BOOL g_use_rdp5 = True; BOOL g_console_session = False; +BOOL g_numlock_sync = False; extern BOOL g_owncolmap; #ifdef WITH_RDPSND BOOL g_rdpsnd = False; #endif +extern RDPDR_DEVICE g_rdpdr_device[]; +extern uint32 g_num_devices; + #ifdef RDP2VNC extern int rfb_port; extern int defer_time; @@ -110,8 +115,22 @@ fprintf(stderr, " -K: keep window manager key bindings\n"); fprintf(stderr, " -S: caption button size (single application mode)\n"); fprintf(stderr, " -T: window title\n"); + fprintf(stderr, " -N: enable numlock syncronization\n"); fprintf(stderr, " -a: connection colour depth\n"); - fprintf(stderr, " -r: enable specified device redirection (currently: sound)\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, " 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, " 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, " 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, " -0: attach to console\n"); fprintf(stderr, " -4: use RDP version 4\n"); fprintf(stderr, " -5: use RDP version 5 (default)\n"); @@ -216,6 +235,7 @@ uint32 flags; char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; @@ -223,13 +243,15 @@ domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); + g_num_devices = 0; + #ifdef RDP2VNC #define VNCOPT "V:Q:" #else #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:a:r:045h?")) != -1) + while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1) { switch (c) { @@ -289,6 +311,7 @@ break; case 'g': + g_fullscreen = False; if (!strcmp(optarg, "workarea")) { g_width = g_height = 0; @@ -367,6 +390,10 @@ STRNCPY(g_title, optarg, sizeof(g_title)); break; + case 'N': + g_numlock_sync = True; + break; + case 'a': g_server_bpp = strtol(optarg, NULL, 10); if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15 @@ -378,12 +405,36 @@ break; case 'r': - if (!strcmp(optarg, "sound")) + + if (strncmp("sound", optarg, 5) == 0) + { #ifdef WITH_RDPSND g_rdpsnd = True; #else warning("Not compiled with sound support"); #endif + } + else if (strncmp("disk", optarg, 4) == 0) + { + /* -r disk:h:=/mnt/floppy */ + disk_enum_devices(&g_num_devices, optarg + 4); + } + else if (strncmp("comport", optarg, 7) == 0) + { + serial_enum_devices(&g_num_devices, optarg + 7); + } + else if (strncmp("lptport", optarg, 7) == 0) + { + parallel_enum_devices(&g_num_devices, optarg + 7); + } + else if (strncmp("printer", optarg, 7) == 0) + { + printer_enum_devices(&g_num_devices, optarg + 7); + } + else + { + warning("Unknown -r argument\n\n\tPossible arguments are: comport, disk, lptport, printer, sound\n"); + } break; case '0': @@ -463,7 +514,7 @@ if (g_rdpsnd) rdpsnd_init(); #endif - /* rdpdr_init(); */ + rdpdr_init(); if (!rdp_connect(server, flags, domain, password, shell, directory)) return 1; @@ -653,7 +704,7 @@ /* produce a hex dump */ void -hexdump(unsigned char *p, int len) +hexdump(unsigned char *p, unsigned int len) { unsigned char *line = p; int i, thisline, offset = 0; @@ -680,6 +731,123 @@ } } +/* + input: src is the string we look in for needle. + Needle may be escaped by a backslash, in + that case we ignore that particular needle. + return value: returns next src pointer, for + succesive executions, like in a while loop + if retval is 0, then there are no more args. + pitfalls: + src is modified. 0x00 chars are inserted to + terminate strings. + return val, points on the next val chr after ins + 0x00 + + example usage: + while( (pos = next_arg( optarg, ',')) ){ + printf("%s\n",optarg); + optarg=pos; + } + +*/ +char * +next_arg(char *src, char needle) +{ + char *nextval; + char *p; + char *mvp = 0; + + /* EOS */ + if (*src == (char) 0x00) + return 0; + + p = src; + /* skip escaped needles */ + while ((nextval = strchr(p, needle))) + { + mvp = nextval - 1; + /* found backslashed needle */ + if (*mvp == '\\' && (mvp > src)) + { + /* move string one to the left */ + while (*(mvp + 1) != (char) 0x00) + { + *mvp = *(mvp + 1); + *mvp++; + } + *mvp = (char) 0x00; + p = nextval; + } + else + { + p = nextval + 1; + break; + } + + } + + /* more args available */ + if (nextval) + { + *nextval = (char) 0x00; + return ++nextval; + } + + /* no more args after this, jump to EOS */ + nextval = src + strlen(src); + return nextval; +} + + +void +toupper_str(char *p) +{ + while (*p) + { + if ((*p >= 'a') && (*p <= 'z')) + *p = toupper((int) *p); + p++; + } +} + + +/* not all clibs got ltoa */ +#define LTOA_BUFSIZE (sizeof(long) * 8 + 1) + +char * +l_to_a(long N, int base) +{ + static char ret[LTOA_BUFSIZE]; + + char *head = ret, buf[LTOA_BUFSIZE], *tail = buf + sizeof(buf); + + register int divrem; + + if (base < 36 || 2 > base) + base = 10; + + if (N < 0) + { + *head++ = '-'; + N = -N; + } + + tail = buf + sizeof(buf); + *--tail = 0; + + do + { + divrem = N % base; + *--tail = (divrem <= 9) ? divrem + '0' : divrem + 'a' - 10; + N /= base; + } + while (N); + + strcpy(head, tail); + return ret; +} + int load_licence(unsigned char **data)