--- sourceforge.net/trunk/rdesktop/rdesktop.c 2003/01/28 12:27:28 297 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/02/10 12:56:34 317 @@ -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 @@ -21,7 +21,6 @@ #include /* va_list va_start va_end */ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ -#include /* save licence uses it. */ #include /* getpwuid */ #include /* tcgetattr tcsetattr */ #include /* stat */ @@ -45,10 +44,11 @@ char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int width = 800; /* If width or height are reset to zero, the geometry will +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; BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; @@ -64,7 +64,7 @@ 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); @@ -84,6 +84,7 @@ 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 @@ -144,7 +145,7 @@ 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:fbemCKT:Dh?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:a:fbemCKT:Dh?")) != -1) { switch (c) { @@ -239,6 +240,15 @@ 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: @@ -503,160 +513,3 @@ } } -#ifdef SAVE_LICENCE -int -load_licence(unsigned char **data) -{ - char *path; - char *home; - struct stat st; - int fd; - - home = getenv("HOME"); - if (home == NULL) - return -1; - - path = xmalloc(strlen(home) + strlen(hostname) + 20); - sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); - - fd = open(path, O_RDONLY); - if (fd == -1) - return -1; - - if (fstat(fd, &st)) - return -1; - - *data = xmalloc(st.st_size); - return read(fd, *data, st.st_size); -} - -void -save_licence(unsigned char *data, int length) -{ - char *fpath; /* file path for licence */ - char *fname, *fnamewrk; /* file name for licence .inkl path. */ - char *home; - 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, s_ptr->p, 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", s_ptr->p + len, data + length); - return; - } - - home = getenv("HOME"); - if (home == NULL) - return; - - /* set and create the directory -- if it doesn't exist. */ - fpath = xmalloc(strlen(home) + 11); - STRNCPY(fpath, home, strlen(home) + 1); - - sprintf(fpath, "%s/.rdesktop", fpath); - if (mkdir(fpath, 0700) == -1 && errno != EEXIST) - { - perror("mkdir"); - exit(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, 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;) - { - 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); - } - -} -#endif