Minor fix for NetBSD

ricardobranco777 · Feb 11, 2024 · 1d66493 · 1d66493
1 parent 1882829
commit 1d66493
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/bsd/extern.h b/bsd/extern.h
@@ -3,5 +3,6 @@ void free_argv(char **);
 char **kinfo_getargv(pid_t pid);
 
 #ifdef __NetBSD__
+#define kinfo_proc kinfo_proc2
 struct kinfo_proc *kinfo_getallproc(int *);
 #endif
diff --git a/bsd/kinfo_getallproc.c b/bsd/kinfo_getallproc.c
@@ -4,10 +4,6 @@
 #include <sys/proc.h>
 #include <stdlib.h>
 
-#if defined(__NetBSD__)
-#define kinfo_proc	kinfo_proc2
-#endif
-
 #include "extern.h"
 
 /*
@@ -39,13 +35,13 @@ kinfo_getallproc(int *cntp)
 	mib[1] = KERN_PROC2;
 	mib[2] = KERN_PROC_ALL;
 	mib[3] = 0;
-	mib[4] = sizeof(struct kinfo_proc2);
+	mib[4] = sizeof(struct kinfo_proc);
 	mib[5] = 0;
 
 	len = 0;
 	if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0)
 		return (NULL);
-	mib[5] = (int) (len / sizeof(struct kinfo_proc2));
+	mib[5] = (int) (len / sizeof(struct kinfo_proc));
 
 	kipp = malloc(len);
 	if (kipp == NULL)
@@ -56,6 +52,7 @@ kinfo_getallproc(int *cntp)
 	*cntp = len / sizeof(*kipp);
 	kinfo_proc_sort(kipp, len / sizeof(*kipp));
 	return (kipp);
+
 bad:
 	*cntp = 0;
 	free(kipp);

diff --git a/bsd/restartable.c b/bsd/restartable.c
@@ -26,11 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#ifdef __NetBSD__
-/* struct kinfo_proc */
-#define _KMEMUSER
-#endif
-
 #include <sys/types.h>
 #if defined(__FreeBSD__)
 #include <sys/user.h>
@@ -51,12 +46,11 @@
 #include <vis.h>
 
 #if defined(__NetBSD__)
-#define kinfo_proc	kinfo_proc2
-#define ki_comm	 	p_comm
+#define ki_comm		p_comm
 #define ki_login	p_login
-#define ki_pid	 	p_pid
-#define ki_ppid	 	p_ppid
-#define ki_ruid	 	p_ruid
+#define ki_pid		p_pid
+#define ki_ppid		p_ppid
+#define ki_ruid		p_ruid
 #endif
 
 #include "extern.h"