Skip to content

Commit 830c71d

Browse files
committed
DisplayServer (NetBSD): detect WM / DE by process name
1 parent 5e7d9ed commit 830c71d

File tree

1 file changed

+29
-3
lines changed
  • src/detection/displayserver/linux

1 file changed

+29
-3
lines changed

src/detection/displayserver/linux/wmde.c

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,19 @@
88
#include <string.h>
99
#include <unistd.h>
1010

11-
#ifdef __FreeBSD__
11+
#if __FreeBSD__
1212
#include <sys/sysctl.h>
1313
#include <sys/types.h>
1414
#include <sys/user.h>
15-
#elif defined(__OpenBSD__)
15+
#elif __OpenBSD__
1616
#include <sys/param.h>
1717
#include <sys/sysctl.h>
1818
#include <kvm.h>
19-
#elif defined(__sun)
19+
#elif __sun
2020
#include <procfs.h>
21+
#elif __NetBSD__
22+
#include <sys/types.h>
23+
#include <sys/sysctl.h>
2124
#endif
2225

2326
static const char* parseEnv(void)
@@ -388,6 +391,29 @@ static const char* getFromProcesses(FFDisplayServerResult* result)
388391
if(result->wmPrettyName.length == 0)
389392
applyNameIfWM(result, processName.chars);
390393

394+
if(result->dePrettyName.length > 0 && result->wmPrettyName.length > 0)
395+
break;
396+
}
397+
#elif __NetBSD__
398+
int request[] = {CTL_KERN, KERN_PROC2, KERN_PROC_UID, (int) userId, sizeof(struct kinfo_proc2), INT_MAX};
399+
400+
size_t size = 0;
401+
if(sysctl(request, ARRAY_SIZE(request), NULL, &size, NULL, 0) != 0)
402+
return "sysctl(KERN_PROC_UID, NULL) failed";
403+
404+
FF_AUTO_FREE struct kinfo_proc2* procs = malloc(size);
405+
406+
if(sysctl(request, ARRAY_SIZE(request), procs, &size, NULL, 0) != 0)
407+
return "sysctl(KERN_PROC_UID, procs) failed";
408+
409+
for(struct kinfo_proc2* proc = procs; proc < procs + (size / sizeof(struct kinfo_proc2)); proc++)
410+
{
411+
if(result->dePrettyName.length == 0)
412+
applyPrettyNameIfDE(result, proc->p_comm);
413+
414+
if(result->wmPrettyName.length == 0)
415+
applyNameIfWM(result, proc->p_comm);
416+
391417
if(result->dePrettyName.length > 0 && result->wmPrettyName.length > 0)
392418
break;
393419
}

0 commit comments

Comments
 (0)