]>
Commit | Line | Data |
---|---|---|
55ed65e5 JB |
1 | --- XaoS-3.1pre5/src/ui/ui-drv/svga/ui_svga.c.orig Thu May 31 19:07:17 2001 |
2 | +++ XaoS-3.1pre5/src/ui/ui-drv/svga/ui_svga.c Fri Jan 24 21:57:08 2003 | |
3 | @@ -338,8 +338,6 @@ | |
4 | } | |
5 | #endif | |
6 | vga_setmode (mode); | |
7 | - seteuid (getuid ()); /* Don't need supervisor rights anymore. */ | |
8 | - setegid (getgid ()); | |
9 | if (mode == G320x240x256 | |
10 | || mode == G320x400x256 | |
11 | || mode == G360x480x256) | |
12 | @@ -459,29 +457,6 @@ | |
13 | int i; | |
14 | int fd; | |
15 | struct stat chkbuf; | |
16 | - seteuid (euid); /* We need supervisor rights to open mouse. */ | |
17 | - setegid (egid); | |
18 | - if ((fd = open ("/dev/console", O_RDONLY)) < 0) | |
19 | - { | |
20 | - seteuid (getuid ()); /* Don't need supervisor rights anymore. */ | |
21 | - setegid (getgid ()); | |
22 | - return (0); | |
23 | - } | |
24 | - close (fd); | |
25 | - fstat (2, &chkbuf); | |
26 | - if (chkbuf.st_rdev >> 8 != 4 || (chkbuf.st_rdev & 0xff) >= 64) | |
27 | - { | |
28 | - seteuid (getuid ()); /* Don't need supervisor rights anymore. */ | |
29 | - setegid (getgid ()); | |
30 | - return (0); | |
31 | - } | |
32 | - if ((fd = open ("/dev/mem", O_RDWR)) < 0) | |
33 | - { | |
34 | - seteuid (getuid ()); /* Don't need supervisor rights anymore. */ | |
35 | - setegid (getgid ()); | |
36 | - return (0); | |
37 | - } | |
38 | - close (fd); | |
39 | if (!initialised) | |
40 | { | |
41 | vga_setmousesupport (1); | |
42 | @@ -494,14 +469,14 @@ | |
43 | info = vga_getmodeinfo (i); | |
44 | if (info->colors != 256 && info->colors != 32768 && info->colors != 65536 && info->colors != 16777216) | |
45 | continue; | |
46 | + else | |
47 | + break; | |
48 | } | |
49 | if (i == GLASTMODE + 1) | |
50 | { | |
51 | svga_uninitialise (); | |
52 | return 0; | |
53 | } | |
54 | - seteuid (getuid ()); /* Don't need supervisor rights anymore. */ | |
55 | - setegid (getgid ()); | |
56 | return (1); | |
57 | } | |
58 | static void |