Re: emacs-24.2.93 build problems (on OpenBSD)

[jca+emacs@wxcvbn.org (Jérémie Courrèges-Anglas)]

[-- Attachment #1.1: Type: text/plain, Size: 854 bytes --]

jca+emacs@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Glenn Morris <rgm@gnu.org> writes:
>
>> Jérémie Courrèges-Anglas wrote:
>>
>>> I have no idea whether it is correct, but M-: (list-system-processes)
>>> returns nil here on OpenBSD-current (5.3).
>>
>> Too late to make it work for 24.3, but could you make a bug report about
>> this please?

By the way, I don't have the time to make a bugreport right now, but
here's the diff (against 24.2.93) I would submit (after I have time to
test it thoroughly).

People with an access to OpenBSD and / or MirOS boxes (any version),
please test with diff.

This takes the #ifdef dance out of the function, doesn't hardcode the
mib size and uses the correct mib for (somewhat) recent OpenBSD versions.
list-system-processes doesn't return nil any more (OpenBSD 5.3 -current).


[-- Attachment #1.2: patch-sysdep.c --]
[-- Type: application/octet-stream, Size: 2601 bytes --]

--- sysdep.c.orig	Tue Mar  5 15:09:25 2013
+++ sysdep.c	Tue Mar  5 15:09:30 2013
@@ -2649,42 +2649,61 @@
 
 #elif defined BSD_SYSTEM
 
+/* Sysctl-based access to the list of processes. */
+
+/* Compatibility macros */
+#if defined __OpenBSD__
+# if defined KERN_PROC && KERN_PROC == 14 /* Old API */
+#  define MIB_INITIALIZER {CTL_KERN, KERN_PROC, KERN_PROC_ALL}
+#  define PID_FROM_KINFO_PROC(k) (k).kp_proc.p_pid
+# else /* New API */
+#  if !defined KERN_PROC
+#   define KERN_PROC KERN_PROC2
+#   define kinfo_proc kinfo_proc2
+#  endif
+#  define MIB_INITIALIZER \
+    {CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0, sizeof (struct kinfo_proc), 4096}
+#  define PID_FROM_KINFO_PROC(k) (k).p_pid
+# endif
+/* Darwin, NetBSD, OSX, ... */
+#elif defined DARWIN_OS || defined __NetBSD__
+# define MIB_INITIALIZER {CTL_KERN, KERN_PROC, KERN_PROC_ALL}
+# define PID_FROM_KINFO_PROC(k) (k).kp_proc.p_pid
+#else
+/* FreeBSD, DragonFlyBSD, ... */
+# define MIB_INITIALIZER {CTL_KERN, KERN_PROC, KERN_PROC_PROC}
+# define PID_FROM_KINFO_PROC(k) (k).ki_pid
+#endif
+
 Lisp_Object
 list_system_processes (void)
 {
-#if defined DARWIN_OS || defined __NetBSD__ || defined __OpenBSD__
-  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
-#else
-  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
-#endif
-  size_t len;
+  int mib[] = MIB_INITIALIZER;
+  size_t len, mibsize = sizeof mib / sizeof mib[0];
   struct kinfo_proc *procs;
   size_t i;
+  FILE *f;
 
   struct gcpro gcpro1;
   Lisp_Object proclist = Qnil;
 
-  if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0)
+  if (sysctl (mib, mibsize, NULL, &len, NULL, 0) != 0)
     return proclist;
 
   procs = xmalloc (len);
-  if (sysctl (mib, 3, procs, &len, NULL, 0) != 0)
+  if (sysctl (mib, mibsize, procs, &len, NULL, 0) != 0)
     {
       xfree (procs);
       return proclist;
     }
-
+  
   GCPRO1 (proclist);
-  len /= sizeof (struct kinfo_proc);
+  len /= sizeof procs[0];
   for (i = 0; i < len; i++)
     {
-#if defined DARWIN_OS || defined __NetBSD__
-      proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist);
-#elif defined __OpenBSD__
-      proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist);
-#else
-      proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
-#endif
+      proclist =
+	Fcons (make_fixnum_or_float (PID_FROM_KINFO_PROC (procs[i])),
+	       proclist);
     }
   UNGCPRO;
 
@@ -2692,6 +2711,9 @@
 
   return  proclist;
 }
+
+#undef MIB_INITIALIZER
+#undef PID_FROM_KINFO_PROC
 
 /* The WINDOWSNT implementation is in w32.c.
    The MSDOS implementation is in dosfns.c.  */

[-- Attachment #2: Type: application/pgp-signature, Size: 833 bytes --]