--- sourceforge.net/trunk/rdesktop/rdesktop.c 2002/11/18 15:37:20 262 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/02/18 13:03:51 328 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2002 + Copyright (C) Matthew Chapman 1999-2003 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,11 @@ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ #include /* getpwuid */ -#include /* PATH_MAX */ #include /* tcgetattr tcsetattr */ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include #include "rdesktop.h" #ifdef EGD_SOCKET @@ -45,9 +45,12 @@ char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int width = 800; +int width = 800; /* If width or height are reset to zero, the geometry will + be fetched from _NET_WORKAREA */ int height = 600; int tcp_port_rdp = TCP_PORT_RDP; +int server_bpp = 8; +int win_button_size = 0; /* If zero, disable single app mode */ BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; @@ -56,13 +59,14 @@ BOOL fullscreen = False; BOOL grab_keyboard = True; BOOL hide_decorations = False; +extern BOOL owncolmap; /* Display usage information */ static void usage(char *program) { fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); - fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2002 Matt Chapman.\n"); + fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2003 Matt Chapman.\n"); fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); fprintf(stderr, "Usage: %s [options] server[:port]\n", program); @@ -78,9 +82,11 @@ 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, " -C: use private colour map\n"); fprintf(stderr, " -K: keep window manager key bindings\n"); fprintf(stderr, " -T: window title\n"); fprintf(stderr, " -D: hide window manager decorations\n"); + fprintf(stderr, " -a: server bpp\n"); } static BOOL @@ -134,18 +140,20 @@ uint32 flags; char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKT:Dh?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:S:c:p:n:k:g:a:fbemCKT:Dh?")) != -1) { switch (c) { case 'u': STRNCPY(username, optarg, sizeof(username)); + username_option = 1; break; case 'd': @@ -156,6 +164,23 @@ STRNCPY(shell, optarg, sizeof(shell)); break; + case 'S': + if (!strcmp(optarg, "standard")) + { + win_button_size = 18; + break; + } + + win_button_size = strtol(optarg, &p, 10); + + if (*p) + { + error("invalid button size\n"); + return 1; + } + + break; + case 'c': STRNCPY(directory, optarg, sizeof(directory)); break; @@ -185,6 +210,12 @@ break; case 'g': + if (!strcmp(optarg, "workarea")) + { + width = height = 0; + break; + } + width = strtol(optarg, &p, 10); if (*p == 'x') height = strtol(p + 1, NULL, 10); @@ -212,6 +243,10 @@ sendmotion = False; break; + case 'C': + owncolmap = True; + break; + case 'K': grab_keyboard = False; break; @@ -224,6 +259,16 @@ hide_decorations = True; break; + case 'a': + server_bpp = strtol(optarg, NULL, 10); + if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15 + && server_bpp != 24) + { + error("invalid server bpp\n"); + return 1; + } + break; + case 'h': case '?': default: @@ -246,7 +291,7 @@ *p = 0; } - if (username[0] == 0) + if (!username_option) { pw = getpwuid(getuid()); if ((pw == NULL) || (pw->pw_name == NULL)) @@ -432,6 +477,19 @@ va_end(ap); } +/* report a warning */ +void +warning(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "WARNING: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + /* report an unimplemented protocol feature */ void unimpl(char *format, ...) @@ -475,11 +533,11 @@ } } -#ifdef SAVE_LICENCE + int load_licence(unsigned char **data) { - char path[PATH_MAX]; + char *path; char *home; struct stat st; int fd; @@ -488,8 +546,8 @@ if (home == NULL) return -1; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); + path = xmalloc(strlen(home) + strlen(hostname) + 20); + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); fd = open(path, O_RDONLY); if (fd == -1) @@ -505,28 +563,130 @@ void save_licence(unsigned char *data, int length) { - char path[PATH_MAX]; + char *fpath; /* file path for licence */ + char *fname, *fnamewrk; /* file name for licence .inkl path. */ char *home; - int fd; + uint32 y; + struct flock fnfl; + int fnfd, fnwrkfd, i, wlen; + struct stream s, *s_ptr; + uint32 len; + + /* Construct a stream, so that we can use macros to extract the + * licence. + */ + s_ptr = &s; + s_ptr->p = data; + /* Skip first two bytes */ + in_uint16(s_ptr, len); + + /* Skip three strings */ + for (i = 0; i < 3; i++) + { + in_uint32(s_ptr, len); + s_ptr->p += len; + /* Make sure that we won't be past the end of data after + * reading the next length value + */ + if ((s_ptr->p) + 4 > data + length) + { + printf("Error in parsing licence key.\n"); + printf("Strings %d end value %x > supplied length (%x)\n", i, + (unsigned int) s_ptr->p, (unsigned int) data + length); + return; + } + } + in_uint32(s_ptr, len); + if (s_ptr->p + len > data + length) + { + printf("Error in parsing licence key.\n"); + printf("End of licence %x > supplied length (%x)\n", + (unsigned int) s_ptr->p + len, (unsigned int) data + length); + return; + } home = getenv("HOME"); if (home == NULL) return; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1); - mkdir(path, 0700); + /* set and create the directory -- if it doesn't exist. */ + fpath = xmalloc(strlen(home) + 11); + STRNCPY(fpath, home, strlen(home) + 1); - strncat(path, "/licence", sizeof(path) - strlen(path) - 1); + sprintf(fpath, "%s/.rdesktop", fpath); + if (mkdir(fpath, 0700) == -1 && errno != EEXIST) + { + perror("mkdir"); + exit(1); + } - fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); - if (fd == -1) + /* set the real licence filename, and put a write lock on it. */ + fname = xmalloc(strlen(fpath) + strlen(hostname) + 10); + sprintf(fname, "%s/licence.%s", fpath, hostname); + fnfd = open(fname, O_RDONLY); + if (fnfd != -1) + { + fnfl.l_type = F_WRLCK; + fnfl.l_whence = SEEK_SET; + fnfl.l_start = 0; + fnfl.l_len = 1; + fcntl(fnfd, F_SETLK, &fnfl); + } + + /* create a temporary licence file */ + fnamewrk = xmalloc(strlen(fname) + 12); + for (y = 0;; y++) + { + sprintf(fnamewrk, "%s.%lu", fname, (long unsigned int) y); + fnwrkfd = open(fnamewrk, O_WRONLY | O_CREAT | O_EXCL, 0600); + if (fnwrkfd == -1) + { + if (errno == EINTR || errno == EEXIST) + continue; + perror("create"); + exit(1); + } + break; + } + /* write to the licence file */ + for (y = 0; y < len;) { - perror("open"); - return; + do + { + wlen = write(fnwrkfd, s_ptr->p + y, len - y); + } + while (wlen == -1 && errno == EINTR); + if (wlen < 1) + { + perror("write"); + unlink(fnamewrk); + exit(1); + } + y += wlen; + } + + /* close the file and rename it to fname */ + if (close(fnwrkfd) == -1) + { + perror("close"); + unlink(fnamewrk); + exit(1); + } + if (rename(fnamewrk, fname) == -1) + { + perror("rename"); + unlink(fnamewrk); + exit(1); + } + /* close the file lock on fname */ + if (fnfd != -1) + { + fnfl.l_type = F_UNLCK; + fnfl.l_whence = SEEK_SET; + fnfl.l_start = 0; + fnfl.l_len = 1; + fcntl(fnfd, F_SETLK, &fnfl); + close(fnfd); } - write(fd, data, length); - close(fd); } -#endif