util/drm: make portable by avoiding struct dirent d_type
Given this isn't perforance critical at all lets avoid the non-portable d_type and use fstat instead to check whenever the file is a chardev. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reported-by: David Carlier <devnexen@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 20200703145614.16684-10-peter.maydell@linaro.org Message-id: 20200701180302.14821-1-kraxel@redhat.com [PMM: fixed comment style; tweaked subject line] Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
2b9b9e7010
commit
0b823cb07e
19
util/drm.c
19
util/drm.c
@ -24,7 +24,8 @@ int qemu_drm_rendernode_open(const char *rendernode)
|
||||
{
|
||||
DIR *dir;
|
||||
struct dirent *e;
|
||||
int r, fd;
|
||||
struct stat st;
|
||||
int r, fd, ret;
|
||||
char *p;
|
||||
|
||||
if (rendernode) {
|
||||
@ -38,10 +39,6 @@ int qemu_drm_rendernode_open(const char *rendernode)
|
||||
|
||||
fd = -1;
|
||||
while ((e = readdir(dir))) {
|
||||
if (e->d_type != DT_CHR) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strncmp(e->d_name, "renderD", 7)) {
|
||||
continue;
|
||||
}
|
||||
@ -53,6 +50,18 @@ int qemu_drm_rendernode_open(const char *rendernode)
|
||||
g_free(p);
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* prefer fstat() over checking e->d_type == DT_CHR for
|
||||
* portability reasons
|
||||
*/
|
||||
ret = fstat(r, &st);
|
||||
if (ret < 0 || (st.st_mode & S_IFMT) != S_IFCHR) {
|
||||
close(r);
|
||||
g_free(p);
|
||||
continue;
|
||||
}
|
||||
|
||||
fd = r;
|
||||
g_free(p);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user