[gnome-shell] shell_global_reexec_self: add support for OpenBSD
- From: Antoine Jacoutot <ajacoutot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] shell_global_reexec_self: add support for OpenBSD
- Date: Thu, 31 Oct 2013 10:47:51 +0000 (UTC)
commit 15ff426be8e76af7c038feb3b754fbfde4056e5d
Author: Antoine Jacoutot <ajacoutot gnome org>
Date: Thu Oct 31 11:46:59 2013 +0100
shell_global_reexec_self: add support for OpenBSD
https://bugzilla.gnome.org/show_bug.cgi?id=709571
src/shell-global.c | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/src/shell-global.c b/src/shell-global.c
index fd060b3..ee27014 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -33,6 +33,11 @@
#include <malloc.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
#include "shell-enum-types.h"
#include "shell-global-private.h"
#include "shell-perf-log.h"
@@ -1109,20 +1114,30 @@ shell_global_reexec_self (ShellGlobal *global)
char *buf_p;
char *buf_end;
GError *error = NULL;
-
- /* Linux specific (I think, anyways). */
+
+#if defined __linux__
if (!g_file_get_contents ("/proc/self/cmdline", &buf, &len, &error))
{
g_warning ("failed to get /proc/self/cmdline: %s", error->message);
return;
}
-
+#elif defined __OpenBSD__
+ int pid = getpid();
+ int mib[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ARGV };
+ if (sysctl(mib, G_N_ELEMENTS (mib), &buf, &len, NULL, 0) == -1) {
+ g_warning ("failed to get command line args: %d", errno);
+ return;
+ }
+#else
+ return;
+#endif
+
buf_end = buf+len;
arr = g_ptr_array_new ();
/* The cmdline file is NUL-separated */
for (buf_p = buf; buf_p < buf_end; buf_p = buf_p + strlen (buf_p) + 1)
g_ptr_array_add (arr, buf_p);
-
+
g_ptr_array_add (arr, NULL);
/* Close all file descriptors other than stdin/stdout/stderr, otherwise
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]