mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xserver: Return EEXIST if unlinking lockfile fails

Browse Source 
Otherwise we'll keep trying to unlink it.
This commit is contained in:
Kristian Høgsberg 2012-04-09 22:14:52 -04:00
parent 2c76be7c1b
commit e5cf741669
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xserver-launcher.c
View File

@ -1654,9 +1654,13 @@ create_lockfile(int display, char *lockfile, size_t lsize)
/* stale lock file; unlink and try again */ /* stale lock file; unlink and try again */
fprintf(stderr, fprintf(stderr,
"unlinking stale lock file %s\n", lockfile); "unlinking stale lock file %s\n", lockfile);
unlink(lockfile);
errno = EAGAIN;
close(fd); close(fd);
if (unlink(lockfile))
/* If we fail to unlink, return EEXIST
so we try the next display number.*/
errno = EEXIST;
else
errno = EAGAIN;
return -1; return -1;
} }