hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
Conflicts:

	Xi/exevents.c
	dix/devices.c
This commit is contained in:
Peter Hutterer 2008-05-02 11:00:14 +09:30
commit 3344569529
104 changed files with 2309 additions and 3314 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/dri/dri.c
View file

@ -2437,7 +2437,7 @@ static void drmSIGIOHandler(int interrupt, void *closure)
#if 0
fprintf(stderr, "Trying %d\n", entry->fd);
#endif
if ((count = read(entry->fd, buf, sizeof(buf))) > 0) {
if ((count = read(entry->fd, buf, sizeof(buf) - 1)) > 0) {
buf[count] = '\0';
#if 0
fprintf(stderr, "Got %s\n", buf);